Merge branch 'release/debian/0.32.1-1'debian/0.32.1-1

1 files changed, 8 insertions, 3 deletions

diff --git a/src/BatchImport.vala b/src/BatchImport.vala
index 0e31441..90ccba8 100644
--- a/src/BatchImport.vala
+++ b/src/BatchImport.vala
@@ -201,10 +201,10 @@ public abstract class BatchImportJob {
         return false;
     }
     
-    // returns a non-zero time_t value if this has a valid exposure time override, returns zero
+    // returns a non-null DateTime value if this has a valid exposure time override, returns zero
     // otherwise
-    public virtual time_t get_exposure_time_override() {
-        return 0;
+    public virtual DateTime? get_exposure_time_override() {
+        return null;
     }
 
     public virtual bool recurse() {
@@ -1597,6 +1597,11 @@ private class WorkSniffer : BackgroundImportJob {
     }
     
     public void search_dir(BatchImportJob job, File dir, bool copy_to_library, bool recurse) throws Error {
+        if (dir.get_child(".nomedia").query_exists()) {
+            debug("Folder %s contains \".nomedia\" file, ignoring.", dir.get_path());
+            return;
+        }
+
         FileEnumerator enumerator = dir.enumerate_children("standard::*",
             FileQueryInfoFlags.NOFOLLOW_SYMLINKS, null);