flickrchive 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87f970f83bff37b5efb482dab21f835967fc62b5
-  data.tar.gz: 8f25abcb5892d0cd899adf292c649b430a71183f
+  metadata.gz: 533ec7bd851cf9e99a2dca4e086535a963195c23
+  data.tar.gz: d4c29dc59f9abdec1448f0d8afa140476f05def0
 SHA512:
-  metadata.gz: 22b3fb93db85f95f9106afd4a25bd134dc2ae7e7a187141277fd3cec6dde2bc717b3e67d0f48877df5f804d7db70d19cd853c1388d4eb9dfc74f31222377102f
-  data.tar.gz: 916010ff9c3376b1477f627ecbcb4d20e9f4be3457fe7bf071ac4eb66bf59efe683ded1a425bd28dfb16543c8decd6ea1a18de7eb82f94b3c3b4de9df1f45a84
+  metadata.gz: d6ec2f1eae28204be8e86111a11ec37ac17602d3504ea15f73380760e628f8b07a14e60d386d01d16f3ce22d09da338303fa6371c004c572a0bc1e5f3a453544
+  data.tar.gz: d42dbdc7bf0eb8195dfba1dc333c4b346850dbad350afc1b4f5088337fddf367cbc9b767346e3b695a0774aecb07a8c78be63196e61ed575141befb95b56140f

data/flickrchive.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
   spec.required_rubygems_version = '>= 1.3.5'
   spec.summary = spec.description
-  spec.version = '0.1.0'
+  spec.version = '0.1.2'
 end

data/lib/flickrchive/execute.rb

@@ -21,6 +21,9 @@ module Flickrchive
       rescue FlickRaw::FailedResponse => e
         handle_flickr_fail(e)
         retry
+      rescue EOFError
+        Flickrchive.logger.info("Caught network EOFError. Retrying upload")
+        retry
       end
       Flickrchive.logger.info("Uploaded file: #{photo[:filename]}")
       photo[:flickr_id] = id

data/lib/flickrchive/prepare.rb

@@ -7,13 +7,18 @@ module Flickrchive
     def prepare
       fm = FileMagic.new
       Flickrchive.logger.info("Recursively inspecting directory for images, this may take awhile...")
+      self.db.synchronize do
+        @existing_files = self.db.map { |k,v| v[:filename]}
+      end
       files = FileList.new("#{self.directory}/**/*") do |fl|
         self.excludes.each do |exclude_matcher|
           fl.exclude(Regexp.new(exclude_matcher))
         end
       end
+      # get out list of files to attempt to process
+      to_do = files - @existing_files
 
-      files.each do |fn|
+      to_do.each do |fn|
         new_photo = {filename: fn}
         begin
           new_photo[:type] = fm.file(fn)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrchive
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Steve Nolen