photo-helper 0.3.1 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f79f8c5b6fcbf41b5f21c0c04f799c05d3b56ecb
-  data.tar.gz: d7c4468e5d9a76a660043399ad93a6e46f5883c7
+  metadata.gz: 80cbb16dcdcf8f7cbadcf310bd1cb9817783660e
+  data.tar.gz: 1b343c9d6eed2fa4b8a0c228b17724c0f9214343
 SHA512:
-  metadata.gz: fba01046a7336ee1c75edd9677de24f6c6fc69833eef79d0dc925833a5ab70a74b02ec8dba8ad889deeeef6223b623571e02703a846688427a07b7a7e96597b0
-  data.tar.gz: 181d2bc4b6feedb15f179238aba6165a87e3e9b02176c5c07afe893409d48c4d258498ab62e7a16ff0461f12d2afb26ebcdf6cd2fb59471442fb23161c65d207
+  metadata.gz: 779dd813a904a2e01ba4b452f1c772b47ff0b551befcdf89592bea2fa92adbbfadc3833b2943f6a076da023baee960443e336df7402b4373e1c85ca87a90c8d5
+  data.tar.gz: 877c46eadf49655521a78bf16e993ebf067f465d3298bdc397572a87e8a1631ddad1a9aff638e95bc62a35b876ba481165f69d52ace8867a1f5476d5b8216b81

data/Gemfile.lock

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

data/lib/helpers/smugmug_album.rb

@@ -7,12 +7,36 @@ require 'set'
 class SmugmugAlbumHelper
   attr_accessor :smugmug_api
 
-  # to figure out what to delete, read all xmp files, loop through uploaded files and check xmp file
-
   PATH_REGEX = %r{^.+Pictures\/.+\/(\d{4})\/(\d{2})_.+\/[^_]+_([^\/]+)}
-  KEYWORD_WHITELITS = %w("instagram exported")
+  KEYWORD_WHITELITS = %w(instagram exported)
+
+  def self.supported_folder?(search_path)
+    PATH_REGEX.match?(search_path)
+  end
+
+  def self.recursive_sync(search_path)
+    folders = Dir[File.join(search_path, "*/")]
+    folders.each do |folder|
+      if SmugmugAlbumHelper.supported_folder?(folder)
+        puts "Syncing #{folder}\n"
+        sync(folder)
+        puts "\n"
+      else
+        recursive_sync(folder)
+      end
+    end
+  end
+
+  def self.sync(search_path)
+    smugmug = SmugmugAlbumHelper.new(search_path)
+    smugmug.upload_dl
+    puts "\n"
+    smugmug.collect_select
+  end
 
   def initialize(search_path, album = nil)
+    @search_extensions = IMAGE_EXTENSIONS.concat(["XMP"])
+
     @search_path = Pathname.new(search_path)
     @smugmug = SmugmugAPI.new
 
@@ -45,19 +69,19 @@ class SmugmugAlbumHelper
   end
 
   def image_list
-    Dir["#{@search_path}/**/*.{#{IMAGE_EXTENSIONS.join(',')}}"].reject { |p| FileHelper.ingore_file?(p) }
+    Dir[File.join(@search_path, "/**/*.{#{@search_extensions.join(',')}}")].reject { |p| FileHelper.ingore_file?(p)}
   end
 
   def exported_list
-    Dir["#{@search_path}/**/{Exported,exported}/*.{#{IMAGE_EXTENSIONS.join(',')}}"]
+    Dir[File.join(@search_path, "/**/{Exported,exported}/*.*")]
   end
 
   def instagram_list
-    Dir["#{@search_path}/**/{Instagram,instagram}/*.{#{IMAGE_EXTENSIONS.join(',')}}"]
+    Dir[File.join(@search_path, "/**/{Instagram,instagram}/*.*")]
   end
 
   def merge_exported(images = image_list, concat = false)
