photo-helper 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82761f9bc4418f056200d2b7ecd7584375f2b38f4aef619801ea5ea7693cb42e
-  data.tar.gz: a50dcf77c1bd0a5afba585036dff711d2fdf9f6f691ed5676a9af0b8c964c2f5
+  metadata.gz: df2fd10d6c5d02427159bbd75e24fda95e5510dcb2e2a8cb45ed3431a2306f00
+  data.tar.gz: dd8aa0cab5fbbba134c7c86067068cc75ce90d18c3ffcc74716e8aea8a3c3ace
 SHA512:
-  metadata.gz: 16183ad1cc973700b9483896fca9c55ffb6abca4c4e418a931ae8f53aec7849c3d3e8d25c74414842caae7f6b134d0d5db9175adc7ed59f20697356abe279a4a
-  data.tar.gz: ff19d5858d07f83a962b603e421579b2cfe856e93b43e32e5e0f8fc4370882560f3dda114d71eaa28e5cd5385acb5edc63c0fa5908673afd6f71dfb36eefbf94
+  metadata.gz: 570acf74899f3d5a27ef411f60e95220bcc1b394d3291b78f9737008ab2dce08af1a3ae3e7c33315fc1269dc879edccc68d818dd8658bf4678e0449137beef56
+  data.tar.gz: a8c341ec982464f94f311d11f749747b54ac53f2d24d766d34c974040e1f30dbb4c4b34cea5a1bd140e00e82521adb0b117a794972b57ec0f178b20b09ade4e5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    photo-helper (0.5.7)
+    photo-helper (0.5.8)
       ejson
       mimemagic
       mini_magick

data/lib/helpers/smugmug_album.rb

@@ -37,7 +37,6 @@ class SmugmugAlbumHelper
   def initialize(search_path, album = nil)
     @search_extensions = IMAGE_EXTENSIONS.concat(["XMP"])
 
-
     @search_path = Pathname.new(search_path)
 
     @smugmug = SmugmugAPI.new
@@ -49,7 +48,7 @@ class SmugmugAlbumHelper
     @dl_album_name = File.join("dl", @album_name)
     @dl_album = @smugmug.get_or_create_album(@dl_album_name, album_url: @location&.downcase)
 
-    @keyword_list = Set.new
+    @folder_keywords = Set.new
   end
 
   def parse_path
@@ -107,8 +106,13 @@ class SmugmugAlbumHelper
     image_list_hash = {}
     images.each do |i|
       filename = File.basename(i, ".*")
