photo-helper 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ebc81166744455f3d5beb78c36becd87c84b9ec
-  data.tar.gz: 64f264c31fbe8cb8567a26898f604f90fed5641e
+  metadata.gz: 872ff4ca51d026c5d2989c1f963ea9bd61d6d253
+  data.tar.gz: c14da101067339ee1f280487a89a812c41e28c95
 SHA512:
-  metadata.gz: 1319f5edfb2d865bd36a5e2a3bc925b72a55e65aaf14527907b210f816c5d45d9a60c660c89c9661dc23952bb8f9cceba7e4ddc203f48fadf72b8f052d129a04
-  data.tar.gz: ad76247a736ad38f397945721cd79f18c6c517ecd9d7345a707e346990eafb7be969f2ba38b0eac38cd58b8b15a9263439754b7019752336a0ea1bc7a6e414e9
+  metadata.gz: 047bce5bf33f8b21db4a162e5b50850ada553b4f49c0c43a6d8a55a3200902afda0ec505248c2625abc4e972c275e72104faeb885946325b5b8e5f730f5935a2
+  data.tar.gz: 39ae529a24cd3e492fe5440817f860fe0e965d0062b32d8bb39376af777e3467ceb7574fc0b8d94c01081ab831f9563957272d2dcf629d7e941aaaed9869cc0a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    photo-helper (0.1.2)
+    photo-helper (0.1.4)
       thor
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.15.3
+   1.15.4

data/lib/helpers/file_helper.rb

@@ -0,0 +1,9 @@
+class FileHelper
+	def self.directory(path) 
+		File.dirname(path).split("/").last
+	end
+
+	def self.ingore_file?(path)
+		IGNORE_FOLDERS.include? directory(path).downcase
+	end
+end

data/lib/photo-helper/delete.rb

@@ -20,8 +20,6 @@ module PhotoHelper
       search_path = File.expand_path(folder)
       jpeg_path = File.join(search_path, "jpegs")
 
-      Dir.mkdir(jpeg_path) unless File.exist?(jpeg_path)
-
       files =
         if options[:recursive]
           Dir["#{search_path}/**/*.#{JPEG_EXTENSION}"]
@@ -42,7 +40,7 @@ module PhotoHelper
         end
       end
 
-      next unless File.exist?(jpeg_path) && yes?("Delete jpeg folder?")
+      return unless File.exist?(jpeg_path) && yes?("Delete jpeg folder?")
       say "Deleting jpeg folder", :red
       if options[:hard]
         File.delete(jpeg_path)

data/lib/photo-helper/generate.rb

@@ -1,3 +1,5 @@
+# exiftool -b -previewimage 2017-09-24-seattle-23.ORF>hi.jpg
+
 module PhotoHelper
   class Generate < Thor
     include Thor::Actions

data/lib/photo-helper/instagram.rb

@@ -0,0 +1,58 @@
+require "helpers/file_helper"
+
+module PhotoHelper
+  class Instagram < Thor
+    include Thor::Actions
+
+    def self.folders
+    	["instagram"]
+	  end
+
+	  def self.album
+	  	"Instagram"
+	  end
+
+	  desc "load", "load all pictures in instagram folders into apple photos"
+
+    method_option :recursive, aliases: "-r", type: :boolean, default: false
+    method_option :folder, aliases: "-f", type: :string, default: "."
+
+    def self.osascript(script)
+		  system 'osascript', *script.split(/\n/).map { |line| ['-e', line] }.flatten
+		end
+
+	  def load(folder=nil)
+      folder ||= options[:folder]
+
+      search_path = File.expand_path(folder)
+
+      files =
+        if options[:recursive]
+          Dir["#{search_path}/**/*"]
+        else
+          Dir["#{search_path}/*"]
+        end
+
+        pictures = []
+
+        files.each do |file|
+        	folder = FileHelper.directory(file)
+        	next unless PhotoHelper::Instagram.folders.include? (folder)
+        	pictures.concat([file])
+	      end
+	      puts pictures
+      	PhotoHelper::Instagram.osascript <<-END
+				 tell application "Photos"
+				   activate
+				   delay 2
+				   set ablum to get album "#{PhotoHelper::Instagram.album}"
+				   set imageList to {"#{pictures.join('","')}"}
+				   import imageList into ablum skip check duplicates no
+				 end tell
+				END
+
+      end
+
+      default_task :load
+	end
+end

data/lib/photo-helper/move.rb

@@ -0,0 +1,43 @@
+require "helpers/trash"
+require 'fileutils'
+require 'helpers/file_helper'
+
+module PhotoHelper
+  class Move < Thor
+    include Thor::Actions
+
+    map "j" => "jpeg"
+    map "jpg" => "jpeg"
+    map "jpgs" => "jpeg"
+    map "jpegs" => "jpeg"
+
+    desc "jpeg", "delete jpegs that have an raw with same name"
+    method_option :folder, aliases: "-f", type: :string, default: "."
+    method_option :recursive, aliases: "-r", type: :boolean, default: false
+    def jpeg(folder = nil)
+      folder ||= options[:folder]
+      puts folder
+
+      search_path = File.expand_path(folder)
+
+      files =
+        if options[:recursive]
+          Dir["#{search_path}/**/*.#{JPEG_EXTENSION}"]
+        else
+          Dir["#{search_path}/*.#{JPEG_EXTENSION}"]
+        end
+
+      files.each do |file|
+        next if FileHelper.ingore_file?(file)
+        relative_path = Pathname.new(file).relative_path_from(Pathname.new(PHOTOS_ROOT)).to_s
+        new_path = File.join(JPEG_ROOT, relative_path)
+        path_dir = File.dirname(new_path)
+
+        FileUtils.mkdir_p path_dir unless File.exists? path_dir
+
+        FileUtils.mv file, new_path 
+
+      end
+    end
+  end
+end

data/lib/photo-helper/version.rb

@@ -1,3 +1,3 @@
 module KubeDeploy
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/photo_helper.rb

@@ -5,10 +5,16 @@ require 'helpers/printer'
 require 'photo-helper/version'
 require 'photo-helper/generate'
 require 'photo-helper/delete'
+require 'photo-helper/move'
+require 'photo-helper/instagram'
 
 # todo: move to config file
-RAW_EXTENSION = "ORF"
+# RAW_EXTENSION = "ORF"
+RAW_EXTENSION = "dng"
 JPEG_EXTENSION = "JPG"
+PHOTOS_ROOT = "/Users/benjamincaldwell/Pictures/Pictures"
+JPEG_ROOT ="/Users/benjamincaldwell/Pictures/jpegs"
+IGNORE_FOLDERS = ["instagram", "exported", "edited"]
 
 module PhotoHelper
   class CLI < Thor
@@ -19,9 +25,10 @@ module PhotoHelper
     def version
       puts KubeDeploy::VERSION
     end
-    # default_task :version
 
     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"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-helper
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Benjamin Caldwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,10 +140,13 @@ files:
 - bin/photo-helper
 - bin/setup
 - exe/photo-helper
+- lib/helpers/file_helper.rb
 - lib/helpers/printer.rb
 - lib/helpers/trash.rb
 - lib/photo-helper/delete.rb
 - lib/photo-helper/generate.rb
+- lib/photo-helper/instagram.rb
+- lib/photo-helper/move.rb
 - lib/photo-helper/version.rb
 - lib/photo_helper.rb
 - photo-helper.gemspec