Ignore .DS_Store files in potential image directories.

diff --git a/ChangeLog b/ChangeLog
index 2a56474541c06e5de8fca401a3923c6fddff0125..e2fde1f59dcfc122401ea496491e1ae2382bbeb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-01  c.hetherington  <cth@carlh.net>
+
+       * Fix failure to recognise image sequence directories
+       in some cases.
+
 2016-03-01  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.6.29 released.

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index e1535c510230f1a9ed9b33e5d775fb9ab5a881ca..c3278e30e1bf02f626f9f77dd6e408f9956acc69 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -101,9 +101,9 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
 
                        LOG_GENERAL ("Checking file %1", i->path());
 
-                       if (boost::starts_with (i->path().leaf().string(), "._")) {
+                       if (boost::starts_with (i->path().leaf().string(), "._") || i->path().leaf().string() == ".DS_Store") {
                                /* We ignore these files */
-                               LOG_GENERAL ("Ignored %1 (starts with {._})", i->path());
+                               LOG_GENERAL ("Ignored %1 (starts with {._}, or .DS_Store)", i->path());
                                continue;
                        }