X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_filename_sorter.cc;h=47f46e81d75ecbe5aa589c4b1fd592241a5f150d;hp=037446398115b66e665acd4dccf2bb299897907a;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=12e20e180062dbc338e775bd1f5ec7a2af91df7f

diff --git a/src/lib/image_filename_sorter.cc b/src/lib/image_filename_sorter.cc
index 037446398..47f46e81d 100644
--- a/src/lib/image_filename_sorter.cc
+++ b/src/lib/image_filename_sorter.cc
@@ -1,75 +1,62 @@
 /*
-    Copyright (C) 2015 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>
 
-class ImageFilenameSorter
-{
-public:
-	bool operator() (boost::filesystem::path a, boost::filesystem::path b)
-	{
-		std::vector<int> na = extract_numbers (a);
-		std::vector<int> nb = extract_numbers (b);
-
-		std::vector<int>::const_iterator i = na.begin ();
-		std::vector<int>::const_iterator j = nb.begin ();
+using std::list;
+using std::string;
+using dcp::locale_convert;
+using boost::optional;
 
-		while (true) {
-			if (i == na.end () || j == nb.end ()) {
-				return false;
-			}
-
-			if (*i != *j) {
-				return *i < *j;
-			}
+bool
+ImageFilenameSorter::operator() (boost::filesystem::path a, boost::filesystem::path b)
+{
+	string an = extract_numbers (a);
+	string bn = extract_numbers (b);
 
-			++i;
-			++j;
-		}
+	int const anl = an.length ();
+	int const bnl = bn.length ();
 
-		/* NOT REACHED */
-		return false;
+	if (anl > bnl) {
+		bn = string(anl - bnl, '0') + bn;
+	} else if (bnl > anl) {
+		an = string(bnl - anl, '0') + an;
 	}
 
-private:
-	std::vector<int> extract_numbers (boost::filesystem::path p)
-	{
-		p = p.leaf ();
-
-		std::vector<int> numbers;
-		std::string number;
-		for (size_t i = 0; i < p.string().size(); ++i) {
-			if (isdigit (p.string()[i])) {
-				number += p.string()[i];
-			} else if (!number.empty ()) {
-				numbers.push_back (raw_convert<int> (number));
-				number.clear ();
-			}
-		}
+	return an < bn;
+}
 
-		if (!number.empty ()) {
-			numbers.push_back (raw_convert<int> (number));
+string
+ImageFilenameSorter::extract_numbers (boost::filesystem::path p)
+{
+	string numbers;
+	string const ps = p.leaf().string();
+	for (size_t i = 0; i < ps.size(); ++i) {
+		if (isdigit (ps[i])) {
+			numbers += ps[i];
 		}
-
-		return numbers;
 	}
-};
+	return numbers;
+}