standard-file 0.1.3 → 0.1.4
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 +4 -2
- data/lib/standard_file/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3539b3967bbb099392cfa19a41dcda6e760d8dc7
|
4
|
+
data.tar.gz: bbc647e2e439f6940a7cacd95239a055cefdaa94
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0eb56de338e0204e67bab6828fddb73f3f983c44e7a3c5ebe29f9c776c376d4ae0f0114c646b2d7db32e6828f4bb470f47c1e0f00c0c13fa05fd685e14e1d503
|
7
|
+
data.tar.gz: 4bae7bf628ee8e4016cefa5d45e83735b083002ab9ac365d1c62782ed3e4944325eea79cf7342128f5af65e555ea8dc665a3fe9799497679554b376ab7dc925f
|
@@ -29,15 +29,17 @@ module StandardFile
|
|
29
29
|
end
|
30
30
|
|
31
31
|
# manage conflicts
|
32
|
+
min_conflict_interval = 5
|
33
|
+
|
32
34
|
saved_ids = saved_items.map{|x| x.uuid }
|
33
35
|
retrieved_ids = retrieved_items.map{|x| x.uuid }
|
34
36
|
conflicts = saved_ids & retrieved_ids # & is the intersection
|
35
37
|
# saved items take precedence, retrieved items are duplicated with a new uuid
|
36
38
|
conflicts.each do |conflicted_uuid|
|
37
|
-
# if changes are greater than
|
39
|
+
# if changes are greater than min_conflict_interval seconds apart, create conflicted copy, otherwise discard conflicted
|
38
40
|
saved = saved_items.find{|i| i.uuid == conflicted_uuid}
|
39
41
|
conflicted = retrieved_items.find{|i| i.uuid == conflicted_uuid}
|
40
|
-
if (saved.updated_at - conflicted.updated_at).abs >
|
42
|
+
if (saved.updated_at - conflicted.updated_at).abs > min_conflict_interval
|
41
43
|
puts "\n\n\n Creating conflicted copy of #{saved.uuid}\n\n\n"
|
42
44
|
dup = conflicted.dup
|
43
45
|
dup.user = conflicted.user
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: standard-file
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Standard File
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-02-
|
11
|
+
date: 2017-02-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|