summaryrefslogtreecommitdiff
path: root/src/LibraryMonitor.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-06-14 20:36:37 +0200
committerJörg Frings-Fürst <debian@jff.email>2023-06-14 20:36:37 +0200
commitbb80d3feebdc9acc52e3f4ad24084d8425f043a2 (patch)
tree2084a84c39f159c6aea254775dc0880d52579d45 /src/LibraryMonitor.vala
parentb26ff0798252a1a8072dd2c7a67f6205de9fde11 (diff)
parent31804433d72460cbe0a39f9f8ea5e76058d84cda (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/LibraryMonitor.vala')
-rw-r--r--src/LibraryMonitor.vala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/LibraryMonitor.vala b/src/LibraryMonitor.vala
index f9291d7..a291f15 100644
--- a/src/LibraryMonitor.vala
+++ b/src/LibraryMonitor.vala
@@ -96,7 +96,7 @@ public class LibraryMonitorPool {
public class LibraryMonitor : DirectoryMonitor {
private const int FLUSH_IMPORT_QUEUE_SEC = 3;
- private const int IMPORT_ROLL_QUIET_SEC = 5 * 60;
+ private const int IMPORT_ROLL_QUIET_SEC = 5 * 60 * 1000 * 1000;
private const int MIN_BLACKLIST_DURATION_MSEC = 5 * 1000;
private const int MAX_VERIFY_EXISTING_MEDIA_JOBS = 5;
@@ -217,7 +217,7 @@ public class LibraryMonitor : DirectoryMonitor {
private Gee.HashSet<File> pending_imports = new Gee.HashSet<File>(file_hash, file_equal);
private Gee.ArrayList<BatchImport> batch_import_queue = new Gee.ArrayList<BatchImport>();
private BatchImportRoll current_import_roll = null;
- private time_t last_import_roll_use = 0;
+ private int64 last_import_roll_use = 0;
private BatchImport current_batch_import = null;
private int checksums_completed = 0;
private int checksums_total = 0;
@@ -583,7 +583,7 @@ public class LibraryMonitor : DirectoryMonitor {
// If no import roll, or it's been over IMPORT_ROLL_QUIET_SEC since using the last one,
// create a new one. This allows for multiple files to come in back-to-back and be
// imported on the same roll.
- time_t now = (time_t) now_sec();
+ var now = GLib.get_monotonic_time();
if (current_import_roll == null || (now - last_import_roll_use) >= IMPORT_ROLL_QUIET_SEC)
current_import_roll = new BatchImportRoll();
last_import_roll_use = now;
@@ -996,7 +996,7 @@ public class LibraryMonitor : DirectoryMonitor {
}
if (!known) {
- // ressurrect tombstone if deleted
+ // resurrect tombstone if deleted
Tombstone? tombstone = Tombstone.global.locate(file);
if (tombstone != null) {
debug("Resurrecting tombstoned file %s", file.get_path());