henchman-sync 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba50beb7184c552a3a27c1c6c993a70d9eb53496
-  data.tar.gz: c1c5bb43fd8eb9dd21dd3e976ce22fd8efc8215a
+  metadata.gz: 7d27e875da0439ebd8e24c160d77c962202b0f19
+  data.tar.gz: 775dfd05202ac8248fc155901845f224adc004e5
 SHA512:
-  metadata.gz: 4c06ad0803566f62aa4ad348801409c2b7b0a061cbb4dfea5e1a840cb1597c51c152be9baf260d3d9d0941d26527bbbd875ec34854039aa4cb8832e8ff253d09
-  data.tar.gz: 4db7132de8baacbc36b82a3890e040742d0fd753e10126e29fa90a7dce3ce3b1ac3b5f6d2f31d4412bb428516fc4d27e0091b80fb0deb9a08238092c88b650aa
+  metadata.gz: fd12ef4db1308346aa45ffd3f386f02e90714217430effe5908b8196573275a4dda0133b6dcd8e07409332a4cce8308a45530b8a46c50de1efa2f19c4f54e8ae
+  data.tar.gz: 07d8df1684c9e5ec9db629ec9bbffec58c324668bc447ab98d49db7659743bed18eb6670edc0265b14826c70c6402195f8b9a07027fdacd7c1c92f2ff2bf1d38

data/README.md

@@ -48,10 +48,6 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-## TODO
-
-  - Move off of the 'dropbox-sdk' gem, since it uses their API V1, which will be depreciated June 28th, 2017 (or just buck up and update the gem myself)
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/gremerritt/henchman.

data/henchman.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "commander", "~> 4.4"
-  spec.add_dependency "dropbox-sdk", "~> 1.6"
+  spec.add_dependency "dropbox-sdk-v2", "~> 0.0"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/applescript.rb

@@ -133,7 +133,7 @@ module Henchman
       "end repeat"
     end
 
-    def get_playlist_tracks_script playlist, skip = [], size = 100
+    def get_playlist_tracks_script playlist, skip = [], size = 5
       "property counter : 0\n"\
       "tell application \"iTunes\"\n"\
       "  try\n"\
@@ -210,7 +210,7 @@ module Henchman
         next if track.empty?
         tmp_track = track.split @delimiter
         tracks.push( {:id   => tmp_track[0],
-                      :date => DateTime.parse(tmp_track[1]),
+                      :date => (tmp_track[1] != 'missing value') ? DateTime.parse(tmp_track[1]) : DateTime.new,
                       :path => tmp_track[2]} )
       end
       tracks
