photo-helper 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15c0871a007b14b316dea045d05cb6b1aa45138d
-  data.tar.gz: b1f3f2c3a80c62ab196d40509872cbb523f7ccfc
+  metadata.gz: 72ceb15c03d99b057c67256c085549136c8ba316
+  data.tar.gz: 03e82ca1efe158858eab5c189705275a071215d1
 SHA512:
-  metadata.gz: a90878d857cf0d91f67adad0e28fd31cb4d17397ee42bd98ae8f3ce6c6e2d02ecd1b8c5379b670fae7c7a3ff3d6a482f91c83f13c441609e166caff1032ea182
-  data.tar.gz: bb0bf7405842d936da3daba1af3defb8705a0960335ff97b3d16b28489a8dfe35db11ccd379e24c7d22c7b0c332a0c59b8d35111089dc010afef61a8eab3a127
+  metadata.gz: 1f06f55c4a414864ba7436950322ce7538c2bff225b5cf3243d8c4a87ec67dd0d5a6f622a3331407530a89a54f4d5626ff9ca030a3032b4448b50d16c0d1ab07
+  data.tar.gz: f4dbfa2de0930a5a3dc361b1dfabe4759fc15f919c00bdce35338bda1c77162e03781703adf472d9655c85d6c83b139838db2badefc93eb7d7006105f2eca888

data/Gemfile.lock

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

data/lib/helpers/file_helper.rb

@@ -9,6 +9,6 @@ class FileHelper
 
   def self.is_jpeg?(path)
     extension = File.extname(path)
-    ['.jpeg', '.jpg'].include? extension.downcase
+    JPEG_EXTENSIONS.include? extension.downcase
   end
 end

data/lib/helpers/image_helper.rb

@@ -1,11 +1,35 @@
 class ImageHelper
   IMAGE_CLASS_REGEX = %r{xmp:Label="(.+)"}
+  RATING_REGEX = %r{xmp:Rating="(.+)"}
     
-  def self.color_class(image)
+  def self.xmp(image)
     xmp = File.join(File.dirname(image), File.basename(image, ".*") + ".XMP")
     return unless File.exists?(xmp)
-    contents = File.read(xmp)
+    File.read(xmp)
+  end
+
+  def self.color_class(image)
+    contents = xmp(image)
     matches = contents.match(IMAGE_CLASS_REGEX)
-    matches[1] if matches      
+    matches[1] if matches
+  end
+
+  def self.contains_color_class?(image, values)
+    values = [values] unless values.is_a? Array
+    values.include? color_class(image)
+  end
+
+  def self.rating(image)
+    contents = xmp(image)
+    matches = contents.match(RATING_REGEX)
+    matches[1] if matches
+  end
+
+  def self.is_select?(image)
+    contains_color_class?(image, SELECT_COLOR_TAGS)
+  end
+
+  def self.is_5_star?(image)
+    rating(image) == '5'
   end
 end

data/lib/helpers/smugmug.rb

@@ -0,0 +1,84 @@
+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

data/lib/helpers/trash.rb

@@ -16,7 +16,7 @@ class File
         FileUtils.mv(filename,"/Volumes/#{$1}/.Trashes/501/")
       else
         # Main drive, move to ~/.Trash/
-        FileUtils.mv(filename,self.expand_path("~/.Trash/"))
+        FileUtils.mv(filename,self.expand_path("~/.Trash"))
       end
     # when /^Microsoft Windows/
     #   raise NotImplementedError, ""

data/lib/photo-helper/delete.rb

@@ -1,4 +1,5 @@
 require 'helpers/trash'
+require 'helpers/file_helper'
 
 module PhotoHelper
   class Delete < Thor
@@ -28,9 +29,13 @@ module PhotoHelper
         end
 
       files.each do |file|
-        raw_file_name = File.basename(file.to_s, JPEG_EXTENSION) + RAW_EXTENSION
-        next unless File.exist? File.join(search_path, raw_file_name)
-
+        has_raw = false
+        RAW_EXTENSIONS.each do |extension|
+          raw_file_name = "#{File.basename(file.to_s, '.*')}.#{extension}"
+          has_raw = true if File.exist? File.join(File.dirname(file.to_s), raw_file_name)
+        end
+        next unless has_raw
+        next if FileHelper.ingore_file?(file)
         puts file
 
         if options[:hard]

data/lib/photo-helper/smugmug.rb

@@ -1,49 +1,30 @@
-require 'helpers/smugmug_api'
+require 'helpers/smugmug'
 require 'date'
 require 'helpers/image_helper'
 
 module PhotoHelper
   class Smugmug < Thor
     include Thor::Actions
-    PATH_REGEX = %r{^.+Pictures\/.+\/(\d{4})\/(\d{2})_.+\/[^_]+_([^\/]+)}
 
     map 's' => 'sync'
-
     desc 'sync', "sync folder's non-raw images with smugmug"
     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)
       search_path = File.expand_path(folder)
-      unless album_name
-        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(' ')
 
-          folder = "#{month} #{year}"
-          album_name_short = "#{location} #{month} #{year}"
-          album_name = File.join(year, month, album_name_short)
-        else
-          puts 'Unable to determine album from path'
-          return
-        end
-      end
-      puts "Using album: #{album_name}"
+      @smugmug = SmugmugHelper.new(search_path)
 
-      @smugmug = SmugmugAPI.new
-      album = @smugmug.get_or_create_album(album_name, album_url: location&.downcase)
-      puts "#{album[:web_uri]}\n"
-      pictures = Dir["#{search_path}/**/*.{#{IMAGE_EXTENSIONS.join(",")}}"]      
-      
-      # remove uploaded pictures
-      uploaded = @smugmug.image_list(album[:id])
-      pictures = pictures.reject { |p| (ImageHelper.color_class(p) == "Trash" or uploaded.include? File.basename(p)) }
-      puts "Uploading #{pictures.count} jpegs"
-
-      @smugmug.upload_images(pictures, album[:id], workers: 8)
+      @smugmug.upload_select
+      puts("\n")
+      if album_name
+        @smugmug.upload(album_name, @smugmug.image_list)
+      else
+        @smugmug.upload_dl
+      end
     end
-    
+
     desc 'oauth', "fetch oauth credentials"
     def oauth()
       SmugmugAPI.new.request_access_token

data/lib/photo-helper/version.rb

@@ -1,3 +1,3 @@
 module KubeDeploy
-  VERSION = '0.2.9'.freeze
+  VERSION = '0.2.10'.freeze
 end

data/lib/photo_helper.rb

@@ -19,11 +19,13 @@ 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"]
 
 module PhotoHelper
   class CLI < Thor
     map "g" => "generate"
     map "d" => "delete"
+    map "s" => "smugmug"
 
     desc "version", "displays installed version"
     def version

metadata

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