desoto-photoapp 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 185ccf03bd22737b9e08a24a510eca676756d8ca
-  data.tar.gz: 38c4d6902e24c4965bf2324c40ac6741a963b3ea
+  metadata.gz: d5949131739e516e163c03bd44c2fd32a4e800dc
+  data.tar.gz: eba38bdd03a9f1e1169209c2e1ee8aec3bad00c6
 SHA512:
-  metadata.gz: 36c34a300be4d316241780afcfc536d9ab2d310c377af6d6cde6ec94cae1a46fb11e17b2e0b0c8b1cc66337605c5c90c08e6dade2295264a82b2c8ffce9d1509
-  data.tar.gz: af9a815ca6ab03c3d5a4fde02c6ff40d86200fe499a2936144005486c5bc9e954b82b5e5c21916ccca6cdb2a240bb1b6dce88e38733b4b5ff5e6ee8f82622277
+  metadata.gz: ce5c5d075f1920ac9a0627aadd7aba2b8e0b40d4fdbb3544ae7e39b7ca5f11fb1fbfa002147769598885c06966ecd9f565e3cc73dec0b32cb2120f9f9e4a91f4
+  data.tar.gz: d584d96845fa977832d0ed00fa4da872f710dc39becb832c193277abf5b84fa960062c4dea1f56e33c32ebc0a5e2c730c287cdd4b67856e50bbb489a978e3e99

data/bin/process.sh

@@ -1,3 +1,4 @@
 source ~/.bash_profile
 photoapp process
 photoapp upload
+photoapp import_alt

data/exe/photoapp

@@ -115,6 +115,8 @@ when 'reprint'
   Photoapp::Session.new(options).reprint
 when 'import'
   Photoapp::Session.new(options).import
+when 'import_alt'
+  Photoapp::Session.new(options).import_alt
 when 'print'
   Photoapp::Session.new(options).print
 when 'optimize'

data/lib/photoapp.rb

@@ -52,8 +52,11 @@ module Photoapp
           'upload' => 'upload',
           'upload_queue' => 'upload_queue',
           'print' => 'print',
+          'print_duplicate' => false,
           'photos_import' => 'photos_import',
-          'reprint' => 'reprint'
+          'import_alt' => false,
+          'reprint' => 'reprint',
+          'interval' => 60
         }
  
         config_file = root(options['config'] || config['config'])
@@ -69,6 +72,8 @@ module Photoapp
         config['print']   = root(config['print'])
         config['photos_import']  = root(config['photos_import'])
         config['reprint'] = root(config['reprint'])
+        config['import_alt'] = File.expand_path(config['import_alt']) if config['import_alt']
+        config['print_duplicate'] = File.expand_path(config['print_duplicate']) if config['print_duplicate']
 
         config
       end
@@ -106,9 +111,14 @@ module Photoapp
       end
     end
 
+    def import_alt
+      import(config['import_alt']) if config['import_alt']
+    end
+
     # Import to Photos.app via AppleScript
-    def import
-      script = %Q{osascript -e 'set filePosixPath to "#{config['photos_import']}"
+    def import(path=nil)
+      path ||= config['photos_import']
+      script = %Q{osascript -e 'set filePosixPath to "#{path}"
 set importFolder to (POSIX file filePosixPath) as alias
 
 set extensionsList to {"jpg", "jpeg"}
@@ -128,7 +138,7 @@ if (count of theFiles) > 0 then
   end tell
 end if'}
       `#{script}`
-      FileUtils.rm_rf config['photos_import']
+      FileUtils.rm load_photos(config['photos_import'])
     end
 
     def print
@@ -234,7 +244,7 @@ end if'}
     <key>WorkingDirectory</key>
     <string>#{root}</string>
     <key>StartInterval</key>
-    <integer>60</integer>
+    <integer>#{config['interval']}</integer>
   </dict>
 </plist>}
     end

data/lib/photoapp/photo.rb

@@ -84,6 +84,7 @@ module Photoapp
       else
         FileUtils.mkdir_p(File.dirname(upload_dest))
         FileUtils.mkdir_p(File.dirname(print_dest))
+        FileUtils.mkdir_p(File.dirname(print_dup_dest)) if print_dup_dest
         FileUtils.mkdir_p(File.dirname(import_dest))
 
         puts "writing #{upload_dest}"
@@ -92,6 +93,11 @@ module Photoapp
         puts "writing #{print_dest}"
         with_url.write print_dest
 
+        if print_dup_dest
+          puts "writing #{print_dup_dest}"
+          with_url.write print_dest
+        end
+
         puts "writing #{import_dest}"
         with_url.write import_dest
 
@@ -112,6 +118,12 @@ module Photoapp
       File.join(config['print'], short + '.jpg')
     end
 
+    def print_dup_dest
+      if config['print_duplicate']
+        File.join(config['print_duplicate'], short + '.jpg')
+      end
+    end
+
     def import_dest
       File.join(config['photos_import'], short + '.jpg')
     end

data/lib/photoapp/version.rb

@@ -1,3 +1,3 @@
 module Photoapp
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desoto-photoapp
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick