henchman-sync 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 268f8796ffcc52cc93450042d33c1303b5620b8b
-  data.tar.gz: 26b828d81890a194303180767bad326a1c863621
+  metadata.gz: ba50beb7184c552a3a27c1c6c993a70d9eb53496
+  data.tar.gz: c1c5bb43fd8eb9dd21dd3e976ce22fd8efc8215a
 SHA512:
-  metadata.gz: 678c2e611262bfc9236c7bbee2bf9cda2be634389322f9a1180a373ba0b052549f03440125566c01ff87fb67c19189d24cdb7400931a02923fa8f0c79c560831
-  data.tar.gz: a37aeb86dce167e4e509d723d01157637374d366773e3cfb287c6164b46c02d26a50b2372be038dd5c68bbc84a0215c335a5f267da5065b8ba90f44443ed8a69
+  metadata.gz: 4c06ad0803566f62aa4ad348801409c2b7b0a061cbb4dfea5e1a840cb1597c51c152be9baf260d3d9d0941d26527bbbd875ec34854039aa4cb8832e8ff253d09
+  data.tar.gz: 4db7132de8baacbc36b82a3890e040742d0fd753e10126e29fa90a7dce3ce3b1ac3b5f6d2f31d4412bb428516fc4d27e0091b80fb0deb9a08238092c88b650aa

data/lib/applescript.rb

@@ -5,7 +5,8 @@ module Henchman
   class AppleScript
 
     def setup config
-      @delimiter = config[:delimiter]
+      @delimiter       = config[:delimiter]
+      @delimiter_major = config[:delimiter_major]
     end
 
     def get_active_app_script
@@ -88,7 +89,7 @@ module Henchman
       "        set str to str & data_artist & \"#{@delimiter}\" "\
       "                       & data_album  & \"#{@delimiter}\" "\
       "                       & data_title  & \"#{@delimiter}\" "\
-      "                       & data_id     & \"#{@delimiter*2}\"\n"\
+      "                       & data_id     & \"#{@delimiter_major}\"\n"\
       "      end if\n"\
       "    end repeat\n"\
       "    return str\n"\
@@ -112,53 +113,46 @@ module Henchman
       "end tell"\
     end
 
-    # def get_playlist_tracks_script playlist, offset, size
-    #   "tell application \"iTunes\"\n"\
-    #   "  try\n"\
-    #   "    set playlist_tracks to every track in playlist \"#{playlist}\"\n"\
-    #   "    if (#{offset} + 1) * #{size} is less than (count of playlist_tracks) then\n"\
-    #   "      set max to (#{offset} + 1) * #{size}\n"\
-    #   "    else\n"\
-    #   "      set max to count of playlist_tracks\n"\
-    #   "    end if\n"\
-    #   "    set min to (#{offset} * #{size}) + 1\n"\
-    #   "    display dialog min\n"\
-    #   "    display dialog max\n"\
-    #   "    set str to \"\"\n"\
-    #   "    repeat with n from min to max\n"\
-    #   "      set data_track to item n of playlist_tracks\n"\
-    #   "      set data_artist to artist of data_track as string\n"\
-    #   "      set data_album to album of data_track as string\n"\
-    #   "      set data_title to name of data_track as string\n"\
-    #   "      set data_id to database ID of data_track as string\n"\
-    #   "      set data_location to POSIX path of (location of data_track as string)\n"\
-    #   "      set str to str & data_artist & \"#{@delimiter}\" "\
-    #   "                     & data_album & \"#{@delimiter}\" "\
-    #   "                     & data_title & \"#{@delimiter}\" "\
-    #   "                     & data_id & \"#{@delimiter}\" "\
-    #   "                     & data_location & \"#{@delimiter*2}\n"\
-    #   "    end repeat\n"\
-    #   "  on error\n"\
-    #   "    return 0\n"\
-    #   "  end try\n"\
-    #   "end tell"
-    # end
-    def get_playlist_tracks_script playlist
+    def progress
+      "set progress description to \"A simple progress indicator\"\n"\
+      "set progress additional description to \"Preparing…\"\n"\
+      "set progress total steps to -1\n"\
+      "\n"\
+      "delay 5\n"\
+      "\n"\
+      "set progress total steps to 100\n"\
+      "repeat with i from 1 to 100\n"\
+      "  try\n"\
+      "    set progress additional description to \"I am on step \" & i\n"\
+      "    set progress completed steps to i\n"\
+      "    delay 0.2\n"\
+      "  on error thisErr\n"\
+      "    display alert thisErr\n"\
+      "    exit repeat\n"\
+      "  end try\n"\
+      "end repeat"
+    end
+
+    def get_playlist_tracks_script playlist, skip = [], size = 100
+      "property counter : 0\n"\
       "tell application \"iTunes\"\n"\
       "  try\n"\
       "    set playlist_tracks to every track in playlist \"#{playlist.gsub(/'/){ %q('"'"') }}\"\n"\
       "    set str to \"\"\n"\
       "    repeat with playlist_track in playlist_tracks\n"\
       "      set data_location to location of playlist_track as string\n"\