@@ -229,7 +229,7 @@ module Henchman
     def get_playlist_tracks playlist, skip = []
       tracks = Array.new
       tmp_tracks = %x(#{applescript_command(get_playlist_tracks_script playlist, skip)}).chomp
-      tmp_tracks = tmp_tracks.split @delimiter_major
+      tmp_tracks = tmp_tracks.force_encoding("UTF-8").split @delimiter_major
       tmp_tracks.each do |track|
         next if track.empty?
         tmp_track = track.split @delimiter
@@ -274,8 +274,6 @@ module Henchman
 
       ret = %x(#{applescript_command(update_track_location_script selection[:id], local_file)}).chomp
       if ret.empty? || ret == '0'
-        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
-             "Could not update location of #{selection.reject{|k,v| k == :path || k == :id}.values.join(':')} to #{local_file}"
         false
       else
         true

data/lib/cache.rb

@@ -35,7 +35,8 @@ module Henchman
     end
 
     def get_time_last_downloaded track
-      @cache[:history][track[:id].to_i]
+      id = track[:id].to_i
+      (@cache[:history].include?(id)) ? @cache[:history][id] : DateTime.new
     end
 
     def tag track
@@ -60,6 +61,17 @@ module Henchman
       end
     end
 
+    def clear type, value
+      raise "Invalid type #{type}" if !@cache[:ignore].keys.include? type
+      if @cache[:ignore][type].include? value
+        @cache[:ignore][type].delete value
+        puts "Deleting #{type} #{value} from cache"
+      else
+        puts "#{type} #{value} not found"
+      end
+      flush
+    end
+
   end
 
 end

data/lib/clean.rb

@@ -7,7 +7,6 @@ module Henchman
   class Clean
 
     def self.run played_date
-
       puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
            "Cleanup Starting"
 
@@ -44,20 +43,20 @@ module Henchman
 
     def self.cleanup track
       filepath = track[:path]
-      File.delete filepath
-      @cache.delete track
-      puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
-           "Deleted #{filepath}"
+      begin
+        File.delete filepath
+        @cache.delete track
+        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+             "Deleted #{filepath}"
 
-      while File.dirname(filepath) != @config[:root]
-        filepath = File.dirname(filepath)
-        begin
+        while File.dirname(filepath) != @config[:root]
+          filepath = File.dirname(filepath)
           Dir.rmdir(filepath)
           puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
                "Deleted #{filepath}"
-        rescue SystemCallError => msg
-          break
         end
+      rescue SystemCallError => msg
+        # do nothing
       end
     end
 

data/lib/configure.rb

@@ -34,7 +34,7 @@ module Henchman
     if config[:root].empty? || agree("\nUpdate local music directory? (y/n) ")
       get_local_root config
     end
-    
+
     Dir.mkdir(File.dirname(config_file)) if !File.exists?(File.dirname(config_file))
     File.open(config_file, "w") { |f| f.write( config.to_yaml ) }
     puts "\nConfiguration complete! Run `henchman start` to start the daemon."
@@ -43,10 +43,10 @@ module Henchman
   def self.connect config={}
     begin
       config = YAML.load_file(File.expand_path("~/.henchman/config")) if config.empty?
-      client = DropboxClient.new(config[:dropbox][:access_token])
-      account_info = client.account_info()
+      client = Dropbox::Client.new config[:dropbox][:access_token]
+      account_info = client.get_current_account()
       puts "Successfully connected to Dropbox: "
-      puts "  #{account_info['display_name']} [#{account_info['email']}]"
+      puts "  #{account_info.display_name} [#{account_info.email}]"
       return client
     rescue StandardError => err
       puts "Error connecting to Dropbox account (#{err}). Try deleting the "\
@@ -91,8 +91,6 @@ module Henchman
   end
 
   def self.get_dropbox_root config, client
-    # paths = Hash.new
-    # build_dropbox_dirs(paths, client, '/', 0)
     not_done = true
     while not_done
       path = ask("Enter the path to your music directory in Dropbox: (? for help)" )
@@ -115,15 +113,28 @@ module Henchman
     end
   end
 
-  # def self.build_dropbox_dirs paths, client, path, level
-  #   return if level == 2
-  #   metadata = client.metadata(path)
-  #   metadata['contents'].each do |elem|
-  #     next if !elem['is_dir']
-  #     paths[elem['path']] = Hash.new
-  #     build_dropbox_dirs(paths[elem['path']], client, elem['path'], level+1)
-  #   end
-  # end
+  def self.collect_exts
+    config_file = File.expand_path('~/.henchman/config')
+    config = YAML.load_file(config_file)
+    client = connect config
+    exts = Hash.new
+    collect_exts_rec client, config[:dropbox][:root], exts
+
+    puts ""
+    exts.each_key { |k| puts k }
+  end
+
+  def self.collect_exts_rec client, path, exts
+    metadata = client.metadata(path)
+    metadata['contents'].each_with_index do |c, i|
+      print "\rCollecting#{'.'*(i%4)}#{' '*(3-(i%4))}"
+      if c['is_dir']
+        collect_exts_rec client, c['path'], exts
+      else
+        exts[File.extname(c['path'])] = true
+      end
+    end
+  end
 
   def self.get_local_root config
     not_done = true

data/lib/core.rb

@@ -1,4 +1,4 @@
-require "dropbox"
+require "dbx_assistant"
 require "applescript"
 require "cache"
 require "yaml"
@@ -7,7 +7,9 @@ module Henchman
 
   class Core
 
-    def self.run
+    def self.run args
+      debug = true if args[0] == 'debug'
+
       @appleScript = Henchman::AppleScript.new
       @cache = Henchman::Cache.new
       @update_cache = false
@@ -23,6 +25,10 @@ module Henchman
             @config[:delimiter_major] = Henchman::Templates.config[:delimiter_major]
             File.open(config_file, "w") { |f| f.write( @config.to_yaml ) }
           end
+          if !(@config.include? :file_extensions)
+            @config[:file_extensions] = Henchman::Templates.config[:file_extensions]
+            File.open(config_file, "w") { |f| f.write( @config.to_yaml ) }
+          end
 
           @cache.config @config
         rescue StandardError => err
@@ -33,10 +39,10 @@ module Henchman
 
         @appleScript.setup @config
         begin
-          @dropbox = Henchman::DropboxAssistant.new @config
-        rescue
+          @dropbox = Henchman::DropboxAssistant.new @config, debug
+        rescue StandardError => msg
           puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
-               "Error connecting to Dropbox. Try rerunning `henchman configure`"
+               "Error connecting to Dropbox (#{msg}). Try rerunning `henchman configure`"
           return
         end
 
@@ -144,7 +150,10 @@ module Henchman
           updated = @appleScript.set_track_location track, file_save_path
 
           # if the update failed, remove that file
-          cleanup file_save_path, track if !updated
+          if !updated
+            cleanup file_save_path, track
+            raise "Could not update location of #{track.reject{|k,v| k == :path || k == :id}.values.join(':')} to #{file_save_path}"
+          end
         end
       rescue StandardError => err
         puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|#{err}"

data/lib/dbx_assistant.rb

@@ -0,0 +1,185 @@
+require 'dropbox'
+require 'yaml'
+require 'json'
+
+module Henchman
+
+  class DropboxAssistant
+
+    def initialize config, debug
+      begin
+        @search_limit = 500
+        @debug  = debug
+        @config = config
+        @client = Dropbox::Client.new @config[:dropbox][:access_token]
+
+        # stop words from http://nlp.stanford.edu/IR-book/html/htmledition/dropping-common-terms-stop-words-1.html
+        @stop_words = ['a', 'an', 'and', 'are', 'as', 'at', 'be', 'by', 'for', 'from',
+                       'has', 'he', 'in', 'is', 'it', 'its', 'of', 'on', 'that', 'the',
+                       'to', 'was', 'were', 'will', 'with']
+        true
+      rescue DropboxError => msg
+        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+             "Couldn't connect to Dropbox (#{msg}). "\
+             "Run `henchman stop` then `henchman configure` "\
+             "to configure Dropbox connection."
+        false
+      end
+    end
+
+    def download selection, dropbox_path
+      puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+           "Downloading #{selection.reject{|k,v| k == :path || k == :id}.values.join(':')} from #{dropbox_path}"
+      begin
+        # download the file
+        content, body = @client.download dropbox_path
+
+        # make sure we have the directory to put it in
+        trgt_dir = File.join @config[:root], selection[:artist], selection[:album]
+        puts trgt_dir if @debug
+        system 'mkdir', '-p', trgt_dir
+
+        # save the file
+        file_save_path = File.join trgt_dir, File.basename(dropbox_path)
+        puts file_save_path if @debug
+        open(file_save_path, 'w') {|f| f.puts body }
+        file_save_path
+      rescue DropboxError => msg
+        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+             "Error downloading Dropbox file #{dropbox_path}: #{msg}"
+        false
+      rescue StandardError => msg
+        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+             "Error saving Dropbox file #{dropbox_path} to #{trgt_dir}: #{msg}"
+        false
+      end
+    end
+
+    def search value, filter = nil, dir = @config[:dropbox][:root]
+      puts "Searching for #{value} in #{dir}, filtering by <#{filter}>" if @debug
+      begin
+        results = @client.search dir, value, 0, @search_limit
+        puts "#{results.length} total results found" if @debug
+        if filter == :dir
+          results.reject! { |result| !result.is_a? Dropbox::FolderMetadata }
+        elsif filter == :file
+          results.reject! { |result| !result.is_a? Dropbox::FileMetadata ||
+                                     !(@config[:file_extensions].include?(File.extname(result.path_lower)[1..-1])) }
+        end
+        puts "Returning #{results.length} results for `search` (after filtering)" if @debug
+        return results
+      rescue DropboxError => msg
+        raise "Error accessing Dropbox Search API|#{value}|#{dir}|#{msg}"
+      end
+    end
+
+    def get_results track, artist
+      puts "`get_results` for #{track} by #{artist}" if @debug
+      # Search Dropbox for the file
+      # We're only not filtering to get files because we want to check if we get 1000 results
+      # (i.e. a maxed out playload) back. This is because the filtering happens in OUR client,
+      # not in the Dropbox search. We're doing a simple search on only track name because we
+      # want to minimize the number of network calls, and USUALLY this is good enough
+      results = search track
+
+      # If we get 1000 results back, it means we probably have a REALLY simple song title
+      # and we're not assured to have the target song in our payload, since we maxed it
+      # out. So, we'll do another search call on the artist
+      if results.length == @search_limit
+        puts "Maximum (#{@search_limit}) results returned" if @debug
+        results.clear
+        album_dirs = search artist, :dir
+        album_dirs.each do |album|
+          tmp_rslts = search track, :file, album['path']
+          results.push(*tmp_rslts)
+        end
+      else    # Otherwise, filter off all the directories and things without the right extensions
+        puts "Filtering out directories and incorrect file extensions" if @debug
+        results.reject! { |result| !result.is_a? Dropbox::FileMetadata ||
+                                   !(@config[:file_extensions].include?(File.extname(result.path_lower)[1..-1])) }
+      end
+      puts "Returning #{results.length} results from `get_results`" if @debug
+      return results
+    end
+
+    def search_for selection
+      puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
+           "Searching for #{selection.reject{|k,v| k == :path || k == :id}.values.join(':')}"
+
+      results = get_results selection[:track], selection[:artist]
+
+      # if we still don't have any results, try dropping any brackets and paranthesis
+      if results.empty? && (selection[:track].match(%r( *\[.*\] *)) || selection[:track].match(%r( *\(.*\) *)))
+        puts "No results. Trying without brackets or parenthesis" if @debug
+        track = selection[:track].gsub(%r( *\[.*\] *), " ").gsub(%r( *\(.*\) *), " ")
+        results = get_results track, selection[:artist]
+      end
+
+      # if there were no results, raise err
+      if results.empty?
+        raise "Track not found in Dropbox: #{selection.reject{|k,v| k == :id}.values.join(':')}"
+      else
+        scores       = Hash.new 0
+        tokens       = Array.new
+        track_tokens = Array.new
+        [:artist, :album].each do |identifier|
+          tokens |= selection[identifier].downcase
+                                         .gsub(%r( +), " ")
+                                         .gsub(%r(-+), "-")
+                                         .strip
+                                         .split(/[\s-]/)
+                                         .delete_if{ |t| @stop_words.include? t }
+        end
+        @config[:file_extensions].each do |extension|
+          track_tokens |= selection[:track].downcase
+                                           .gsub(%r( +), " ")
+                                           .gsub(%r(-+), "-")
+                                           .strip
+                                           .split(/[\s-]/)
+                                           .map { |t| "#{t}.#{extension}" }
+        end
+
+        if @debug
+          puts ":artist and :album tokens: #{tokens.inspect}"
+          puts ":track tokens: #{track_tokens.inspect}"
+        end
+
+        results.each do |result|
+          dir = "#{File.dirname(result.path_lower)}/"
+          basename = " #{File.basename(result.path_lower)}"
+          tokens.each do |token|
+            if dir =~ %r(.*[\s\/-]#{token}[\s\/-].*)
+              puts "Token #{token} found in #{dir}" if @debug
+              if results.length == 1
+                return result.path_display
+              else
+                scores[result.path_display] += 1
+              end
+            end
+          end
+          track_tokens.each do |token|
+            if basename =~ %r([.]*[\s-]+#{token})
+              puts "Token #{token} found in #{basename}" if @debug
+              scores[result.path_display] += 1
+            end
+          end
+        end
+
+        # if the we only had one track and we're here, that means the path didn't contain
+        # any of the album or artist tokens, so we'll say we couldn't find it
+        if results.length == 1
+          raise "Track not found in Dropbox: #{selection.reject{|k,v| k == :id}.values.join(':')}"
+        end
+
+        # return the path that has the highest score
+        scores = scores.sort_by { |path, score| score }
+        if @debug
+          scores.each { |score| puts score.join ': ' }
+        end
+        scores[-1][0]
+      end
+    end
+
+  end
+
+end

data/lib/henchman.rb

@@ -16,7 +16,7 @@ module Henchman
       c.syntax = 'henchman start'
       c.description = 'Starts the henchman daemon'
       c.action do |args, options|
-        Henchman::LaunchdHandler.start
+        Henchman::LaunchdHandler.start args
       end
     end
 
@@ -40,7 +40,7 @@ module Henchman
       c.syntax = 'henchman run'
       c.description = 'Main interface into henchman. Should not be ran manually.'
       c.action do |args, options|
-        Henchman::Core.run
+        Henchman::Core.run args
       end
     end
 
@@ -55,5 +55,31 @@ module Henchman
       end
     end
 
+    command :extensions do |c|
+      c.syntax = 'henchman extensions'
+      c.description = 'Collect file extensions'
+      c.action do |args, options|
+        Henchman.collect_exts
+      end
+    end
+
+    command :log do |c|
+      c.syntax = 'henchman log [options]'
+      c.description = 'Tails the henchman stdout log'
+      c.option '--n <number>', Integer, 'Number of lines to tail'
+      c.action do |args, options|
+        options.default :n => 10
+        puts `tail -n #{options.n} #{File.expand_path('~/.henchman/stdout.log')}`
+      end
+    end
+
+    command :clear do |c|
+      c.syntax = 'henchman clear <artist/playlist> <title>'
+      c.description = 'Clears the the artist or playlist from the cache'
+      c.action do |args, options|
+        @cache = Henchman::Cache.new
+        @cache.clear args[0].to_sym, args[1..-1].join(' ')
+      end
+    end
   end
 end

data/lib/henchman/version.rb

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

data/lib/launchd_handler.rb

@@ -4,7 +4,7 @@ module Henchman
 
   class LaunchdHandler
 
-    def self.start
+    def self.start args
       if !internet_connection?
         puts "No internet connection detected - unable to verify correct configuration."
         return if !agree("Launch henchman anyways? (y/n) ")
@@ -22,7 +22,7 @@ module Henchman
       shell_script_path_clean = File.expand_path("~/.henchman/clean.sh")
       cache_path        = File.expand_path("~/.henchman/cache")
       File.write(plist_path_main, plist_main)
-      File.write(shell_script_path_main, Henchman::Templates.shell_script('run'))
+      File.write(shell_script_path_main, Henchman::Templates.shell_script('run', args))
       File.write(plist_path_clean, plist_clean)
       File.write(shell_script_path_clean, Henchman::Templates.shell_script('clean'))
       File.open(cache_path, "w") { |f| f.write( Henchman::Templates.cache.to_yaml ) }

data/lib/templates.rb

@@ -60,9 +60,9 @@ module Henchman
       "</plist>"
     end
 
-    def self.shell_script command
+    def self.shell_script command, args = []
       "#!/bin/sh\n"\
-      "#{`which henchman`.chomp} #{command}"
+      "#{`which henchman`.chomp} #{command} #{args.join(' ')}"
     end
 
     def self.config
@@ -77,7 +77,8 @@ module Henchman
         :poll_track => 3,
         :reprompt_timeout => 300,
         :delimiter => '|~|',
-        :delimiter_major => '|?|'
+        :delimiter_major => '|?|',
+        :file_extensions => ['mp3', 'm4a']
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: henchman-sync
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Greg Merritt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.4'
 - !ruby/object:Gem::Dependency
-  name: dropbox-sdk
+  name: dropbox-sdk-v2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ files:
 - lib/clean.rb
 - lib/configure.rb
 - lib/core.rb
-- lib/dropbox.rb
+- lib/dbx_assistant.rb
 - lib/henchman.rb
 - lib/henchman/version.rb
 - lib/launchd_handler.rb

data/lib/dropbox.rb

@@ -1,101 +0,0 @@
-require 'dropbox_sdk'
-require 'yaml'
-require 'json'
-
-module Henchman
-
-  class DropboxAssistant
-
-    def initialize config
-      begin
-        @config = config
-        @client = DropboxClient.new(@config[:dropbox][:access_token])
-        true
-      rescue DropboxError => msg
-        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
-             "Couldn't connect to Dropbox (#{msg}). "\
-             "Run `henchman stop` then `henchman configure` "\
-             "to configure Dropbox connection."
-        false
-      end
-    end
-
-    def download selection, dropbox_path
-      puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
-           "Downloading #{selection.reject{|k,v| k == :path || k == :id}.values.join(':')}"
-      begin
-        # download the file
-        content = @client.get_file(dropbox_path)
-
-        # make sure we have the directory to put it in
-        trgt_dir = File.join @config[:root], selection[:artist], selection[:album]
-        system 'mkdir', '-p', trgt_dir
-
-        # save the file
-        file_save_path = File.join trgt_dir, File.basename(dropbox_path)
-        open(file_save_path, 'w') {|f| f.puts content }
-        file_save_path
-      rescue DropboxError => msg
-        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
-             "Error downloading Dropbox file #{dropbox_path}: #{msg}"
-        false
-      rescue StandardError => msg
-        puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
-             "Error saving Dropbox file #{dropbox_path} to #{trgt_dir}: #{msg}"
-        false
-      end
-    end
-
-    def search_for selection
-      puts "#{DateTime.now.strftime('%m-%d-%Y %H:%M:%S')}|"\
-           "Searching for #{selection.reject{|k,v| k == :path || k == :id}.values.join(':')}"
-
-      # search Dropbox for the file
-      begin
-        results = @client.search(@config[:dropbox][:root], selection[:track])
-      rescue DropboxError => msg
-        raise "Error accessing Dropbox Search API on #{selection.reject{|k,v| k == :path || k == :id}.values.join(':')}: #{msg}"
-      end
-
-      # get rid of any results that are directories
-      results.reject! { |result| result['is_dir'] }
-
-      # if we still don't have any results, try dropping any brackets and paranthesis
-      if results.empty? && (selection[:track].match(%r( *\[.*\] *)) || selection[:track].match(%r( *\(.*\) *)))
-        track = selection[:track].gsub(%r( *\[.*\] *), " ").gsub(%r( *\(.*\) *), " ")
-        results = @client.search(@config[:dropbox][:root], track)
-        results.reject! { |result| result['is_dir'] }
-      end
-
-      # if there were no results, raise err
-      if results.empty?
-        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
-        results[0]['path']
-
-      # if there are multiple results, score them based on artist + album
-      else
-        scores = Hash.new 0
-        results.each do |result|
-          [:artist, :album].each do |identifier|
-            tokens = selection[identifier].downcase
-                                          .gsub(%r( +), " ")
-                                          .gsub(%r(-+), "-")
-                                          .strip
-                                          .split(/[\s-]/)
-            tokens.each do |token|
-              scores[result['path']] += 1 if result['path'].downcase.include? token
-            end
-          end
-        end
-
-        # return the path that has the highest score
-        (scores.sort_by { |path, score| score })[-1][0]
-      end
-    end
-
-  end
-
-end