exe/photoapp in desoto-photoapp-0.4.7 vs exe/photoapp in desoto-photoapp-0.5.0

- old
+ new

@@ -19,29 +19,34 @@ def update %w(Reprint Update Upload).each do |app| system "rm -rf /Applications/#{app}.app" system "cp -r #{Photoapp.gem_dir("assets/#{app}.app")} /Applications/" end + + install_plist +end - folder_actions_path = File.expand_path("~/Library/Workflows/Applications/Folder\\ Actions/") - system "mkdir -p #{folder_actions_path}" - system "rm -rf #{File.join(folder_actions_path, "photoapp-process.workflow")}" - system "cp -r #{Photoapp.gem_dir('assets/photoapp-process.workflow')} #{folder_actions_path}" +def install_plist + path = File.expand_path("~/Library/LaunchAgents") + FileUtils.mkdir_p(path) + + dest = File.join(path, 'com.desotocaverns.photoapp.plist') + plist = Photoapp::Session.new({}).plist + + File.open(dest, 'w') do |io| + io.write(plist) + end + + system "launchctl unload #{dest}" + system "launchctl load -w -F #{dest}" end def actions system "open /System/Library/Image\\ Capture/Support/Application/AutoImporter.app" - - system 'open '+folder_actions_setup end def setup - unless `ls /Library/Automator` =~ /Import Files into Photos/ - system "say 'please install Automator actions for Photos app'" - system "open #{Photoapp.gem_dir('assets/photos-action-installer.pkg')}" - end - update actions end def folder_actions_setup @@ -95,10 +100,12 @@ session.test_image(path) when 'setup' setup when 'update' update +when 'plist' + install_plist when 'set-actions' actions when 'process' options['source'] = ARGV.shift Photoapp::Session.new(options).process @@ -106,7 +113,12 @@ Photoapp::Session.new(options).upload when 'reprint' Photoapp::Session.new(options).reprint when 'import' Photoapp::Session.new(options).import +when 'print' + Photoapp::Session.new(options).print +when 'optimize' + path = ARGV.join('') + path = nil if path.empty? + Photoapp::Session.new(options).optimize path end -