From 62d85b58f09066f3dbd424ab190f07420c2cba84 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 16 Jun 2016 01:02:10 +0100 Subject: [PATCH] Ignore any hidden files when looking for images. We used to do ._* and .DS_Store but there has been a report of .com.apple.timemachine.supported. --- ChangeLog | 2 ++ src/lib/content_factory.cc | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71e89e724..da87cb96a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2016-06-16 Carl Hetherington + * Ignore any hidden files when looking for image files. + * Remove seconds from KDM time period specification (#819). 2016-06-14 c.hetherington diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index 7b02ee111..38112b968 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -128,9 +128,9 @@ content_factory (shared_ptr film, boost::filesystem::path path) LOG_GENERAL ("Checking file %1", i->path()); - if (boost::starts_with (i->path().leaf().string(), "._") || i->path().leaf().string() == ".DS_Store") { - /* We ignore these files */ - LOG_GENERAL ("Ignored %1 (starts with {._}, or .DS_Store)", i->path()); + if (boost::starts_with (i->path().leaf().string(), ".")) { + /* We ignore hidden files */ + LOG_GENERAL ("Ignored %1 (starts with .)", i->path()); continue; } -- 2.30.2