photo-helper 0.2.10 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72ceb15c03d99b057c67256c085549136c8ba316
-  data.tar.gz: 03e82ca1efe158858eab5c189705275a071215d1
+  metadata.gz: e4bbf183dc81a5e29d5e0a0d8007073494144da3
+  data.tar.gz: 53085441c3aec638bd8b4a5e6362dd9f2de88164
 SHA512:
-  metadata.gz: 1f06f55c4a414864ba7436950322ce7538c2bff225b5cf3243d8c4a87ec67dd0d5a6f622a3331407530a89a54f4d5626ff9ca030a3032b4448b50d16c0d1ab07
-  data.tar.gz: f4dbfa2de0930a5a3dc361b1dfabe4759fc15f919c00bdce35338bda1c77162e03781703adf472d9655c85d6c83b139838db2badefc93eb7d7006105f2eca888
+  metadata.gz: 0d872ce3085f8282759470f87eeb8acc04e5409d18ec958a1ee3ac557829e223d7ff09165f09fbcbafa419e87b715ee6851d5904f851c20949fe60223c47da45
+  data.tar.gz: a6cc39c361ed40180fa1c030cbec37fb4c51c30c9a1e04dde194bb8aef1f1f7d1b2f2fe3726f434f6d04c6baf1776a4b2abc6fc836fb7debe958f610b9c2b48b

data/Gemfile.lock

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

data/bin/photo-helper

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 

data/lib/helpers/file_helper.rb

@@ -8,7 +8,9 @@ class FileHelper
   end
 
   def self.is_jpeg?(path)
-    extension = File.extname(path)
+    # remove . from the beginning
+    extension = File.extname(path)[1..-1]
+    return false if extension.nil?
     JPEG_EXTENSIONS.include? extension.downcase
   end
 end

data/lib/helpers/image_helper.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
 class ImageHelper
-  IMAGE_CLASS_REGEX = %r{xmp:Label="(.+)"}
-  RATING_REGEX = %r{xmp:Rating="(.+)"}
-    
+  IMAGE_CLASS_REGEX = /xmp:Label="(.+)"/
+  RATING_REGEX = /xmp:Rating="(.+)"/
+
   def self.xmp(image)
     xmp = File.join(File.dirname(image), File.basename(image, ".*") + ".XMP")
-    return unless File.exists?(xmp)
+    return unless File.exist?(xmp)
     File.read(xmp)
   end
 
   def self.color_class(image)
     contents = xmp(image)
+    return if contents.nil?
     matches = contents.match(IMAGE_CLASS_REGEX)
     matches[1] if matches
   end
@@ -32,4 +34,11 @@ class ImageHelper
   def self.is_5_star?(image)
     rating(image) == '5'
   end
+
+  def self.is_jpeg?(path)
+    # remove . from the beginning
+    extension = File.extname(path)[1..-1]
+    return false if extension.nil?
+    JPEG_EXTENSIONS.include? extension.downcase
+  end
 end

data/lib/helpers/smugmug_album.rb

