desoto-photoapp 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44b0bf77f0cf05ddb572648d3a435d26e6607bea
-  data.tar.gz: 2cba2ec59cc911a932d11c2d787a69ecc983ba26
+  metadata.gz: ce8ae58a89f14ed5b1ec87ae694da4ef7ee8f28c
+  data.tar.gz: 25f765308e87d93cdd8559f1d4b85e471cd4f6ad
 SHA512:
-  metadata.gz: fb8ccd155daf0e2afa2b3aed7ca1676afa9142385a95e2b514d10e11c42c08e0f23d3b49532935fc22808089d4a6aab1ef0dbb51091897748f7acd8059593c29
-  data.tar.gz: 914444f49c58d81c4963f93db494de75e765f3c18c0689c64bd36f4e38a79929d2f05f30b321747689da2ac7c5317457999fc961996c52a3cd84965cee4c30ae
+  metadata.gz: b5f6ef244f4252c3f3a8859c6c15c00b75295b81f2468fee1ec292fc87d88306237fcd564400996ae099c09988160c4089bc955063352030adfe4762bb78f238
+  data.tar.gz: fc4bb1abdc1c86c3449e50802b4f73dcdfcf32aed4f98b977bb31c7176dd0b02ed474835d96aef168898b5bbf9aa3069f5b4aaae3af24ddc52af29d8bb3da575

data/assets/Reprint.app/Contents/document.wflow

@@ -59,11 +59,8 @@
 				<key>ActionParameters</key>
 				<dict>
 					<key>COMMAND_STRING</key>
-					<string>say "reprinting photos"
-for f in "$@"
-do
-  lpr $f
-done</string>
+					<string>source ~/.bash_profile
+photoapp reprint | say</string>
 					<key>CheckedForUserDefaultShell</key>
 					<true/>
 					<key>inputMethod</key>
@@ -87,6 +84,8 @@ done</string>
 				</array>
 				<key>Class Name</key>
 				<string>RunShellScriptAction</string>
+				<key>Disabled</key>
+				<false/>
 				<key>InputUUID</key>
 				<string>A88305AF-F481-4120-9873-CA58EDCA65B3</string>
 				<key>Keywords</key>

data/exe/photoapp

@@ -52,27 +52,25 @@ if options['version']
   abort
 end
 
-if ARGV.first == 'test'
-  ARGV.shift
+cmd = ARGV.shift
+
+case cmd
+when 'test'
   path = ARGV.join('')
   session = Photoapp::Session.new(options)
   session.test_image(path)
-elsif ARGV.first == 'setup'
-  ARGV.shift
+when 'setup'
   setup
-elsif ARGV.first == 'update'
-  ARGV.shift
+when 'update'
   update
-elsif ARGV.first == 'set-actions'
-  ARGV.shift
+when 'set-actions'
   actions
-else
-  if ARGV.first == 'process'
-    ARGV.shift
-    options['source'] = ARGV.shift
-    Photoapp::Session.new(options).process
-  elsif ARGV.first == 'upload'
-    Photoapp::Session.new(options).upload
-  end
+when 'process'
+  options['source'] = ARGV.shift
+  Photoapp::Session.new(options).process
+when 'upload'
+  Photoapp::Session.new(options).upload
+when 'reprint'
+  Photoapp::Session.new(options).reprint
 end
 

data/lib/photoapp.rb

@@ -19,16 +19,21 @@ module Photoapp
   class Session
     attr_accessor :photos, :print, :upload
 
-    ROOT = File.expand_path('~/cave.pics') # where photos are stored
-
     # relative to root
     CONFIG_FILE = 'photoapp.yml'
     UPLOAD = 'upload'
     PRINT = 'print'
+    ROOT = File.expand_path('~/cave.pics') # where photos are stored
+
 
     def initialize(options={})
       @photos = []
       @config = config(options)
+      FileUtils.mkdir_p(config['reprint'])
+    end
+
+    def root(path='')
+      File.expand_path(File.join(ROOT, path))
     end
 
     def config(options={})
@@ -42,7 +47,8 @@ module Photoapp
           'font_size' => 30,
           'config' => 'photoapp.yml',
           'upload' => 'upload',
-          'print' => 'print'
+          'print' => 'print',
+          'reprint' => 'reprint'
         }
  
         config_file = root(options['config'] || config['config'])
@@ -55,6 +61,7 @@ module Photoapp
 
         config['upload'] = root(config['upload'])
         config['print'] = root(config['print'])
+        config['reprint'] = root(config['reprint'])
 
         config
       end
@@ -65,18 +72,12 @@ module Photoapp
       @logo ||= Magick::Image.read(config['watermark']).first
     end
 
-    def root(path='')
-      File.expand_path(File.join(ROOT, path))
-    end
-
     def process
       photos = []
       tmp = root('.tmp')
+      import = root('.import/')
       FileUtils.mkdir_p tmp
-
-      if empty_print_queue?
-        FileUtils.rm_rf(config['print'])
-      end
+      FileUtils.mkdir_p import
 
       load_photos.each do |f|
         photos << process_image(f, tmp)
@@ -84,13 +85,17 @@ module Photoapp
 
       photos.each do |p|
         p.write
-        p.add_to_photos
+        FileUtils.cp p.print_dest, import
         Photoapp.print(p.print_dest)
       end
 
+      `automator -i #{import} #{Photoapp.gem_dir("lib/import-photos.workflow")}`
+
       upload
 
       FileUtils.rm_rf tmp
+      FileUtils.rm_rf import
+      FileUtils.rm_rf config['print']
     end
 
     def process_image(photo, destination)
@@ -120,6 +125,24 @@ module Photoapp
       FileUtils.rm_rf config['upload']
     end
 
+    def reprint
+      files = ['*.jpg', '*.JPG', '*.JPEG', '*.jpeg'].map! { |f| File.join(config['reprint'], f) }
+      photos = Dir[*files].uniq
+      if !photos.empty?
+        system "lpr #{photos.join(' ')}"
+        if photos.size == 1
+          puts "Printing #{photos.size} photo"
+        else
+          puts "Printing #{photos.size} photos"
+        end
+      else
+        puts "No photos to print"
+      end
+
+      sleep 4
+      FileUtils.rm(photos)
+    end
+
     # For processing a single image for testing purposes
     #
     def test_image(photo)

data/lib/photoapp/photo.rb

@@ -66,10 +66,6 @@ module Photoapp
       end
     end
 
-    def add_to_photos
-      `automator -i #{print_dest} #{Photoapp.gem_dir("lib/import-photos.workflow")}`
-    end
-
     def cleanup
       watermark.destroy!
       with_url.destroy!

data/lib/photoapp/version.rb

@@ -1,3 +1,3 @@
 module Photoapp
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desoto-photoapp
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick