From 1668af230bde86ebc7ca5e2ff113bd8ad122a9bc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 10 Jan 2016 14:12:42 +0000 Subject: [PATCH] Case-insensitive sort for image filenames. --- ChangeLog | 2 ++ src/lib/case_insensitive_sorter.cc | 35 ++++++++++++++++++++++++++++++ src/lib/case_insensitive_sorter.h | 26 ++++++++++++++++++++++ src/lib/wscript | 1 + src/wx/content_panel.cc | 3 ++- 5 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 src/lib/case_insensitive_sorter.cc create mode 100644 src/lib/case_insensitive_sorter.h diff --git a/ChangeLog b/ChangeLog index e4877b5ad..e75fa064d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2016-01-10 Carl Hetherington + * Sort "Add file(s)..." images case-insensitively. + * Version 2.6.15 released. 2016-01-09 Carl Hetherington diff --git a/src/lib/case_insensitive_sorter.cc b/src/lib/case_insensitive_sorter.cc new file mode 100644 index 000000000..02543f03a --- /dev/null +++ b/src/lib/case_insensitive_sorter.cc @@ -0,0 +1,35 @@ +/* + Copyright (C) 2016 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "case_insensitive_sorter.h" +#include +#include +#include + +using std::string; + +bool +CaseInsensitiveSorter::operator() (boost::filesystem::path a, boost::filesystem::path b) +{ + string x = a.string (); + string y = b.string (); + transform (x.begin(), x.end(), x.begin(), ::tolower); + transform (y.begin(), y.end(), y.begin(), ::tolower); + return x < y; +} diff --git a/src/lib/case_insensitive_sorter.h b/src/lib/case_insensitive_sorter.h new file mode 100644 index 000000000..0b77f3916 --- /dev/null +++ b/src/lib/case_insensitive_sorter.h @@ -0,0 +1,26 @@ +/* + Copyright (C) 2016 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include + +class CaseInsensitiveSorter +{ +public: + bool operator() (boost::filesystem::path a, boost::filesystem::path b); +}; diff --git a/src/lib/wscript b/src/lib/wscript index 5a1ab8b10..c538851d5 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -33,6 +33,7 @@ sources = """ audio_point.cc audio_processor.cc audio_stream.cc + case_insensitive_sorter.cc cinema.cc cinema_kdms.cc cinema_sound_processor.cc diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 6d4a11868..ee9ed2bf8 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -32,6 +32,7 @@ #include "lib/content_factory.h" #include "lib/image_content.h" #include "lib/dcp_content.h" +#include "lib/case_insensitive_sorter.h" #include "lib/playlist.h" #include #include @@ -520,7 +521,7 @@ ContentPanel::add_files (list paths) alphabetical sort is expected here. */ - paths.sort (); + paths.sort (CaseInsensitiveSorter ()); /* XXX: check for lots of files here and do something */ -- 2.30.2