From d443a3c2509889533ca812c163056bace396b586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 14 Jun 2023 20:35:58 +0200 Subject: New upstream version 0.32.1 --- src/BatchImport.vala | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/BatchImport.vala') 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); -- cgit v1.2.3