flickrup 1.1.10 → 1.1.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/flickrup/processor.rb +10 -10
- data/lib/flickrup/slow_listener.rb +11 -11
- data/lib/flickrup/uploader.rb +2 -2
- 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: 9e247e63e1fac467bc9d27272ad316cfb165f282
|
4
|
+
data.tar.gz: e11a2bf0c5743f0dd1dde45adfd1abb262a58f97
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e06f94572bb304fac2e04ffe5aa7c36de1a8e83f9258fb6fe93e2283d931a877ba7b15794b5a14008b2f60f7543ebe435956ca3d5b8c28e4895e1694a94327b3
|
7
|
+
data.tar.gz: 5d9546bf8e4cc8b9f3b0886bb7cd6fd2aa081aa58b1220e2594b816f34d219e469e263293778d138cf6bc0270fc04d2c4efd4cf717549c428a47863c9ae715fe
|
data/lib/flickrup/processor.rb
CHANGED
@@ -22,10 +22,10 @@ class Processor
|
|
22
22
|
|
23
23
|
def run(all_files = Dir["#{@config[:watch_dir]}/*.*"])
|
24
24
|
|
25
|
-
logger.
|
25
|
+
logger.info("Processing #{all_files.length} files")
|
26
26
|
|
27
27
|
if paused
|
28
|
-
logger.
|
28
|
+
logger.info("Paused detected, so skipping processing...")
|
29
29
|
return 0
|
30
30
|
end
|
31
31
|
|
@@ -34,7 +34,7 @@ class Processor
|
|
34
34
|
if File.exist? x
|
35
35
|
TaggedFile.create(x)
|
36
36
|
else
|
37
|
-
|
37
|
+
logger.debug("File #{x} already removed, skipping.")
|
38
38
|
end
|
39
39
|
}.compact
|
40
40
|
|
@@ -44,7 +44,7 @@ class Processor
|
|
44
44
|
!(x.tags.nil? || x.tags.empty?)
|
45
45
|
}
|
46
46
|
|
47
|
-
logger.
|
47
|
+
logger.info("Selected #{tagged.length} files for upload")
|
48
48
|
|
49
49
|
uploader = get_uploader
|
50
50
|
|
@@ -54,20 +54,20 @@ class Processor
|
|
54
54
|
else
|
55
55
|
tagged.each do |x|
|
56
56
|
begin
|
57
|
-
logger.
|
57
|
+
logger.info("Beginning upload for #{x.filename}...")
|
58
58
|
x.doUpload(get_preupload_handlers, uploader)
|
59
|
-
logger.
|
60
|
-
logger.
|
59
|
+
logger.info("Upload complete for #{x.filename}")
|
60
|
+
logger.info("Beginning archive for #{x.filename}...")
|
61
61
|
x.archive(get_archiver, @config[:archive_dir])
|
62
|
-
logger.
|
62
|
+
logger.info("Processing complete for #{x.filename}")
|
63
63
|
rescue => e
|
64
64
|
logger.error("Failed to process #{x.filename} due to exception: #{e}")
|
65
|
-
logger.
|
65
|
+
logger.info(e.backtrace.join("\n"))
|
66
66
|
end
|
67
67
|
end
|
68
68
|
end
|
69
69
|
|
70
|
-
logger.
|
70
|
+
logger.info("Processed #{tagged.length} valid files")
|
71
71
|
|
72
72
|
tagged.length
|
73
73
|
end
|
@@ -25,7 +25,7 @@ class SlowListener
|
|
25
25
|
|
26
26
|
def initialize(config)
|
27
27
|
@wait = config[:timeout]
|
28
|
-
logger.
|
28
|
+
logger.info("Timeout set to #@wait secs")
|
29
29
|
@config = config
|
30
30
|
@scheduler = Rufus::Scheduler.start_new
|
31
31
|
@processor = Processor.new(config)
|
@@ -38,7 +38,7 @@ class SlowListener
|
|
38
38
|
@listener.change(&method(:on_change))
|
39
39
|
@listener.start
|
40
40
|
|
41
|
-
logger.
|
41
|
+
logger.info("Triggering initial run")
|
42
42
|
schedule
|
43
43
|
end
|
44
44
|
|
@@ -48,10 +48,10 @@ class SlowListener
|
|
48
48
|
case previous_state
|
49
49
|
when SCHEDULED
|
50
50
|
#ignore, already scheduled
|
51
|
-
logger.
|
51
|
+
logger.info("Already scheduled")
|
52
52
|
when PROCESSING
|
53
53
|
#ignore, processing thread will reschedule
|
54
|
-
logger.
|
54
|
+
logger.info("Scheduling queued")
|
55
55
|
when IDLE
|
56
56
|
schedule_internal
|
57
57
|
end
|
@@ -60,13 +60,13 @@ class SlowListener
|
|
60
60
|
private
|
61
61
|
def on_change(modified, added, removed)
|
62
62
|
unless modified.empty? && added.empty?
|
63
|
-
logger.
|
63
|
+
logger.info("Change detected")
|
64
64
|
schedule
|
65
65
|
end
|
66
66
|
end
|
67
67
|
|
68
68
|
def do_upload
|
69
|
-
logger.
|
69
|
+
logger.info("Checking files for upload")
|
70
70
|
|
71
71
|
@processing.set PROCESSING
|
72
72
|
|
@@ -75,31 +75,31 @@ class SlowListener
|
|
75
75
|
old, new = files.partition { |x| Time.now > File.mtime(x) + @wait }
|
76
76
|
|
77
77
|
unless new.empty?
|
78
|
-
logger.
|
78
|
+
logger.info("Found #{new.length} new files")
|
79
79
|
@processing.set SCHEDULED
|
80
80
|
end
|
81
81
|
|
82
82
|
unless old.empty?
|
83
|
-
logger.
|
83
|
+
logger.info("Found #{old.length} stable files")
|
84
84
|
@processor.run(old)
|
85
85
|
end
|
86
86
|
|
87
87
|
@processing.compare_and_swap(PROCESSING, IDLE)
|
88
88
|
|
89
89
|
if @processing.get == SCHEDULED
|
90
|
-
logger.
|
90
|
+
logger.info("Rescheduling...")
|
91
91
|
schedule_internal
|
92
92
|
end
|
93
93
|
end
|
94
94
|
|
95
95
|
def schedule_internal
|
96
96
|
if @scheduler.jobs.empty?
|
97
|
-
logger.
|
97
|
+
logger.info("Scheduling processing for #@wait sec")
|
98
98
|
@scheduler.in @wait do
|
99
99
|
do_upload
|
100
100
|
end
|
101
101
|
else
|
102
|
-
logger.
|
102
|
+
logger.info("Already scheduled")
|
103
103
|
end
|
104
104
|
end
|
105
105
|
|
data/lib/flickrup/uploader.rb
CHANGED
@@ -19,11 +19,11 @@ class Uploader
|
|
19
19
|
if ctx.properties[UploaderConstants::NO_UPLOAD]
|
20
20
|
logger.info("Skipping upload of #{ctx.file.filename} as marked as NO_UPLOAD")
|
21
21
|
else
|
22
|
-
logger.
|
22
|
+
logger.info("Uploading #{ctx.file.filename} with tags #{ctx.file.tags}")
|
23
23
|
|
24
24
|
begin
|
25
25
|
rv = @flickr.upload_photo(ctx.file.filename, prepare_upload_properties(ctx))
|
26
|
-
logger.
|
26
|
+
logger.info("Uploaded #{ctx.file.filename}")
|
27
27
|
rescue StandardError => err
|
28
28
|
logger.error("Failed to upload #{ctx.file.filename}: #{err}")
|
29
29
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: flickrup
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jonathan Gilbert
|
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
172
172
|
version: '0'
|
173
173
|
requirements: []
|
174
174
|
rubyforge_project:
|
175
|
-
rubygems_version: 2.0.
|
175
|
+
rubygems_version: 2.0.14
|
176
176
|
signing_key:
|
177
177
|
specification_version: 4
|
178
178
|
summary: Flickr Uploader!
|