BOOST_FOREACH.

[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 c32b07115245145061bd4c87c206db9c565cb3a0..ea5f46da64401e5c92596201e3011a119a319b74 100644 (file)
--- a/src/lib/image_filename_sorter.cc
+++ b/src/lib/image_filename_sorter.cc
@@ -21,7 +21,6 @@
 #include "image_filename_sorter.h"
 #include <dcp/locale_convert.h>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 #include <iostream>
 
@@ -33,16 +32,22 @@ using boost::optional;
 bool
 ImageFilenameSorter::operator() (boost::filesystem::path a, boost::filesystem::path b)
 {
-       optional<int> na = extract_numbers (a);
-       optional<int> nb = extract_numbers (b);
-       if (!na || !nb) {
-               return a.string() < b.string();
+       string an = extract_numbers (a);
+       string bn = extract_numbers (b);
+
+       int const anl = an.length ();
+       int const bnl = bn.length ();
+
+       if (anl > bnl) {
+               bn = string(anl - bnl, '0') + bn;
+       } else if (bnl > anl) {
+               an = string(bnl - anl, '0') + an;
        }
 
-       return *na < *nb;
+       return an < bn;
 }
 
-optional<int>
+string
 ImageFilenameSorter::extract_numbers (boost::filesystem::path p)
 {
        string numbers;
@@ -52,13 +57,5 @@ ImageFilenameSorter::extract_numbers (boost::filesystem::path p)
                        numbers += ps[i];
                }
        }
-
-       if (numbers.empty ()) {
-               return optional<int> ();
-       }
-
-       /* locale_convert is quicker than raw_convert and numbers can only contain
-          things which are isdigit() so locale_convert is fine to use.
-       */
-       return locale_convert<int> (numbers);
+       return numbers;
 }