/*
- 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 <iostream>
+#include "image_filename_sorter.h"
+#include <dcp/locale_convert.h>
#include <boost/filesystem.hpp>
#include <boost/optional.hpp>
-#include <dcp/raw_convert.h>
+#include <iostream>
-class ImageFilenameSorter
+using std::list;
+using std::string;
+using dcp::locale_convert;
+using boost::optional;
+
+bool
+ImageFilenameSorter::operator() (boost::filesystem::path a, boost::filesystem::path b)
{
-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::cout << a << " " << b << " " << (a.string() < b.string()) << "\n";
- return a.string() < b.string();
- }
+ string an = extract_numbers (a);
+ string bn = extract_numbers (b);
- return na.get() < nb.get();
+ 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;
}
-private:
- boost::optional<int> extract_number (boost::filesystem::path p)
- {
- p = p.leaf ();
-
- 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 ()) {
- break;
- }
- }
- }
+ return an < bn;
+}
- if (number.empty ()) {
- return boost::optional<int> ();
+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 dcp::raw_convert<int> (number);
}
-};
+ return numbers;
+}