-    exported = Dir["#{@search_path}/**/{Exported,exported}/*.{#{IMAGE_EXTENSIONS.join(',')}}"]
+    exported = Dir["#{@search_path}/**/{Exported,exported}/*.*"]
     unless concat
       exported_basenames = exported.map { |p| File.basename(p, ".*") }
       images = images.reject { |p| exported_basenames.include? File.basename(p, ".*") }
@@ -79,16 +103,17 @@ class SmugmugAlbumHelper
     image_list_hash = {}
     images.each do |i|
       filename = File.basename(i, ".*")
-      tags = image_dir_keywords(i)
-      @keyword_list.merge(tags) if tags
+      keywords = image_dir_keywords(i)
+      @keyword_list.merge(keywords) if keywords
+
       push_hash_array(image_list_hash, filename, file: i,
-        keywords: tags,
+        keywords: keywords,
         md5: Digest::MD5.file(i).hexdigest)
     end
     image_list_hash
   end
 
-  def sync(album, image_list_hash, reject_trash = true)
+  def sync(album, image_list_hash, reject_trash = true, delete: true)
     uploaded_hash = uploaded_to_hash(album)
 
     to_upload = {}
@@ -127,7 +152,11 @@ class SmugmugAlbumHelper
           image_hash = image_list_hash[filename].find do |image|
             uploaded_match_requested?(image, uploaded)
           end
-          to_delete.push(uploaded) if image_hash.nil?
+
+          if image_hash.nil?
+            to_delete.push(uploaded)
+            next
+          end
           to_delete.push(uploaded) if reject_trash && ImageHelper.color_class(image_hash[:file]) == "Trash"
         else
           to_delete.push(uploaded)
@@ -140,18 +169,19 @@ class SmugmugAlbumHelper
       upload(album, images, keywords)
     end
 
-    if to_delete.any?
+    to_update.each do |keywords, images|
+      puts keywords
+      update(album, images, keywords)
+    end
+    # puts "delete #{to_delete.count}???"
+
+    if delete && to_delete.any?
       puts "Deleting #{to_delete.count} images"
       to_delete.each do |uploaded|
         puts uploaded[:filename]
         @smugmug.http(:delete, uploaded[:uri])
       end
     end
-
-    to_update.each do |keywords, images|
-      puts keywords
-      update(album, images, keywords)
-    end
   end
 
   def upload(album, pictures, keywords = nil)
@@ -172,15 +202,50 @@ class SmugmugAlbumHelper
     @smugmug.update_images(pictures, album[:id], headers, workers: 8, filename_as_title: true)
   end
 
-  def upload_dl
+  def upload_dl(album_name = nil)
+    album = if album
+      @smugmug.get_or_create_album(album_name)
+    else
+      @dl_album
+    end
+
     @keyword_list = Set.new
-    puts "Uploading all images to album #{@album_name} --> #{@dl_album[:web_uri]}\n"
+    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
+
+    pictures = image_list
+    pictures = pictures.select { |p| ImageHelper.is_select?(p) }
+    pictures = merge_exported(pictures)
 
-    sync(@dl_album, @image_list, true)
+    puts "Collecting selects to album #{@album_name} --> #{@album[:web_uri]}\n"
+
+    @image_list = image_list_to_hash(pictures)
+    @uploaded_hash ||= uploaded_to_hash(@album)
+    @dl_uploaded_hash ||= uploaded_to_hash(@dl_album)
+
+    to_collect = []
+    # no_match = {}
+
+    @image_list.each do |filename, images|
+      images.each do |image|
+        next unless @dl_uploaded_hash.key?(filename)
+        @dl_uploaded_hash[filename].each do |uploaded|
+          next unless uploaded_match_requested?(image, uploaded)
+          to_collect.push(uploaded[:uri]) unless to_collect.include? uploaded[:uri]
+          break
+        end
+      end
+    end
+
+    @smugmug.collect_images(to_collect, @album[:id])
   end
 
   def upload_select
@@ -214,7 +279,7 @@ class SmugmugAlbumHelper
   end
 
   def image_dir_keywords(image)
-    rel = Pathname.new(image).relative_path_from(@search_path).to_s.split("/")
+    rel = Pathname.new(image).relative_path_from(@search_path).to_s.downcase.split("/")
     # ignore first and last parts
     rel &= KEYWORD_WHITELITS
     return nil if rel.empty?
