Accessor for ClosedCaptionsDialog.

[dcpomatic.git] / src / lib / image_filename_sorter.cc

diff --git a/src/lib/image_filename_sorter.cc b/src/lib/image_filename_sorter.cc
index e23a551b41ecd6260f44cc7b94d2169f95a756ab..47f46e81d75ecbe5aa589c4b1fd592241a5f150d 100644 (file)
--- a/src/lib/image_filename_sorter.cc
+++ b/src/lib/image_filename_sorter.cc
@@ -1,87 +1,62 @@
 /*
-    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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,
+    DCP-o-matic 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.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include "raw_convert.h"
 #include "image_filename_sorter.h"
+#include <dcp/locale_convert.h>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
+#include <boost/optional.hpp>
 #include <iostream>
 
 using std::list;
+using std::string;
+using dcp::locale_convert;
+using boost::optional;
 
 bool
 ImageFilenameSorter::operator() (boost::filesystem::path a, boost::filesystem::path b)
 {
-       std::list<int> na = extract_numbers (a);
-       std::list<int> nb = extract_numbers (b);
-       if (na.empty() || nb.empty()) {
-               return a.string() < b.string();
-       }
-
-       if (na.size() != nb.size()) {
-               /* Just use the first one */
-               return na.front() < nb.front();
-       }
+       string an = extract_numbers (a);
+       string bn = extract_numbers (b);
 
-       std::list<int>::const_iterator i = na.begin ();
-       std::list<int>::const_iterator j = nb.begin ();
+       int const anl = an.length ();
+       int const bnl = bn.length ();
 
-       while (i != na.end()) {
-               if (*i != *j) {
-                       return *i < *j;
-               }
-               ++i;
-               ++j;
+       if (anl > bnl) {
+               bn = string(anl - bnl, '0') + bn;
+       } else if (bnl > anl) {
+               an = string(bnl - anl, '0') + an;
        }
 
-       /* All the same */
-       return false;
-
+       return an < bn;
 }
 
-list<int>
+string
 ImageFilenameSorter::extract_numbers (boost::filesystem::path p)
 {
-       p = p.leaf ();
-
-       std::list<std::string> numbers;
-
-       std::string current;
-       for (size_t i = 0; i < p.string().size(); ++i) {
-               if (isdigit (p.string()[i])) {
-                       current += p.string()[i];
-               } else {
-                       if (!current.empty ()) {
-                               numbers.push_back (current);
-                               current.clear ();
-                       }
+       string numbers;
+       string const ps = p.leaf().string();
+       for (size_t i = 0; i < ps.size(); ++i) {
+               if (isdigit (ps[i])) {
+                       numbers += ps[i];
                }
        }
-
-       if (!current.empty ()) {
-               numbers.push_back (current);
-       }
-
-       std::list<int> numbers_as_int;
-       BOOST_FOREACH (std::string i, numbers) {
-               numbers_as_int.push_back (raw_convert<int> (i));
-       }
-
-       return numbers_as_int;
+       return numbers;
 }