-      "      if data_location is equal to \"missing value\" then\n"\
+      "      set data_id to database ID of playlist_track as string\n"\
+      "      if data_location is equal to \"missing value\" "\
+      "      and data_id is not in [#{skip.map{|e| "\"#{e}\""}.join(',')}] then\n"\
       "        set data_artist to artist of playlist_track as string\n"\
       "        set data_album to album of playlist_track as string\n"\
       "        set data_title to name of playlist_track as string\n"\
-      "        set data_id to database ID of playlist_track as string\n"\
       "        set str to str & data_artist & \"#{@delimiter}\""\
       "                       & data_album  & \"#{@delimiter}\""\
       "                       & data_title  & \"#{@delimiter}\""\
-      "                       & data_id     & \"#{@delimiter*2}\"\n"\
+      "                       & data_id     & \"#{@delimiter_major}\"\n"\
+      "        set counter to counter + 1\n"\
+      "        if counter is equal to #{size} then exit repeat\n"\
       "      end if\n"\
       "    end repeat\n"\
       "    return str\n"\
@@ -180,7 +174,7 @@ module Henchman
 			"        set data_date to played date of cur_track\n"\
 			"        set str to str & data_id   & \"#{@delimiter}\""\
       "                       & data_date & \"#{@delimiter}\""\
-      " & (POSIX path of data_location as string) & \"#{@delimiter*2}\"\n"\
+      " & (POSIX path of data_location as string) & \"#{@delimiter_major}\"\n"\
 			"      end if\n"\
 		  "    end repeat\n"\
 		  "    return str\n"\
