More tweaks to image filename ordering.

3 files changed, 34 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index d532d99a7..4aaf68af9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-10-28  Carl Hetherington  <cth@carlh.net>
 
+	* Fix ordering of filename in image sets in some cases
+	(e.g. foo_01042015_00000, foo_01042015_00001...)
+
 	* Updated da_DK translation from Anders Uhl Pedersen.
 
 	* Fix erroneous addition of referenced assets to PKLs (#723).
diff --git a/src/lib/image_filename_sorter.cc b/src/lib/image_filename_sorter.cc
index 69114b2bd..143daed71 100644
--- a/src/lib/image_filename_sorter.cc
+++ b/src/lib/image_filename_sorter.cc
@@ -20,6 +20,7 @@
 #include <iostream>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
+#include <boost/foreach.hpp>
 #include "raw_convert.h"
 
 class ImageFilenameSorter
@@ -27,20 +28,37 @@ class ImageFilenameSorter
 public:
 	bool operator() (boost::filesystem::path a, boost::filesystem::path b)
 	{
-		boost::optional<int> na = extract_number (a);
-		boost::optional<int> nb = extract_number (b);
-		if (!na || !nb) {
+		std::list<int> na = extract_numbers (a);
+		std::list<int> nb = extract_numbers (b);
+		if (na.empty() || nb.empty()) {
 			return a.string() < b.string();
 		}
 
-		return na.get() < nb.get();
+		if (na.size() != nb.size()) {
+			/* Just use the first one */
+			return na.front() < nb.front();
+		}
+
+		std::list<int>::const_iterator i = na.begin ();
+		std::list<int>::const_iterator j = nb.begin ();
+
+		while (i != na.end()) {
+			if (*i != *j) {
+				return *i < *j;
+			}
+			++i;
+			++j;
+		}
+
+		/* All the same */
+		return false;
 	}
 
 private:
-	boost::optional<int> extract_number (boost::filesystem::path p)
+	std::list<int> extract_numbers (boost::filesystem::path p)
 	{
 		p = p.leaf ();
-		
+
 		std::list<std::string> numbers;
 
 		std::string current;
@@ -59,17 +77,11 @@ private:
 			numbers.push_back (current);
 		}
 
-		std::string longest;
-		for (std::list<std::string>::const_iterator i = numbers.begin(); i != numbers.end(); ++i) {
-			if (i->length() > longest.length()) {
-				longest = *i;
-			}
-		}
-
-		if (longest.empty ()) {
-			return boost::optional<int> ();
+		std::list<int> numbers_as_int;
+		BOOST_FOREACH (std::string i, numbers) {
+			numbers_as_int.push_back (raw_convert<int> (i));
 		}
 
-		return raw_convert<int> (longest);
+		return numbers_as_int;
 	}
 };
diff --git a/test/image_filename_sorter_test.cc b/test/image_filename_sorter_test.cc
index 4bdd16f55..a4762a8c6 100644
--- a/test/image_filename_sorter_test.cc
+++ b/test/image_filename_sorter_test.cc
@@ -32,6 +32,7 @@ BOOST_AUTO_TEST_CASE (image_filename_sorter_test)
 	BOOST_CHECK (x ("00057.tif", "00166.tif"));
 	BOOST_CHECK (x ("/my/numeric999/path/00057.tif", "/my/numeric999/path/00166.tif"));
 	BOOST_CHECK (x ("1_01.tif", "1_02.tif"));
+	BOOST_CHECK (x ("EWS_DCP_092815_000000.j2c", "EWS_DCP_092815_000001.j2c"));
 
 	BOOST_CHECK (!x ("abc0000000002", "abc0000000001"));
 	BOOST_CHECK (!x ("2", "1"));
@@ -40,4 +41,6 @@ BOOST_AUTO_TEST_CASE (image_filename_sorter_test)
 	BOOST_CHECK (!x ("999", "1"));
 	BOOST_CHECK (!x ("/my/numeric999/path/00166.tif", "/my/numeric999/path/00057.tif"));
 	BOOST_CHECK (!x ("1_02.tif", "1_01.tif"));
+	BOOST_CHECK (!x ("EWS_DCP_092815_000000.j2c", "EWS_DCP_092815_000000.j2c"));
+	BOOST_CHECK (!x ("EWS_DCP_092815_000100.j2c", "EWS_DCP_092815_000000.j2c"));
 }