@@ -225,8 +290,8 @@ class SmugmugAlbumHelper
     if image[:keywords].nil?
       # empty from keyword list
       return true if uploaded[:keywords].nil? || @keyword_list & uploaded[:keywords] == Set.new
-    else
-      return true if image[:keywords] - uploaded[:keywords] == []
+    elsif image[:keywords] - uploaded[:keywords] == []
+      return true
     end
     false
   end

data/lib/helpers/smugmug_api.rb

@@ -177,7 +177,7 @@ class SmugmugAPI
   end
 
   def post(url, body = {}, headers = {})
-    url.tr!(' ', '-')
+    url = url.tr(' ', '-')
     headers['Accept'] = 'application/json'
     response = @http.post(url, body, headers)
     raise "Request failed\n#{response.body}" unless response.is_a? Net::HTTPSuccess
@@ -203,27 +203,27 @@ class SmugmugAPI
   end
 
   def upload_images(images, album_id, headers = {}, workers: 4, filename_as_title: false)
-    counter = 0
     Parallel.each(images, in_processes: workers, progress: "Uploading images") do |image|
       upload(image, album_id, headers, filename_as_title: filename_as_title)
-      # puts "#{counter}/#{images.count / workers}
       puts "Done #{image}"
     end
   end
 
   def update_images(images, album_id, headers = {}, workers: 4, filename_as_title: false)
-    counter = 0
-
     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)
-      # counter += 1
-      # puts "#{counter}/#{images.count / workers}
       puts "Done #{image[:file]}"
     end
   end
 
+  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)
+  end
+
   def request_access_token
     @consumer = OAuth::Consumer.new(@secrets.api_key, @secrets.api_secret,
       site: OAUTH_ORIGIN,

data/lib/photo-helper/smugmug.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'helpers/smugmug_album'
 require 'date'
 require 'helpers/image_helper'
@@ -12,35 +13,40 @@ module PhotoHelper
     method_option :folder, aliases: '-f', type: :string, default: '.'
     method_option :recursive, aliases: '-r', type: :boolean, default: false
     method_option :dry_run, aliases: '-d', type: :boolean, default: false
-    def sync(folder = nil, _album_name = nil)
+    method_option :no_delete, type: :boolean, default: false
+    def sync(folder = nil, album_name = nil)
       search_path = File.expand_path(folder)
 
-      @smugmug = SmugmugAlbumHelper.new(search_path)
+      if options[:recursive]
+        SmugmugAlbumHelper.recursive_sync(search_path)
+
+        return
+      end
 
-      @smugmug.upload_select
       puts("\n")
-      # if album_name
-      #   @smugmug.upload(album_name, @smugmug.image_list)
-      # else
-      @smugmug.upload_dl
-      # end
+      if album_name
+        @smugmug = SmugmugAlbumHelper.new(search_path)
+        @smugmug.upload_dl(album_name)
+      else
+        SmugmugAlbumHelper.sync(search_path)
+      end
     end
 
-    desc 'oauth', "fetch oauth credentials"
+    desc 'oauth', 'fetch oauth credentials'
     def oauth
       SmugmugAPI.new.request_access_token
     end
 
-    desc 'albums', "list albums with their weburl"
+    desc 'albums', 'list albums with their weburl'
     def albums
       @smugmug = SmugmugAPI.new
       albums = @smugmug.albums_long
 
-      current_month = albums.first[:path].split("/")[1]
-      output = ["# Photos", "## #{current_month}"]
+      current_month = albums.first[:path].split('/')[1]
+      output = ['# Photos', "## #{current_month}"]
 
       albums.each do |a|
-        month = a[:path].split("/")[1]
+        month = a[:path].split('/')[1]
         next unless month
         if month != current_month
           current_month = month

data/lib/photo-helper/version.rb

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

data/photo-helper.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'photo-helper/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-helper
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: '0.4'
 platform: ruby
 authors:
 - Benjamin Caldwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler