/*
- Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#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();
- }
+ auto an = extract_numbers (a);
+ auto bn = extract_numbers (b);
- 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 ();
+ 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;
+ auto 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;
}