-      keywords = image_dir_keywords(i)
-      @keyword_list.merge(keywords) if keywords
+
+      # add keywords based on directory name and if the image is a select image
+      keywords = image_dir_keywords(i) || []
+      @folder_keywords.merge(keywords) if keywords.size
+
+      # do this after the keywords list because keywords_list is actually just directory keywords...
+      keywords.push("select") if ImageHelper.is_select?(i)
 
       push_hash_array(image_list_hash, filename, file: i,
         keywords: keywords,
@@ -122,8 +126,8 @@ class SmugmugAlbumHelper
 
     to_upload = {}
     to_update = {}
+    to_update_keywords = {}
     to_delete = []
-    to_update_keywords = []
 
     image_list_hash.each do |filename, images|
       images.each do |image|
@@ -133,20 +137,19 @@ class SmugmugAlbumHelper
         upload_image = true
 
         if uploaded_hash.key?(filename)
-          !uploaded_hash[filename].each do |uploaded|
-            unless uploaded_match_requested?(image, uploaded)
+          uploaded_hash[filename].each do |uploaded|
+            if uploaded_match_requested?(image, uploaded)
               if uploaded[:md5] == image[:md5]
-                to_update_keywords.push(uploaded)
+                # check for missing keywords using -
+                if image[:keywords] - uploaded[:keywords] != []
+                  push_hash_array(to_update_keywords, image[:keywords], {image_uri: uploaded[:image_uri], keywords: uploaded[:keywords], filename: uploaded[:filename]})
+                end
+              else
+                push_hash_array(to_update, image[:keywords], image.merge!(uri: uploaded[:uri]))
               end
-              next
+              upload_image = false
+              break
             end
-
-            # & returns if in both arrays
-            upload_image = false
-            if uploaded[:md5] != image[:md5]
-              push_hash_array(to_update, image[:keywords], image.merge!(uri: uploaded[:uri]))
-            end
-            break
           end
         end
     
@@ -175,14 +178,21 @@ class SmugmugAlbumHelper
     end
 
     to_upload.each do |keywords, images|
-      puts keywords
       upload(album, images, keywords)
     end
 
     to_update.each do |keywords, images|
-      puts keywords
       update(album, images, keywords)
     end
+
+    to_update_keywords.each do |keywords, images|
+      puts "Updating keywords #{keywords}"
+      images.each do |i|
+        @smugmug.update_keywords(i, keywords)
+      end
+    end
+
+    
     # puts "delete #{to_delete.count}???"
     if delete && to_delete.any?
       puts "Deleting #{to_delete.count} images"
@@ -218,17 +228,18 @@ class SmugmugAlbumHelper
       @dl_album
     end
 
-    @keyword_list = Set.new
+    @folder_keywords = Set.new
     puts "Uploading all images to album #{album_name || @album_name} --> #{album[:web_uri]}\n"
 
     @image_list = image_list_to_hash(image_list)
     @image_list = merge_hash_array(@image_list, image_list_to_hash(exported_list))
     @image_list = merge_hash_array(@image_list, image_list_to_hash(instagram_list))
+
     sync(album, @image_list, true)
   end
 
   def collect_select
-    @keyword_list = Set.new
+    @folder_keywords = Set.new
 
     pictures = image_list
     pictures = pictures.select { |p| ImageHelper.is_select?(p) }
@@ -259,7 +270,7 @@ class SmugmugAlbumHelper
   end
 
   def upload_select
-    @keyword_list = Set.new
+    @folder_keywords = Set.new
 
     pictures = image_list
     pictures = pictures.select { |p| ImageHelper.is_select?(p) }
@@ -297,12 +308,18 @@ class SmugmugAlbumHelper
   end
 
   def uploaded_match_requested?(image, uploaded)
+    # for checking if match only care about folder keywords
     if image[:keywords].nil?
       # empty from keyword list
-      return true if uploaded[:keywords].nil? || @keyword_list & uploaded[:keywords] == Set.new
-    elsif image[:keywords] - uploaded[:keywords] == []
+      return true if uploaded[:keywords].nil? || @folder_keywords & uploaded[:keywords] == Set.new
+    elsif @folder_keywords & image[:keywords] - uploaded[:keywords] == Set.new
       return true
     end
     false
   end
 end
+
+# class SmugmugImage
+#   def initialize(image_path)
+#   end
+# end

data/lib/helpers/smugmug_api.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'helpers/secrets'
 require 'oauth'
 require 'uri'
@@ -8,17 +9,17 @@ require 'parallel'
 
 class SmugmugAPI
   attr_accessor :http, :uploader
-  OAUTH_ORIGIN = 'https://secure.smugmug.com'
-  REQUEST_TOKEN_URL = '/services/oauth/1.0a/getRequestToken'
-  ACCESS_TOKEN_URL = '/services/oauth/1.0a/getAccessToken'
-  AUTHORIZE_URL = '/services/oauth/1.0a/authorize'
-  API_ENDPOINT = 'https://api.smugmug.com'
-  UPLOAD_ENDPOINT = 'https://upload.smugmug.com/'
+  OAUTH_ORIGIN = 'https://secure.smugmug.com'.freeze
+  REQUEST_TOKEN_URL = '/services/oauth/1.0a/getRequestToken'.freeze
+  ACCESS_TOKEN_URL = '/services/oauth/1.0a/getAccessToken'.freeze
+  AUTHORIZE_URL = '/services/oauth/1.0a/authorize'.freeze
+  API_ENDPOINT = 'https://api.smugmug.com'.freeze
+  UPLOAD_ENDPOINT = 'https://upload.smugmug.com/'.freeze
 
   def initialize(ejson_file = '~/.photo_helper.ejson')
     ejson_file = File.expand_path(ejson_file)
-    @secrets = Secrets.new(ejson_file, %i(api_key api_secret))
-    request_access_token if !@secrets["access_token"] || !@secrets["access_secret"]
+    @secrets = Secrets.new(ejson_file, %i[api_key api_secret])
+    request_access_token if !@secrets['access_token'] || !@secrets['access_secret']
 
     @http = get_access_token
     @uploader = get_access_token(UPLOAD_ENDPOINT)
@@ -198,29 +199,29 @@ class SmugmugAPI
     image = File.open(image_path)
 
     headers.merge!('Content-Type' => MimeMagic.by_path(image_path).type,
-    'X-Smug-AlbumUri' => "/api/v2/album/#{album_id}",
-    'X-Smug-ResponseType' => 'JSON',
-    'X-Smug-Version' => 'v2',
-    'charset' => 'UTF-8',
-    'Accept' => 'JSON',
-    'X-Smug-FileName' => File.basename(image_path),
-    'Content-MD5' => Digest::MD5.file(image_path).hexdigest)
+                   'X-Smug-AlbumUri' => "/api/v2/album/#{album_id}",
+                   'X-Smug-ResponseType' => 'JSON',
+                   'X-Smug-Version' => 'v2',
+                   'charset' => 'UTF-8',
+                   'Accept' => 'JSON',
+                   'X-Smug-FileName' => File.basename(image_path),
+                   'Content-MD5' => Digest::MD5.file(image_path).hexdigest)
 
