photo-helper 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74fe4a8df21965e6b330ce5f80b52602a26b447a
-  data.tar.gz: f77f8d97e6e3019e948de0edb00bd61f58b8d92c
+  metadata.gz: 10936e1f4337f7ca26a766b16b69fe7a955b5e9d
+  data.tar.gz: 2b9a13e9b775b1974441c5933a9189299da634af
 SHA512:
-  metadata.gz: 3aec807f26f222bf5764fc2213c5efa75f88168fe24fa67c59d4bd0bd6cc8663580bb3bb0d8ff1deb08842c3a604e3bac02c77c2943426682dcf758a72d0765c
-  data.tar.gz: 0d8a2ec77bc0b2e5825cafa386bcc0a7b9ded76a538f3d21ef1065585270174001474cdf1bd6a918f9cf292ad3a33e4fe2cd574376c6791e8563a8367c2a12f5
+  metadata.gz: 8626562041251a2d8f867fea3579d14dda11114c36d9934db2e6569248e2ee13a6cce1b1e8ca213b760aa6b47e5db29e0e401549a564b339cbb969a9972377c3
+  data.tar.gz: 7117f97c2b55af7fa1469c2c16d641cc6e64730e2dc2011980aef39ac0454ebd9d4f5690f362eff21bb623e4b2ee75b22a5ba6a644408ea4d4b5e0cb94af7ef9

data/Gemfile.lock

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

data/bin/photo-helper

@@ -7,4 +7,6 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'photo_helper'
 
+require 'byebug'
+
 PhotoHelper::CLI.start(ARGV)

data/lib/helpers/secrets.rb

@@ -5,7 +5,10 @@ require 'pathname'
 require 'json'
 
 class Secrets
+  attr_reader :ejson_config_file
+
   def initialize(config_file = nil, required = [])
+    @ejson_config_file = config_file
     @secrets = {}
     unless config_file.nil?
       load_from_ejson(config_file)
@@ -52,6 +55,10 @@ class Secrets
     required.each { |key| raise "required secrets not set: #{key}" if @secrets[key].nil? }
   end
 
+  def [](key)
+    @secrets[key.to_sym]
+  end
+
   def method_missing(key, *args)
     value = @secrets[key]
     return value unless value.nil?

data/lib/helpers/smugmug_api.rb

@@ -12,12 +12,12 @@ class SmugmugAPI
   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 = 'http://upload.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])
-    get_access_token if !@secrets.access_token || !@secrets.access_secret
+    request_access_token if !@secrets["access_token"] || !@secrets["access_secret"]
 
     @http = get_access_token
     @uploader = get_access_token(UPLOAD_ENDPOINT)
@@ -54,7 +54,8 @@ class SmugmugAPI
                         name: node['Name'],
                         web_uri: node['WebUri'],
                         node_uri: node['Uri'],
-                        id: File.basename(node['Uris']['Album']['Uri']))
+                        id: File.basename(node['Uris']['Album']['Uri']),
+                        type: 'node')
       end
     end
     album_list
@@ -102,10 +103,10 @@ class SmugmugAPI
       resp = post(url, Name: album_name,
                        UrlName: album_url.tr(' ', '-').capitalize,
                        Privacy: 'Unlisted',
-                       SmugSearchable: "No",
-                       SortMethod: "Date Taken",
-                       LargestSize: "X4Large",
-                       SortDirection: "Ascending",
+                       SmugSearchable: 'No',
+                       SortMethod: 'Date Taken',
+                       LargestSize: 'X4Large',
+                       SortDirection: 'Ascending',
                        WorldSearchable: false,
                        EXIF: false,
                        Printable: false,
@@ -210,12 +211,38 @@ class SmugmugAPI
     end
   end
 
-  private
-
   def request_access_token
-    raise 'Not Implemented'
+    @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)
+
+    # Generate request token
+    @request_token = @consumer.get_request_token
+
+    # Get authorize URL
+    @request_token.authorize_url
+
+    url = add_auth_params(@request_token.authorize_url, 'Access' => 'Full', 'Permissions' => 'Modify')
+
+    puts "Go to #{url} and enter shown 6 digit number:"
+    verifier = STDIN.gets.strip
+
+    # Now go to that url and when you're done authorization you can run the
+    # following command where you put in the value for oauth_verifier that you got
+    # from completely the above URL request:
+    access_token = @request_token.get_access_token(oauth_verifier: verifier)
+
+    puts "Add the following to your ejson file #{@secrets.ejson_config_file}:"
+    puts "\"access_token\": \"#{access_token.token}\","
+    puts "\"access_secret\": \"#{access_token.secret}\""
+    exit 0
   end
 