@@ -0,0 +1,233 @@
+# frozen_string_literal: true
+require "helpers/smugmug_api"
+require "helpers/image_helper"
+require "helpers/file_helper"
+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")
+
+  def initialize(search_path, album = nil)
+    @search_path = Pathname.new(search_path)
+    @smugmug = SmugmugAPI.new
+
+    @album_name = album || album_name
+
+    @album = @smugmug.get_or_create_album(@album_name, album_url: @location&.downcase)
+
+    @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
+  end
+
+  def parse_path
+    if matches = "#{@search_path}/".to_s.match(PATH_REGEX)
+      @year = matches[1]
+      @month = Date::MONTHNAMES[matches[2].to_i].capitalize
+      @location = matches[3].split("_").map(&:capitalize).join(' ')
+    end
+  end
+
+  def album_name
+    parse_path
+    if @year && @month && @location
+      album_name_short = "#{@location} #{@month} #{@year}"
+      File.join(@year, @month, album_name_short)
+    else
+      puts 'Unable to determine album from path'
+    end
+  end
+
+  def image_list
+    Dir["#{@search_path}/**/*.{#{IMAGE_EXTENSIONS.join(',')}}"].reject { |p| FileHelper.ingore_file?(p) }
+  end
+
+  def exported_list
+    Dir["#{@search_path}/**/{Exported,exported}/*.{#{IMAGE_EXTENSIONS.join(',')}}"]
+  end
+
+  def instagram_list
+    Dir["#{@search_path}/**/{Instagram,instagram}/*.{#{IMAGE_EXTENSIONS.join(',')}}"]
+  end
+
+  def merge_exported(images = image_list, concat = false)
+    exported = Dir["#{@search_path}/**/{Exported,exported}/*.{#{IMAGE_EXTENSIONS.join(',')}}"]
+    unless concat
+      exported_basenames = exported.map { |p| File.basename(p, ".*") }
+      images = images.reject { |p| exported_basenames.include? File.basename(p, ".*") }
+    end
+    images.concat(exported)
+  end
+
+  def uploaded_to_hash(album)
+    uploaded = @smugmug.images(album[:id])
+    uploaded_hash = {}
+    uploaded.each do |u|
+      filename = File.basename(u[:filename], ".*")
+      push_hash_array(uploaded_hash, filename, u)
+    end
+    uploaded_hash
+  end
+
+  def image_list_to_hash(images)
+    image_list_hash = {}
+    images.each do |i|
+      filename = File.basename(i, ".*")
+      tags = image_dir_keywords(i)
+      @keyword_list.merge(tags) if tags
+      push_hash_array(image_list_hash, filename, file: i,
+        keywords: tags,
+        md5: Digest::MD5.file(i).hexdigest)
+    end
+    image_list_hash
+  end
+
+  def sync(album, image_list_hash, reject_trash = true)
+    uploaded_hash = uploaded_to_hash(album)
+
+    to_upload = {}
+    to_update = {}
+    to_delete = []
+
+    image_list_hash.each do |filename, images|
+      images.each do |image|
+        next unless ImageHelper.is_jpeg?(image[:file])
+        next if reject_trash && ImageHelper.color_class(image[:file]) == "Trash"
+
+        upload_image = true
+
+        if uploaded_hash.key?(filename)
+          !uploaded_hash[filename].each do |uploaded|
+            next unless uploaded_match_requested?(image, uploaded)
+
+            # & 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
+
+        if upload_image
+          push_hash_array(to_upload, image[:keywords], image[:file])
+        end
+      end
+    end
+
+    uploaded_hash.each do |filename, uploaded_images|
+      uploaded_images.each do |uploaded|
+        if image_list_hash.key?(filename)
+          image_hash = image_list_hash[filename].find do |image|
+            uploaded_match_requested?(image, uploaded)
+          end
+          to_delete.push(uploaded) if image_hash.nil?
+          to_delete.push(uploaded) if reject_trash && ImageHelper.color_class(image_hash[:file]) == "Trash"
+        else
+          to_delete.push(uploaded)
+        end
+      end
+    end
+
+    to_upload.each do |keywords, images|
+      puts keywords
+      upload(album, images, keywords)
+    end
+
+    if 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)
+    puts "Uploading #{pictures.count} jpegs"
+
+    headers = {}
+    headers["X-Smug-Keywords"] = keywords.join(",") unless keywords.nil?
+
+    @smugmug.upload_images(pictures, album[:id], headers, workers: 8, filename_as_title: true)
+  end
+
+  def update(album, pictures, keywords = nil)
+    puts "Updating #{pictures.count} jpegs"
+
+    headers = {}
+    headers["X-Smug-Keywords"] = keywords.join(",") unless keywords.nil?
+
+    @smugmug.update_images(pictures, album[:id], headers, workers: 8, filename_as_title: true)
+  end
+
+  def upload_dl
+    @keyword_list = Set.new
+    puts "Uploading all images to album #{@album_name} --> #{@dl_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(@dl_album, @image_list, true)
+  end
+
+  def upload_select
+    @keyword_list = Set.new
+
+    pictures = image_list
+    pictures = pictures.select { |p| ImageHelper.is_select?(p) }
+    pictures = merge_exported(pictures)
+
+    puts "Uploading selects to album #{@album_name} --> #{@album[:web_uri]}\n"
+
+    @image_list = image_list_to_hash(pictures)
+
+    sync(@album, @image_list, true)
+  end
+
+  private
+
+  def push_hash_array(hash, key, item)
+    hash[key] = [] unless hash.key?(key)
+    hash[key].push(item)
+    hash
+  end
+
+  def merge_hash_array(hash1, hash2)
+    hash2.each do |key, value|
+      hash1[key] = [] unless hash1.key?(key)
+      hash1[key].concat(value)
+    end
+    hash1
+  end
+
+  def image_dir_keywords(image)
+    rel = Pathname.new(image).relative_path_from(@search_path).to_s.split("/")
+    # ignore first and last parts
+    rel &= KEYWORD_WHITELITS
+    return nil if rel.empty?
+    rel
+  end
+
+  def uploaded_match_requested?(image, uploaded)
+    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] == []
+    end
+    false
+  end
+end