-    headers['X-Smug-Title'] = File.basename(image_path, ".*") if filename_as_title
+    headers['X-Smug-Title'] = File.basename(image_path, '.*') if filename_as_title
 
     resp = @uploader.post('/', image, headers)
     resp.body
   end
 
   def upload_images(images, album_id, headers = {}, workers: 4, filename_as_title: false)
-    Parallel.each(images, in_processes: workers, progress: "Uploading images") do |image|
+    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}\n"
     end
   end
 
   def update_images(images, album_id, headers = {}, workers: 4, filename_as_title: false)
-    Parallel.each(images, in_processes: workers, progress: "Updating images") do |image|
+    Parallel.each(images, in_processes: workers, progress: 'Updating images') do |image|
       # replace not working, delete then upload
       http(:delete, image[:uri])
       upload(image[:file], album_id, headers, filename_as_title: filename_as_title)
@@ -230,31 +231,31 @@ class SmugmugAPI
 
   def collect_images(images, album_id)
     return if images.empty?
-    images = images.join(",") if images.is_a? Array
-    post("/api/v2/album/#{album_id}!collectimages", "CollectUris" => images)
+    images = images.join(',') if images.is_a? Array
+    post("/api/v2/album/#{album_id}!collectimages", 'CollectUris' => images)
   end
 
   def move_images(images, album_id)
-      return if images.empty?
-      images = images.join(",") if images.is_a? Array
-      post("/api/v2/album/#{album_id}!moveimages", "MoveUris" => images)
+    return if images.empty?
+    images = images.join(',') if images.is_a? Array
+    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)
+    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,
-      name: 'photo-helper',
-      request_token_path: REQUEST_TOKEN_URL,
-      authorize_path: AUTHORIZE_URL,
-      access_token_path: ACCESS_TOKEN_URL)
+                                    site: OAUTH_ORIGIN,
+                                    name: 'photo-helper',
+                                    request_token_path: REQUEST_TOKEN_URL,
+                                    authorize_path: AUTHORIZE_URL,
+                                    access_token_path: ACCESS_TOKEN_URL)
 
     # Generate request token
     @request_token = @consumer.get_request_token

data/lib/photo-helper/smugmug.rb

@@ -41,11 +41,11 @@ module PhotoHelper
       albums = @smugmug.albums_long
 
       albums_tree = {}
-      output = ["# Photos"]
+      output = ['# Photos']
 
       albums.each do |a|
         parts = a[:path].split('/')
-        next if parts[0] == "Trash"
+        next if parts[0] == 'Trash'
 
         album_name = parts.pop
         parts.each_with_index do |part, i|
@@ -69,16 +69,16 @@ module PhotoHelper
       until stack.empty?
         key = stack.pop
         item = key.inject(albums_tree, :fetch)
-        next if key.first == "dl"
+        next if key.first == 'dl'
 
         if item.is_a?(Hash)
