photo-helper 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 267cd7787b42ba92cc8a5cbb0b2fc3b6df7c89e9f9e329448d15ca2b0497f312
-  data.tar.gz: 50a2f2411eb195e74445652ce13e6bd3e5aaefc7b2e9a9fba8134cb0530d786d
+  metadata.gz: 82761f9bc4418f056200d2b7ecd7584375f2b38f4aef619801ea5ea7693cb42e
+  data.tar.gz: a50dcf77c1bd0a5afba585036dff711d2fdf9f6f691ed5676a9af0b8c964c2f5
 SHA512:
-  metadata.gz: 3b9af79a851d3be2e57a1c20189fd0e145a415f09046a95820b8c97cf6d9dc82d64dd6b6cba3effc9edd6bde73a05bab5fc1705e0f2dfaa74de0d93519a48b50
-  data.tar.gz: 626ca8ea86130530e073ec17f3144376e104b618edbff9c057f26203d15423899b7e8fa6d2721b0ea0f453f5f94df5c33e6a5f990562fa3ffaea5b06b961b904
+  metadata.gz: 16183ad1cc973700b9483896fca9c55ffb6abca4c4e418a931ae8f53aec7849c3d3e8d25c74414842caae7f6b134d0d5db9175adc7ed59f20697356abe279a4a
+  data.tar.gz: ff19d5858d07f83a962b603e421579b2cfe856e93b43e32e5e0f8fc4370882560f3dda114d71eaa28e5cd5385acb5edc63c0fa5908673afd6f71dfb36eefbf94

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    photo-helper (0.5.6)
+    photo-helper (0.5.7)
       ejson
       mimemagic
       mini_magick
@@ -66,4 +66,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/lib/helpers/image_helper.rb

@@ -25,12 +25,14 @@ class ImageHelper
 
   def self.rating(image)
     contents = xmp(image)
+    return 0 unless contents
     matches = contents.match(RATING_REGEX)
-    matches[1] if matches
+    return matches[1].to_i if matches && matches[1].match(/^\d+$/)
+    0
   end
 
   def self.is_select?(image)
-    contains_color_class?(image, SELECT_COLOR_TAGS)
+    contains_color_class?(image, SELECT_COLOR_TAGS) || rating(image) >= SELECT_RATING
   end
 
   def self.is_5_star?(image)

data/lib/helpers/smugmug_album.rb

@@ -123,6 +123,7 @@ class SmugmugAlbumHelper
     to_upload = {}
     to_update = {}
     to_delete = []
+    to_update_keywords = []
 
     image_list_hash.each do |filename, images|
       images.each do |image|
@@ -133,7 +134,12 @@ class SmugmugAlbumHelper
 
         if uploaded_hash.key?(filename)
           !uploaded_hash[filename].each do |uploaded|
-            next unless uploaded_match_requested?(image, uploaded)
+            unless uploaded_match_requested?(image, uploaded)
+              if uploaded[:md5] == image[:md5]
+                to_update_keywords.push(uploaded)
+              end
+              next
+            end
 
             # & returns if in both arrays
             upload_image = false
@@ -143,7 +149,7 @@ class SmugmugAlbumHelper
             break
           end
         end
-
+    
         if upload_image
           push_hash_array(to_upload, image[:keywords], image[:file])
         end

data/lib/helpers/smugmug_api.rb

@@ -187,8 +187,10 @@ class SmugmugAPI
   def post(url, body = {}, headers = {})
     url = url.tr(' ', '-')
     headers['Accept'] = 'application/json'
+    headers['Content-Type'] = 'application/json'
+    headers['Connection'] = 'keep-alive'
     response = @http.post(url, body, headers)
-    raise "Request failed\n#{response.body}" unless response.is_a? Net::HTTPSuccess
+    raise "Request failed\n#{URI.unescape(response.body)}" unless response.is_a? Net::HTTPSuccess
     JSON.parse(response.body)['Response']
   end
 
@@ -213,7 +215,7 @@ class SmugmugAPI
   def upload_images(images, album_id, headers = {}, workers: 4, filename_as_title: false)
     Parallel.each(images, in_processes: workers, progress: "Uploading images") do |image|
       upload(image, album_id, headers, filename_as_title: filename_as_title)
-      puts "Done #{image}"
+      puts "Done #{image}\n"
     end
   end
 
@@ -222,7 +224,7 @@ class SmugmugAPI
       # replace not working, delete then upload
       http(:delete, image[:uri])
       upload(image[:file], album_id, headers, filename_as_title: filename_as_title)
-      puts "Done #{image[:file]}"
+      puts "Done #{image[:file]}\n"
     end
   end
 
@@ -238,6 +240,14 @@ class SmugmugAPI
       post("/api/v2/album/#{album_id}!moveimages", "MoveUris" => images)
   end
 
+  def update_keywords(image, keywords, overwrite = false)
+    return if image.nil?
+    keywords = (image[:keywords] + keywords).uniq unless overwrite
+    
+    # inspect need outwise it isnt encoded right
+    pp post("#{image[:image_uri]}?_method=PATCH", KeywordArray: keywords.inspect)
+  end
+
   def request_access_token
     @consumer = OAuth::Consumer.new(@secrets.api_key, @secrets.api_secret,
       site: OAUTH_ORIGIN,
@@ -314,6 +324,7 @@ class SmugmugAPI
       id: image['ImageKey'],
       md5: image['ArchivedMD5'],
       uri: image['Uri'],
+      image_uri: image['Uris']['Image']['Uri'],
       web_uri: image['WebUri'],
       type: 'image'
     }

data/lib/photo-helper/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module PhotoHelper
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 end

data/lib/photo_helper.rb

@@ -24,6 +24,7 @@ SCREENSAVER_ROOT = File.expand_path("~/Pictures/screensaver")
 JPEG_ROOT = File.expand_path("~/Pictures/jpegs")
 IGNORE_FOLDERS = %w(instagram exported edited)
 SELECT_COLOR_TAGS = ["Winner", "Winner alt", "Superior", "Superior alt", "Typical", "Typical alt"]
+SELECT_RATING = 1 #greater than or equal to 
 
 module PhotoHelper
   class CLI < Thor

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-helper
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Benjamin Caldwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A tool to automatate my photo workflows