standard-file 0.1.6 → 0.1.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/standard_file/sync_manager.rb +3 -1
- data/lib/standard_file/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 55fae907d4d0980d13fbec333823e9c447a2d16a
|
4
|
+
data.tar.gz: 0c871c10bcce6dbd71e882a0255ade229d338365
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9d0ccaa3b0a2a0856e77c1a7a9f794945587ad97b511c2b41f3ae501c505c2f4219fc98463c1d942927bc855cf229fe8710b56a667b760bc7cbf882dfda48d38
|
7
|
+
data.tar.gz: 71579c644301e243e5f8516585d9962795a7ddd4003ecb455ddcb476745b6ec419c04f662bdcf6cc23d28d05e4313a2b68ece98ea393ef1997517b3ae3e7e15a
|
@@ -26,10 +26,12 @@ module StandardFile
|
|
26
26
|
saved_items, unsaved = _sync_save(item_hashes)
|
27
27
|
if saved_items.length > 0
|
28
28
|
last_updated = saved_items.sort_by{|m| m.updated_at}.last.updated_at
|
29
|
+
# add 1 microsecond to avoid returning same object in subsequent sync
|
30
|
+
last_updated = (last_updated.to_time + 1/100000.0).to_datetime.utc
|
29
31
|
end
|
30
32
|
|
31
33
|
# manage conflicts
|
32
|
-
min_conflict_interval =
|
34
|
+
min_conflict_interval = 20
|
33
35
|
|
34
36
|
saved_ids = saved_items.map{|x| x.uuid }
|
35
37
|
retrieved_ids = retrieved_items.map{|x| x.uuid }
|