summaryrefslogtreecommitdiff
path: root/src/BatchImport.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:35:32 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:35:32 +0200
commite230b6f78546827521107be23797048482c8b193 (patch)
tree948c1e77382c484819ea399bba4edcdc19cc6bf0 /src/BatchImport.vala
parent211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff)
parent49120f48474fc8fdc2448c75d961bc238213cfac (diff)
Update upstream source from tag 'upstream/0.28.2'
Update to upstream version '0.28.2' with Debian dir 811236a8e9a1308bf427065dcb6270419ff4f965
Diffstat (limited to 'src/BatchImport.vala')
-rw-r--r--src/BatchImport.vala45
1 files changed, 33 insertions, 12 deletions
diff --git a/src/BatchImport.vala b/src/BatchImport.vala
index 8e4ae5c..0e31441 100644
--- a/src/BatchImport.vala
+++ b/src/BatchImport.vala
@@ -171,6 +171,10 @@ public abstract class BatchImportJob {
public virtual DuplicatedFile? get_duplicated_file() {
return null;
}
+
+ public virtual File? get_associated_file() {
+ return null;
+ }
// Attaches a sibling job (for RAW+JPEG)
public abstract void set_associated(BatchImportJob associated);
@@ -202,16 +206,22 @@ public abstract class BatchImportJob {
public virtual time_t get_exposure_time_override() {
return 0;
}
+
+ public virtual bool recurse() {
+ return true;
+ }
}
public class FileImportJob : BatchImportJob {
private File file_or_dir;
private bool copy_to_library;
private FileImportJob? associated = null;
+ private bool _recurse;
- public FileImportJob(File file_or_dir, bool copy_to_library) {
+ public FileImportJob(File file_or_dir, bool copy_to_library, bool recurse) {
this.file_or_dir = file_or_dir;
this.copy_to_library = copy_to_library;
+ this._recurse = recurse;
}
public override string get_dest_identifier() {
@@ -255,6 +265,10 @@ public class FileImportJob : BatchImportJob {
public File get_file() {
return file_or_dir;
}
+
+ public override bool recurse() {
+ return this._recurse;
+ }
}
// A BatchImportRoll represents important state for a group of imported media. If this is shared
@@ -317,9 +331,11 @@ public class ImportManifest {
public Gee.List<BatchImportResult> already_imported = new Gee.ArrayList<BatchImportResult>();
public Gee.List<BatchImportResult> corrupt_files = new Gee.ArrayList<BatchImportResult>();
public Gee.List<BatchImportResult> all = new Gee.ArrayList<BatchImportResult>();
+ public GLib.Timer timer;
public ImportManifest(Gee.List<BatchImportJob>? prefailed = null,
Gee.List<BatchImportJob>? pre_already_imported = null) {
+ this.timer = new Timer();
if (prefailed != null) {
foreach (BatchImportJob job in prefailed) {
BatchImportResult batch_result = new BatchImportResult(job, null,
@@ -613,6 +629,7 @@ public class BatchImport : Object {
flush_ready_sources();
log_status("Import completed: %s".printf(where));
+ debug("Import complete after %f", manifest.timer.elapsed());
// report completed to the reporter (called prior to the "import_complete" signal)
if (reporter != null)
@@ -1054,7 +1071,7 @@ public class BatchImport : Object {
d = RawDeveloper.EMBEDDED;
photo.set_default_raw_developer(d);
- photo.set_raw_developer(d);
+ photo.set_raw_developer(d, false);
}
}
@@ -1560,7 +1577,7 @@ private class WorkSniffer : BackgroundImportJob {
assert(query_is_directory(dir));
try {
- search_dir(job, dir, copy_to_library);
+ search_dir(job, dir, copy_to_library, job.recurse());
} catch (Error err) {
report_error(job, dir, job.get_source_identifier(), dir.get_path(), err,
ImportResult.FILE_ERROR);
@@ -1579,7 +1596,7 @@ private class WorkSniffer : BackgroundImportJob {
}
}
- public void search_dir(BatchImportJob job, File dir, bool copy_to_library) throws Error {
+ public void search_dir(BatchImportJob job, File dir, bool copy_to_library, bool recurse) throws Error {
FileEnumerator enumerator = dir.enumerate_children("standard::*",
FileQueryInfoFlags.NOFOLLOW_SYMLINKS, null);
@@ -1593,11 +1610,14 @@ private class WorkSniffer : BackgroundImportJob {
FileType file_type = info.get_file_type();
if (file_type == FileType.DIRECTORY) {
+ if (!recurse)
+ continue;
+
if (info.get_name().has_prefix("."))
continue;
try {
- search_dir(job, child, copy_to_library);
+ search_dir(job, child, copy_to_library, recurse);
} catch (Error err) {
report_error(job, child, child.get_path(), child.get_path(), err,
ImportResult.FILE_ERROR);
@@ -1842,13 +1862,8 @@ private class PrepareFilesJob : BackgroundImportJob {
}
if (metadata != null) {
- uint8[]? flattened_sans_thumbnail = metadata.flatten_exif(false);
- if (flattened_sans_thumbnail != null && flattened_sans_thumbnail.length > 0)
- exif_only_md5 = md5_binary(flattened_sans_thumbnail, flattened_sans_thumbnail.length);
-
- uint8[]? flattened_thumbnail = metadata.flatten_exif_preview();
- if (flattened_thumbnail != null && flattened_thumbnail.length > 0)
- thumbnail_md5 = md5_binary(flattened_thumbnail, flattened_thumbnail.length);
+ exif_only_md5 = metadata.exif_hash ();
+ thumbnail_md5 = metadata.thumbnail_hash();
}
}
@@ -1970,6 +1985,12 @@ private class PreparedFileImportJob : BackgroundJob {
return;
}
}
+
+ // See if the prepared job has a file associated already, then use that
+ // Usually works for import from Cameras
+ if (final_associated_file == null) {
+ final_associated_file = prepared_file.job.get_associated_file();
+ }
debug("Importing %s", final_file.get_path());