@@ -211,7 +205,7 @@ module Henchman
     def get_tracks_with_location
       tracks = Array.new
       tmp_tracks = %x(#{applescript_command(get_tracks_with_location_script)}).chomp
-      tmp_tracks = tmp_tracks.split @delimiter*2
+      tmp_tracks = tmp_tracks.split @delimiter_major
       tmp_tracks.each do |track|
         next if track.empty?
         tmp_track = track.split @delimiter
@@ -232,10 +226,10 @@ module Henchman
       end
     end
 
-    def get_playlist_tracks playlist
+    def get_playlist_tracks playlist, skip = []
       tracks = Array.new
-      tmp_tracks = %x(#{applescript_command(get_playlist_tracks_script playlist)}).chomp
-      tmp_tracks = tmp_tracks.split @delimiter*2
+      tmp_tracks = %x(#{applescript_command(get_playlist_tracks_script playlist, skip)}).chomp
+      tmp_tracks = tmp_tracks.split @delimiter_major
       tmp_tracks.each do |track|
         next if track.empty?
         tmp_track = track.split @delimiter
@@ -252,7 +246,7 @@ module Henchman
       album  = selection[:album]
       tracks = Array.new
       tmp_tracks = %x(#{applescript_command(get_album_tracks_script artist, album)}).chomp
-      tmp_tracks = tmp_tracks.split @delimiter*2
+      tmp_tracks = tmp_tracks.split @delimiter_major
       tmp_tracks.each do |track|
         next if track.empty?
         tmp_track = track.split @delimiter

data/lib/core.rb

@@ -10,16 +10,24 @@ module Henchman
     def self.run
       @appleScript = Henchman::AppleScript.new
       @cache = Henchman::Cache.new
+      @update_cache = false
       threads = []
-      update_cache = false
 
       while itunes_is_active?
         begin
-          @config = YAML.load_file(File.expand_path('~/.henchman/config'))
+          config_file = File.expand_path('~/.henchman/config')
+          @config = YAML.load_file(config_file)
+
+          # add this for backward compatability:
+          if !(@config.include? :delimiter_major)
+            @config[:delimiter_major] = Henchman::Templates.config[:delimiter_major]
+            File.open(config_file, "w") { |f| f.write( @config.to_yaml ) }
+          end
+
           @cache.config @config
         rescue StandardError => err
           puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
-               "Error opening config file. Try rerunning `henchman configure`"
+               "Error opening config file. Try rerunning `henchman configure`. (#{err})"
           return
         end
 
@@ -36,7 +44,7 @@ module Henchman
 
         if track_selected? track
           if (missing_track_selected? track) && !(@cache.ignore? :artist, track[:artist])
-            update_cache = true
+            @update_cache = true
             @cache.update_ignore :artist, track[:artist]
 
             opts = ['Album', 'Track']
@@ -74,13 +82,13 @@ module Henchman
           end
         else
           playlist = @appleScript.get_playlist
-          if playlist
+          if playlist && !(@cache.ignore? :playlist, playlist)
             playlist_tracks = @appleScript.get_playlist_tracks playlist
-            if (!playlist_tracks.empty?) && !(@cache.ignore? :playlist, playlist)
-              update_cache = true
+            if !playlist_tracks.empty?
+              @update_cache = true
               @cache.update_ignore :playlist, playlist
               if @appleScript.fetch?([playlist]) == playlist
-                threads << Thread.new{ download_tracks playlist_tracks }
+                threads << Thread.new{ download_playlist playlist, playlist_tracks }
               end
             end
           end
@@ -89,7 +97,7 @@ module Henchman
       end
 
       threads.each { |thr| thr.join }
-      @cache.flush if update_cache
+      @cache.flush if @update_cache
     end
 
     def self.track_selected? track
@@ -102,11 +110,26 @@ module Henchman
 
     def self.itunes_is_active?
       @appleScript.get_active_app == 'iTunes'
-      # true
     end
 
-    def self.download_tracks album_tracks
-      album_tracks.each { |album_track| download_and_update album_track }
+    def self.download_playlist playlist, playlist_tracks
+      puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|Downloading Playlist \"#{playlist}\""
+      skip = Array.new
+      while true
+        download_tracks playlist_tracks, skip
+        playlist_tracks = @appleScript.get_playlist_tracks playlist, skip
+        break if playlist_tracks.empty?
+      end
+    end
+
+    def self.download_tracks album_tracks, skip = []
+      album_tracks.each do |album_track|
+        begin
+          download_and_update album_track
+        rescue StandardError => bad_id
+          skip.push bad_id
+        end
+      end
     end
 
     def self.download_and_update track
@@ -125,6 +148,7 @@ module Henchman
         end
       rescue StandardError => err
         puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|#{err}"
+        raise track[:id]
       end
     end
 

data/lib/dropbox.rb

@@ -69,7 +69,7 @@ module Henchman
 
       # if there were no results, raise err
       if results.empty?
-        raise "Track not found in Dropbox: #{selection.inspect}"
+        raise "Track not found in Dropbox: #{selection.reject{|k,v| k == :id}.values.join(':')}"
 
       # if there's only one result, return it
       elsif results.length == 1

data/lib/henchman/version.rb

@@ -1,3 +1,3 @@
 module Henchman
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/templates.rb

@@ -76,7 +76,8 @@ module Henchman
         :poll_itunes_open => 10,
         :poll_track => 3,
         :reprompt_timeout => 300,
-        :delimiter => '|~|'
+        :delimiter => '|~|',
+        :delimiter_major => '|?|'
       }
     end
 

metadata

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