data/lib/helpers/smugmug_api.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'helpers/secrets'
 require 'oauth'
 require 'uri'
@@ -7,16 +8,16 @@ require 'parallel'
 
 class SmugmugAPI
   attr_accessor :http, :uploader
-  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
+  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/'
 
   def initialize(ejson_file = '~/.photo_helper.ejson')
     ejson_file = File.expand_path(ejson_file)
-    @secrets = Secrets.new(ejson_file, %i[api_key api_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
@@ -69,8 +70,6 @@ class SmugmugAPI
     get('/api/v2!authuser')['User']
   end
 
-  def images; end
-
   def folders
     folder_list = []
     resp = get('/api/v2/folder/user/bcaldwell!folderlist')
@@ -83,7 +82,6 @@ class SmugmugAPI
   def get_or_create_album(path, album_url: nil)
     folder_path = File.dirname(path).split('/').map(&:capitalize).join('/')
     album_name = File.basename(path).split(' ').map(&:capitalize).join(' ')
-    puts album_name
     album = nil
 
     folder = get_or_create_folder(folder_path)
@@ -165,14 +163,14 @@ class SmugmugAPI
     @images.map { |i| i[:filename] }
   end
 
-  def http(method, url, headers = {}, _body = nil)
-    response = http_raw(method, url, headers, _body)
+  def http(method, url, headers = {}, body = nil)
+    response = http_raw(method, url, headers, body)
     raise 'Request failed' unless response.is_a? Net::HTTPSuccess
     JSON.parse(response.body)['Response']
   end
 
   def get(url, params = nil, headers = {})
-    url.tr!(' ', '-')
+    url = url.tr(' ', '-')
     uri = URI.parse(url)
     uri.query = URI.encode_www_form(params) if params
     http(:get, uri.to_s, headers)
@@ -186,38 +184,53 @@ class SmugmugAPI
     JSON.parse(response.body)['Response']
   end
 
-  def upload(image_path, album_id, headers = {})
+  def upload(image_path, album_id, headers = {}, filename_as_title: false)
     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
 
     resp = @uploader.post('/', image, headers)
     resp.body
   end
 
-  def upload_images(images, album_id, headers = {}, workers: 4)
+  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) do |image|
-      upload(image, album_id, headers)
-      counter += 1
-      puts "#{counter}/#{images.count / workers} Done #{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)
+      # counter += 1
+      # puts "#{counter}/#{images.count / workers}
+      puts "Done #{image[:file]}"
     end
   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
@@ -244,9 +257,8 @@ class SmugmugAPI
   private
 
   def http_raw(method, url, headers = {}, _body = nil)
-    url.tr!(' ', '-')
+    url = url.tr(' ', '-')
     headers['Accept'] = 'application/json'
-
     @http.request(method, url, headers)
   end
 

data/lib/photo-helper/compress.rb

@@ -1,14 +1,14 @@
-require "mini_magick"
-require "helpers/file_helper"
+require 'mini_magick'
+require 'helpers/file_helper'
 
 module PhotoHelper
   class Compress < Thor
     include Thor::Actions
 
-    method_option :recursive, aliases: "-r", type: :boolean, default: false
-    method_option :overwrite, aliases: "-f", type: :boolean, default: false
-    desc "images", "compress images in folder"
-    def images(folder=nil)
+    method_option :recursive, aliases: '-r', type: :boolean, default: false
+    method_option :overwrite, aliases: '-o', type: :boolean, default: false
+    desc 'images', 'compress images in folder'
+    def images(folder = nil)
       folder ||= options[:folder]
 
       search_path = File.expand_path(folder)
@@ -21,28 +21,29 @@ module PhotoHelper
         end
 
       files.each do |file|
-        next if File.basename(file, ".*").end_with? (".min")
+        next if File.basename(file, '.*').end_with? '.min'
         next unless FileHelper.is_jpeg?(file)
 
         image = MiniMagick::Image.open(file)
         orig_size = image.size
 
         image.combine_options do |b|
-          b.sampling_factor "4:2:0"
+          b.sampling_factor '4:2:0'
           b.strip
-          b.interlace "JPEG"
-          b.colorspace "RGB"
+          b.interlace 'JPEG'
+          b.colorspace 'RGB'
           b.quality 85
         end
+        next if orig_size == image.size
         puts "#{file} (#{(orig_size / image.size) * 100}%)"
 
-        output_path = 
+        output_path =
           if options[:overwrite]
             file
           else
-            File.join( File.dirname(file), File.basename(file, ".*") + ".min" + File.extname(file))
+            File.join(File.dirname(file), File.basename(file, '.*') + '.min' + File.extname(file))
           end
- 
+
         image.write output_path
       end
     end

data/lib/photo-helper/screensaver.rb

@@ -0,0 +1,30 @@
+require 'helpers/file_helper'
+require 'photo-helper/compress'
+
+module PhotoHelper
+  class Screensaver < Thor
+    include Thor::Actions
+
+    method_option :overwrite, aliases: '-o', type: :boolean, default: false
+    desc 'move', 'Move best photos to screensaver folder and compress'
+    def move
+      files = Dir["#{BEST_OF_ROOT}/**/*"]
+
+      files.each do |file|
+        next unless FileHelper.is_jpeg?(file)
+        dest = File.join(SCREENSAVER_ROOT, File.basename(file))
+        next if File.exist?(dest)
+        puts file
+        FileUtils.copy(file, dest)
+      end
+
+      puts 'Compressing'
+
+      compress = PhotoHelper::Compress.new
+      compress.options = { overwrite: true }
+      compress.images(SCREENSAVER_ROOT)
+    end
+
+    default_task :move
+  end
+end

data/lib/photo-helper/smugmug.rb

@@ -1,4 +1,5 @@
-require 'helpers/smugmug'
+# frozen_string_literal: true
+require 'helpers/smugmug_album'
 require 'date'
 require 'helpers/image_helper'
 
@@ -11,28 +12,27 @@ 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)
+    def sync(folder = nil, _album_name = nil)
       search_path = File.expand_path(folder)
 
-      @smugmug = SmugmugHelper.new(search_path)
+      @smugmug = SmugmugAlbumHelper.new(search_path)
 
       @smugmug.upload_select
       puts("\n")
-      if album_name
-        @smugmug.upload(album_name, @smugmug.image_list)
-      else
-        @smugmug.upload_dl
-      end
+      # if album_name
+      #   @smugmug.upload(album_name, @smugmug.image_list)
+      # else
+      @smugmug.upload_dl
+      # end
     end
 
     desc 'oauth', "fetch oauth credentials"
-    def oauth()
+    def oauth
       SmugmugAPI.new.request_access_token
     end
 
     desc 'albums', "list albums with their weburl"
-    method_option :folder, aliases: '-f', type: :string, default: '.'
-    def albums(folder = nil, album_name = nil)
+    def albums
       @smugmug = SmugmugAPI.new
       albums = @smugmug.albums_long
 

data/lib/photo-helper/version.rb

@@ -1,3 +1,4 @@
-module KubeDeploy
-  VERSION = '0.2.10'.freeze
+# frozen_string_literal: true
+module PhotoHelper
+  VERSION = '0.3'
 end

data/lib/photo_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'thor'
 
 require 'helpers/printer'
@@ -9,17 +10,20 @@ require 'photo-helper/move'
 require 'photo-helper/instagram'
 require 'photo-helper/compress'
 require 'photo-helper/smugmug'
+require 'photo-helper/screensaver'
 
-# todo: move to config file
+# TODO: move to config file
 RAW_EXTENSION = "dng"
 RAW_EXTENSIONS = [RAW_EXTENSION, "DNG", "ORF"]
 JPEG_EXTENSION = "JPG"
-JPEG_EXTENSIONS = ["JPG", "jpg", "jpeg"]
+JPEG_EXTENSIONS = %w(JPG jpg jpeg)
 IMAGE_EXTENSIONS = JPEG_EXTENSIONS.concat([])
-PHOTOS_ROOT = "/Users/benjamincaldwell/Pictures/Pictures"
-JPEG_ROOT ="/Users/benjamincaldwell/Pictures/jpegs"
-IGNORE_FOLDERS = ["instagram", "exported", "edited"]
-SELECT_COLOR_TAGS = ["Winner", "Winner alt", "Superior", "Superior alt"]
+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"]
 
 module PhotoHelper
   class CLI < Thor
@@ -37,6 +41,7 @@ module PhotoHelper
     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::Smugmug, :smugmug, "smugmug", "Interface with Smugmug"
+    register PhotoHelper::Screensaver, :screensaver, "screensaver", "Move best photos to screensaver folder and compress"
   end
 end

data/photo-helper.gemspec

@@ -5,7 +5,7 @@ require 'photo-helper/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "photo-helper"
-  spec.version       = KubeDeploy::VERSION
+  spec.version       = PhotoHelper::VERSION
   spec.authors       = ["Benjamin Caldwell"]
   spec.email         = ["caldwellbenjamin8@gmail.com"]
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "rubocop"
-  
+
   spec.add_dependency "thor"
   spec.add_dependency "mini_magick"
   spec.add_dependency "ejson"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-helper
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: '0.3'
 platform: ruby
 authors:
 - Benjamin Caldwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-25 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -216,7 +216,7 @@ files:
 - lib/helpers/image_helper.rb
 - lib/helpers/printer.rb
 - lib/helpers/secrets.rb
-- lib/helpers/smugmug.rb
+- lib/helpers/smugmug_album.rb
 - lib/helpers/smugmug_api.rb
 - lib/helpers/trash.rb
 - lib/photo-helper/compress.rb
@@ -224,6 +224,7 @@ files:
 - lib/photo-helper/generate.rb
 - lib/photo-helper/instagram.rb
 - lib/photo-helper/move.rb
+- lib/photo-helper/screensaver.rb
 - lib/photo-helper/smugmug.rb
 - lib/photo-helper/version.rb
 - lib/photo_helper.rb

data/lib/helpers/smugmug.rb

@@ -1,84 +0,0 @@
-require "helpers/smugmug_api"
-require "helpers/image_helper"
-require "helpers/file_helper"
-
-class SmugmugHelper
-  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})_.+\/[^_]+_([^\/]+)}
-  
-  def initialize(search_path)
-    @search_path = search_path
-    @smugmug = SmugmugAPI.new    
-  end
-
-  def parse_path
-    if matches = "#{@search_path}/".to_s.match(PATH_REGEX)
-      @year = matches[1]
-      @month = Date::MONTHNAMES[matches[2].to_i].capitalize
-      @location = matches[3].split("_").map(&:capitalize).join(' ')
-    end
-  end
-
-  def album_name
-    parse_path
-    if @year && @month && @location
-      folder = "#{@month} #{@year}"
-      album_name_short = "#{@location} #{@month} #{@year}"
-      File.join(@year, @month, album_name_short)
-    else
-      puts 'Unable to determine album from path'
-    end
-  end
-
-  def image_list
-    # todo: exclude exported path
-    Dir["#{@search_path}/**/*.{#{IMAGE_EXTENSIONS.join(",")}}"].reject{ |p| FileHelper.ingore_file?(p) }
-  end
-
-  def merge_exported(images = image_list)
-    exported = Dir["#{@search_path}/**/{Exported,exported}/*.{#{IMAGE_EXTENSIONS.join(",")}}"]
-    exported_basenames = exported.map{ |p| File.basename(p, ".*") }
-    images = images.reject { |p| exported_basenames.include? File.basename(p, ".*") }
-    images.concat(exported)
-  end
-
-  def upload(album_name, pictures, reject_trash = true)
-    album = @smugmug.get_or_create_album(album_name, album_url: @location&.downcase)
-    puts "#{album[:web_uri]}\n"
-    
-    # remove uploaded pictures
-    uploaded = @smugmug.image_list(album[:id])
-    
-    pictures = pictures.reject do |p|
-      if reject_trash
-        return true if ImageHelper.color_class(p) == "Trash"
-      end
-      uploaded.include? File.basename(p)
-    end
-    
-    puts "Uploading #{pictures.count} jpegs"
-
-    @smugmug.upload_images(pictures, album[:id], workers: 8)
-  end
-
-  def upload_dl
-    @album_name = album_name
-    @album_name = File.join("dl", @album_name)
-
-    puts "Uploading all images to album #{@album_name}"
-    upload(@album_name, image_list)
-  end
-
-  def upload_select
-    @album_name = album_name
-    pictures = image_list
-    pictures = pictures.select{ |p| ImageHelper.is_select?(p)}
-    pictures = merge_exported(pictures)
-
-    puts "Uploading selects to album #{@album_name}"
-    upload(@album_name, pictures)
-  end
-end