+  private
+
   def http_raw(method, url, headers = {}, _body = nil)
     url.tr!(' ', '-')
     headers['Accept'] = 'application/json'
@@ -265,4 +292,12 @@ class SmugmugAPI
       type: 'image'
     }
   end
+
+  def add_auth_params(url, params)
+    uri = URI.parse(url)
+    new_query_ar = URI.decode_www_form(uri.query || '')
+    params.to_a.each { |el| new_query_ar << el }
+    uri.query = URI.encode_www_form(new_query_ar)
+    uri.to_s
+  end
 end

data/lib/photo-helper/delete.rb

@@ -22,9 +22,9 @@ module PhotoHelper
 
       files =
         if options[:recursive]
-          Dir["#{search_path}/**/*.#{JPEG_EXTENSION}"]
+          Dir["#{search_path}/**/*.{#{JPEG_EXTENSIONS.join(",")}}"]
         else
-          Dir["#{search_path}/*.#{JPEG_EXTENSION}"]
+          Dir["#{search_path}/*.{#{JPEG_EXTENSIONS.join(",")}}"]
         end
 
       files.each do |file|

data/lib/photo-helper/move.rb

@@ -22,9 +22,9 @@ module PhotoHelper
 
       files =
         if options[:recursive]
-          Dir["#{search_path}/**/*.#{JPEG_EXTENSION}"]
+          Dir["#{search_path}/**/*.{#{JPEG_EXTENSIONS.join(",")}}"]
         else
-          Dir["#{search_path}/*.#{JPEG_EXTENSION}"]
+          Dir["#{search_path}/*.{#{JPEG_EXTENSIONS.join(",")}}"]
         end
 
       files.each do |file|

data/lib/photo-helper/smugmug.rb

@@ -33,9 +33,9 @@ module PhotoHelper
       puts "Using album: #{album_name}"
 
       @smugmug = SmugmugAPI.new
-      album = @smugmug.get_or_create_album(album_name, album_url: location.downcase)
+      album = @smugmug.get_or_create_album(album_name, album_url: location&.downcase)
       puts "#{album[:web_uri]}\n"
-      pictures = Dir["#{search_path}/**/*.JPG"]      
+      pictures = Dir["#{search_path}/**/*.{#{IMAGE_EXTENSIONS.join(",")}}"]      
       
       # remove uploaded pictures
       uploaded = @smugmug.image_list(album[:id])
@@ -44,5 +44,32 @@ module PhotoHelper
 
       @smugmug.upload_images(pictures, album[:id], workers: 8)
     end
+    
+    desc 'oauth', "fetch oauth credentials"
+    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)
+      @smugmug = SmugmugAPI.new
+      albums = @smugmug.albums_long
+
+      current_month = albums.first[:path].split("/")[1]
+      output = ["# Photos", "## #{current_month}"]
+
+      albums.each do |a|
+        month = a[:path].split("/")[1]
+        next unless month
+        if month != current_month
+          current_month = month
+          output.push("## #{current_month}")
+        end
+        output.push("[#{a[:name]}](#{a[:web_uri].gsub('http://', 'https://')})")
+      end
+
+      puts output.join("\n\n")
+    end
   end
 end

data/lib/photo-helper/version.rb

@@ -1,3 +1,3 @@
 module KubeDeploy
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/photo_helper.rb

@@ -14,6 +14,8 @@ require 'photo-helper/smugmug'
 # RAW_EXTENSION = "ORF"
 RAW_EXTENSION = "dng"
 JPEG_EXTENSION = "JPG"
+JPEG_EXTENSIONS = ["JPG", "jpg", "jpeg"]
+IMAGE_EXTENSIONS = JPEG_EXTENSIONS.merge([])
 PHOTOS_ROOT = "/Users/benjamincaldwell/Pictures/Pictures"
 JPEG_ROOT ="/Users/benjamincaldwell/Pictures/jpegs"
 IGNORE_FOLDERS = ["instagram", "exported", "edited"]
@@ -25,7 +27,7 @@ module PhotoHelper
 
     desc "version", "displays installed version"
     def version
-      puts KubeDeploy::VERSION
+      puts PhotoHelper::VERSION
     end
 
     register PhotoHelper::Generate, :generate, "generate", "Do something else"

metadata

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