henchman-sync 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00b0b426fe2f85ce317502bbfec6dbe6545f757d
-  data.tar.gz: 0d62c14e6b5d9fe87241e4e94e31264f2b6f99a3
+  metadata.gz: 34113b7a846cd62928aa75e9698a466ee237357f
+  data.tar.gz: 2b0ca4b2d1bb0212c6072c399f5ed8db8278d7a5
 SHA512:
-  metadata.gz: 0141c85238c432b3ed3a6441ecff9d5639626339e8f3ce6137ce600b2a3da28917a3ad176850cee3d3e1a5848aeb0788e71afa4bfcddacd1595f634851624d23
-  data.tar.gz: 5d0d0d6a43f71ad8d0a01c83d42611880820a3f26442074f08b61c166914103076d5cfd7f1a14c903ada9e0b710cc4beacbaaf9f199c4914ea13139743473682
+  metadata.gz: 74ca677b0cffdcc6fb94947f1a248e53ef2ca074e8b41472b92fa53d33b11e3b1bff1ae4cc2783397a33b0b45fde5ea30f0328877515d91c4a5d68514f4f49f3
+  data.tar.gz: bab19023bb414a722b905540479d1297ddd9fa25983c239ca112b3eb8a9114316211332a0ec49aedb8b900198f1a99103062fcb422580a2f5afa27c835ef0667

data/lib/applescript.rb

@@ -15,9 +15,20 @@ module Henchman
       "end tell"
     end
 
-    def prompt_script prompt
+    def prompt_script buttons = []
+      buttons = buttons.slice(0..1).map { |b| "Download #{b.gsub(/'/){ %q('"'"') }}" }
       "tell application \"iTunes\"\n"\
-      "  display dialog \"Fetch #{prompt.gsub(/'/){ %q('"'"') }}?\"\n"\
+	    "  display dialog \"\""\
+      "    buttons {"\
+      "             \"Cancel\""\
+      "             #{(buttons.length > 0) ? ",\"#{buttons.first}\"" : ''}"\
+      "             #{(buttons.length > 1) ? ",\"#{buttons.last}\""  : ''}"\
+      "            }"\
+      "    with title \"Henchman 🏃\""\
+      "    cancel button \"Cancel\""\
+      "    default button \"#{(buttons.length > 0) ? buttons.last : 'Cancel'}\""\
+      "    giving up after 60"\
+      "    with icon note\n"\
       "end tell"
     end
 
@@ -254,8 +265,9 @@ module Henchman
       tracks
     end
 
-    def fetch? prompt
-      (%x(#{applescript_command(prompt_script prompt)}).chomp == "button returned:OK") ? true : false
+    def fetch? buttons = []
+      resp = %x(#{applescript_command(prompt_script buttons)}).chomp
+      resp.split(',').first.split(':').last.split('Download ').last rescue ''
     end
 
     def get_active_app

data/lib/core.rb

@@ -36,7 +36,10 @@ module Henchman
           if (missing_track_selected? track) && !(@cache.ignore? :artist, track[:artist])
             update_cache = true
             @cache.update_ignore :artist, track[:artist]
-            if @appleScript.fetch? "#{track[:album]} by #{track[:artist]}"
+
+            opts = ['Album', 'Track']
+            fetch = @appleScript.fetch? opts
+            if opts.include? fetch
               begin
                 # first download the selected track
                 dropbox_path   = @dropbox.search_for track
@@ -53,10 +56,13 @@ module Henchman
                     next
                   end
 
-                  # now that we've gotten the selected track, spawn off another process
-                  # to download the rest of the tracks on the album - spatial locality FTW
-                  album_tracks = @appleScript.get_album_tracks_of track
-                  threads << Thread.new{ download_tracks album_tracks }
+                  # now that we've gotten the selected track, if we're to also get the
+                  # album, spawn off another process to download the rest of the tracks
+                  # on the album - spatial locality FTW
+                  if fetch == 'Album'
+                    album_tracks = @appleScript.get_album_tracks_of track
+                    threads << Thread.new{ download_tracks album_tracks }
+                  end
                 end
               rescue StandardError => err
                 puts err
@@ -71,7 +77,7 @@ module Henchman
             if (!playlist_tracks.empty?) && !(@cache.ignore? :playlist, playlist)
               update_cache = true
               @cache.update_ignore :playlist, playlist
-              if @appleScript.fetch? playlist
+              if @appleScript.fetch?([playlist]) == playlist
                 threads << Thread.new{ download_tracks playlist_tracks }
               end
             end

data/lib/henchman/version.rb

@@ -1,3 +1,3 @@
 module Henchman
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: henchman-sync
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Greg Merritt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander