summaryrefslogtreecommitdiff
path: root/libs/io/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'libs/io/src/main')
-rw-r--r--libs/io/src/main/java/org/the_jk/cleversync/io/SingleMerge.kt5
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/io/src/main/java/org/the_jk/cleversync/io/SingleMerge.kt b/libs/io/src/main/java/org/the_jk/cleversync/io/SingleMerge.kt
index f9107db..711daae 100644
--- a/libs/io/src/main/java/org/the_jk/cleversync/io/SingleMerge.kt
+++ b/libs/io/src/main/java/org/the_jk/cleversync/io/SingleMerge.kt
@@ -100,7 +100,10 @@ object SingleMerge {
} else {
val targetFile = targetContent.files.find { it.name == sourceName }
if (targetFile != null) {
- if (targetFile.size != sourceSize || sourceLastModified > targetFile.lastModified) {
+ // When comparing times, reduce to nearest second, anything else
+ // over network based filesystems is just silly.
+ if (targetFile.size != sourceSize ||
+ sourceLastModified.epochSecond > targetFile.lastModified.epochSecond) {
actions.add(Action.Copy(sourceName, overwrite = true))
}
} else {