squarepusher 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 857a2153d16ce0f3f8fbd698af1518f2c0795459
-  data.tar.gz: 9f9ac1657c7967278e5fcd9a2294d8eb1759c79e
+  metadata.gz: 89a2f891450d7acd7d93fb4e2acaa67a235962a4
+  data.tar.gz: 4e73934a2ad455c8ef34e90893d0ba7e53432241
 SHA512:
-  metadata.gz: 55bfd7340dc575c01a0f2431d6b7edf55be2c67a86add122ccc84951293dd1ab9137de9638d57ec5d131986c8ff1a23aa3b54e478fb047f0dfecd8a3c2e5dc28
-  data.tar.gz: d167388c0eed291d355c036dbfbd6fe4ebcf487f1f05cfc9fddf2ff72b0629b0ee8c7b346fe70b98c39bbf0bddddd3184a7678c0ae93cdf2d5b403c0ebf6b1b0
+  metadata.gz: 4b6411977c5b5aea4861090e690347b5dd5876ca2568919373e861e4a4174a3bf2ef14ffc084e1afdacb31b8411854893dcdd6e61f43755cad5b59f0111959a1
+  data.tar.gz: c77411eabb63dbb63cb4573df147faed887ac19bec65277760c814720edd1b3346d12503430261c78ca5bdcf595c58e2b80fa12a2ac0bbc68dfdf95736639f99

data/lib/squarepusher/core.rb

@@ -1,5 +1,7 @@
 require 'fileutils'
 require 'optparse'
+require 'set'
+
 
 FlickRawOptions = {}
 
@@ -31,8 +33,13 @@ module Squarepusher
         else
           ownername = owner
         end
+      elsif p.respond_to?(:ownername)
+        # I want to remove this since the ownername is the human readable form and not the owner id,
+        # so isn't always safe to build a URL with.  but for photoset.getList the only way to get the owner name
+        # is by specifying the extra "owner_name" - need to find a way to get the owner id
+        ownername = p.ownername
       else
-        raise Exception("photo does not contain 'owner' attribute: #{p.inspect}")
+        raise Exception.new("photo does not contain 'owner' attribute: #{p.inspect}")
       end
       
       "http://flickr.com/photos/#{ownername}"
@@ -140,29 +147,9 @@ module Squarepusher
       flickr.access_token = token
       flickr.access_secret = token_secret
       
-      size = args[:size] || :small_square
-      
-      # TODO: use url_for() method
-      @url_for_photo = case size
-          when :original
-            lambda { |p| FlickRaw.url_o(p) }
-          when :large
-            lambda { |p| FlickRaw.url_b(p) }
-          when :medium_640
-            lambda { |p| FlickRaw.url_z(p) }
-          when :medium_500
-            lambda { |p| FlickRaw.url(p) }
-          when :small
-            lambda { |p| FlickRaw.url_m(p) }
-          when :thumb
-            lambda { |p| FlickRaw.url_t(p) }
-          when :small_square
-            lambda { |p| FlickRaw.url_s(p) }
-          else
-            raise Exception("unrecognized size: #{size}")
-      end
+      @size = args[:size] || :small_square
     end
-    
+
     def get_photo(photo_id)
       flickr.photos.getInfo(:photo_id => photo_id)
     end
@@ -245,16 +232,26 @@ module Squarepusher
       if count == 100 then download_favorites(output_dir, page+1, &photo_call) end
     end
     
-    def download_photoset(photoset, output_dir)
-      dirname = Squarepusher.normalize(photoset.title)
+    def download_photoset(photoset, output_dir, args={})
+      size = args[:size] || @size
+
+      pset_normalized_title = Squarepusher.normalize(photoset.title)
+      dirname = pset_normalized_title
       set_dir = File.join(output_dir, dirname)
       $fileutils.mkdir_p set_dir
       
-      # handles socket timeout when loading photoset info
+      # contains the following keys
+      # error
+      # exists      
       results = {}
+      local_paths = []
+      results[:local_photoset_dir] = set_dir
+      results[:local_paths] = local_paths
+
+      # handles socket timeout when loading photoset info
       status, photoset_result = handle_error { flickr.photosets.getPhotos(:photoset_id => photoset.id,
         :privacy_filter => @privacy,
-        :extras => "original_format,url_o")["photo"] }
+        :extras => "original_format,url_o,date_taken")["photo"] }
       if status == :error
         error photoset_result
         results[status] = 1
@@ -264,15 +261,16 @@ module Squarepusher
       end
       
       photos.each do |p|
-        # TODO: use name of file in url since titles can be duplicate
-        # copies string?
-        name = "#{p.id}"
+        # removes all non digits from date
+        date_taken = p["datetaken"].gsub(/[^\d]+/, '')
+
+        name = "#{date_taken}-#{p.id}-#{pset_normalized_title}"
         if not p.title.empty?
           normalized_title = Squarepusher.normalize(p.title)
           name << "-#{normalized_title}"
         end
         
-        url = @url_for_photo[p]
+        url = Squarepusher.url_for(p, size)
         
         # TODO: only add .jpg suffix if it's not in the image name already
         path = File.join(set_dir, name)
@@ -290,10 +288,31 @@ module Squarepusher
         else
           results[result] = 1
         end
+
+        if result == :success || result == :exists
+          local_paths << path
+        end
       end
       results
     end
  
+    # syncs local directory with flickr photoset
+    # meaning, if a file exists locally that is no longer in the set, it will be deleted
+    def sync_photoset(photoset, output_dir, args={})
+      results = download_photoset(photoset, output_dir, args)
+      local_pset_dir = results[:local_photoset_dir]
+
+      # converts list to set for faster lookups
+      local_paths = Set.new(results[:local_paths])
+
+      Dir.entries(local_pset_dir).collect { |e| "#{local_pset_dir}/#{e}"}.select { |e| File.file?(e) }.each do |e|
+        if not local_paths.include?(e)
+          # puts "deleting #{e}"
+          $fileutils.rm e
+        end
+      end
+    end
+
     private
     
       def fire_event(args={})

data/lib/squarepusher/version.rb

@@ -1,3 +1,3 @@
 module Squarepusher
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squarepusher
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - mhawthorne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flickraw