-          stack.concat(item.keys.map{|a| key.clone.push(a)})
-          output.push("#{'#'*key.count} #{key.last}")
+          stack.concat(item.keys.map { |a| key.clone.push(a) })
+          output.push("#{'#' * key.count} #{key.last}")
           next
         end
 
         begin
-          dl_item = ["dl"].concat(key).inject(albums_tree, :fetch)
+          dl_item = ['dl'].concat(key).inject(albums_tree, :fetch)
           output.push("  **Selects: ** #{item}\n  **All: ** #{dl_item}")
         rescue
           output.push(item)

data/lib/photo-helper/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module PhotoHelper
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'.freeze
 end

data/lib/photo_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'thor'
 
 require 'helpers/printer'
@@ -13,36 +14,36 @@ require 'photo-helper/smugmug'
 require 'photo-helper/screensaver'
 
 # TODO: move to config file
-RAW_EXTENSION = "dng"
-RAW_EXTENSIONS = [RAW_EXTENSION, "DNG", "ORF", "RAF"]
-JPEG_EXTENSION = "JPG"
-JPEG_EXTENSIONS = %w(JPG jpg jpeg)
-IMAGE_EXTENSIONS = JPEG_EXTENSIONS.concat([])
-PHOTOS_ROOT = File.expand_path("~/Pictures/Pictures")
+RAW_EXTENSION = 'dng'.freeze
+RAW_EXTENSIONS = [RAW_EXTENSION, 'DNG', 'ORF', 'RAF'].freeze
+JPEG_EXTENSION = 'JPG'.freeze
+JPEG_EXTENSIONS = [JPEG_EXTENSION, 'jpg', 'jpeg'].freeze
+IMAGE_EXTENSIONS = JPEG_EXTENSIONS.dup.concat([])
+PHOTOS_ROOT = File.expand_path('~/Pictures/Pictures')
 BEST_OF_ROOT = File.expand_path("~/Pictures/Pictures/Best\ of")
-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 
+SCREENSAVER_ROOT = File.expand_path('~/Pictures/screensaver')
+JPEG_ROOT = File.expand_path('~/Pictures/jpegs')
+IGNORE_FOLDERS = %w[instagram exported edited].freeze
+SELECT_COLOR_TAGS = ['Winner', 'Winner alt', 'Superior', 'Superior alt', 'Typical', 'Typical alt'].freeze
+SELECT_RATING = 1 # greater than or equal to
 
 module PhotoHelper
   class CLI < Thor
-    map "g" => "generate"
-    map "d" => "delete"
-    map "s" => "smugmug"
+    map 'g' => 'generathte'
+    map 'd' => 'delete'
+    map 's' => 'smugmug'
 
-    desc "version", "displays installed version"
+    desc 'version', 'displays installed version'
     def version
       puts PhotoHelper::VERSION
     end
 
-    register PhotoHelper::Generate, :generate, "generate", "Do something else"
-    register PhotoHelper::Delete, :delete, "delete", "Do something else"
-    register PhotoHelper::Instagram, :instagram, "instagram", "Do something else"
-    register PhotoHelper::Move, :move, "move", "Do something else"
-    register PhotoHelper::Compress, :compress, "compress", "Do something else"
-    register PhotoHelper::Smugmug, :smugmug, "smugmug", "Interface with Smugmug"
-    register PhotoHelper::Screensaver, :screensaver, "screensaver", "Move best photos to screensaver folder and compress"
+    register PhotoHelper::Generate, :generate, 'generate', 'Do something else'
+    register PhotoHelper::Delete, :delete, 'delete', 'Do something else'
+    register PhotoHelper::Instagram, :instagram, 'instagram', 'Do something else'
+    register PhotoHelper::Move, :move, 'move', 'Do something else'
+    register PhotoHelper::Compress, :compress, 'compress', 'Do something else'
+    register PhotoHelper::Smugmug, :smugmug, 'smugmug', 'Interface with Smugmug'
+    register PhotoHelper::Screensaver, :screensaver, 'screensaver', 'Move best photos to screensaver folder and compress'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-helper
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Benjamin Caldwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2019-07-06 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.7
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: A tool to automatate my photo workflows