album_credits 0.0.2 → 0.0.3

data/album_credits.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
 require "album_credits/version"
 
 Gem::Specification.new do |s|
@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "ruby-debug"
   s.add_dependency "bassnode-discogs"
+  s.add_development_dependency "ruby-debug"
 end

data/bin/album_credits

@@ -1,18 +1,20 @@
 #!/usr/bin/env ruby
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
-# TEMP
-require 'rubygems'
-require 'bundler'
-require 'ruby-debug'
 require 'album_credits'
 
+# TODO Shove this all in a CLI class or some such.
 artist = ARGV[0]
 album  = ARGV[1]
 year   = ARGV[2]
 ac = AlbumCredits::Finder.new
 
-releases = ac.find_releases(artist, album, year)
-raise "No releases" if releases.empty?
+begin
+  releases = ac.find_releases(artist, album, year)
+rescue Exception => e
+  puts e.message
+  exit
+end
 puts "Found #{releases.size} releases"
 
 sorted_releases = releases.inject([]) do |rel_array, release|
@@ -27,6 +29,7 @@ raise "No engineering data though :/" if sorted_releases.empty?
 best_guess = sorted_releases.shift
 ac.display_release(best_guess.first, best_guess.last, :color => :green, :show_discography => true)
 
-sorted_releases.each do |release, engineers|
-  ac.display_release(release, engineers)
-end
+
+# sorted_releases.each do |release, engineers|
+  # ac.display_release(release, engineers)
+# end

data/lib/album_credits/display.rb

@@ -16,6 +16,12 @@ module AlbumCredits
     @default_color = :white
     attr_accessor :default_color
 
+    # Prints the text in color
+    #
+    # @param [String] the text to print
+    # @param [Hash] opts
+    # @options opts [Boolean] :bold
+    # @options opts [Symbol] :color (default is .default_color)
     def cp(text, opts={})
       embolden = opts[:bold] ? COLORS[:bold] : ''
       color = opts[:color] || @default_color
@@ -53,14 +59,16 @@ module AlbumCredits
       cp "Engineers:", :color => :yellow
       engineers.each do |engineer|
         next if displayed.include? engineer.name
-        cp "#{engineer.role} #{engineer.name}", :bold => true
+        cp "#{engineer.role} #{engineer.name}", :bold => true, :color => :red
 
         # Print the engineer's discography
         if show_discography && !(artist = discogs.get_artist(CGI.escape(engineer.name))).nil?
           aka = artist.aliases || []
           aka << artist.namevariations || []
+
           cp "AKA: #{aka.flatten.uniq.sort.join(', ')}"
-          cp "#{artist.releases.size} releases in discography"
+          cp "#{artist.releases.size} releases in discography", :color => :yellow
+
           # Don't show discog for assistants
           unless engineer.role =~ /assisted|assistant|additional/i
             artist.releases.group_by{ |disk| disk.artist }.sort_by{ |artist, albums| artist }.each do |artist, albums|

data/lib/album_credits/exceptions.rb

@@ -0,0 +1,11 @@
+module AlbumCredits
+
+  class NoReleasesFound < StandardError
+
+    def initialize(artist, album, year=nil)
+      msg = "No releases found for Artist: #{artist}  Album: #{album}" << " Year: #{year}" if year
+      super(msg)
+    end
+
+  end
+end

data/lib/album_credits/finder.rb

@@ -13,35 +13,53 @@ module AlbumCredits
       search_result.uri.split('/').last
     end
 
+    # @param [String] the main string to search for
+    # @param [Hash,Optional] params
+    # @option params [String] :format CD, HDCD, vinyl, etc.
+    # @option params [String] :artist
+    # @option params [Fixnum] :year
+    def search(target, params={})
+      sections = []
+      params.each_pair do |key, val|
+        sections << "#{key}:#{val}" if val
+      end
+
+      search_string = "#{target} AND " << sections.join(" AND ")
+      debug "Searching for #{CGI.escape(search_string)}"
+
+      begin
+        discogs.search(CGI.escape(search_string), :type => 'releases')
+      rescue  Discogs::UnknownResource => e
+        debug "Nothing found for #{search_string}"
+      end
+    end
+
     def find_releases(artist, album, year=nil)
+
       releases = []
+
       [nil, 'CD', 'HDCD', 'vinyl'].each do |format|
-        format = " AND format:#{format}" if format
-        query = CGI.escape("#{album} AND artist:#{artist}#{format}")
-        begin
-          possibilities = discogs.search(query, :type => 'releases')
-        rescue  Discogs::UnknownResource => e
-          puts "Not found: #{e}"
-          next
-        end
-        if possibilities.searchresults.size > 0
+
+        possibilities = search(album, :artist => artist, :year => year, :format => format)
+
+        if possibilities && possibilities.searchresults.size > 0
           possibilities.searchresults.each do |found_album|
-            # puts "trying #{found_album.inspect}"
             release = discogs.get_release(parse_discogs_id(found_album))
             # Make sure the album is actually what we think it is and that it
             # is in an Accepted state (as per Discogs).
             if release.title =~ /#{album}/i && release.status == 'Accepted'
               releases << release
+            else
+              debug "unacceptable: #{release.title} #{release.status}"
             end
           end
         else
-          # puts "no results for #{query}"
+          debug "no results for #{artist} #{album} #{year} #{format}"
         end
-      end
 
-      # Could put this later but still trying to figure out if we want to narrow
-      # by year if it removes all potential results.
-      releases.reject!{ |r| r.released.to_s.split('-').first.to_s != year } if year
+
+        raise AlbumCredits::NoReleasesFound.new(artist, album, year) if releases.empty?
+      end
 
       # Sometimes Discogs returns duplicate releases so
       # filter out any duplicates based on id.
@@ -69,5 +87,13 @@ module AlbumCredits
       discogs.get_artist(CGI.escape(artist)) rescue []
     end
 
+    private
+    def debug(txt)
+      puts txt if debug?
+    end
+
+    def debug?
+      ENV['DEBUG'].to_i == 1
+    end
   end
 end

data/lib/album_credits/version.rb

@@ -1,3 +1,3 @@
 module AlbumCredits
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/album_credits.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'cgi'
 require 'discogs'
+require 'album_credits/exceptions'
 require 'album_credits/core_ext'
 require 'album_credits/display'
 require 'album_credits/finder'
 
-module AlbumCredits
-end
+begin; require 'ruby-debug'; rescue LoadError; end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: album_credits
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - bassnode
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 -07:00
+date: 2011-04-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: bassnode-discogs
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bassnode-discogs
+  name: ruby-debug
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,7 +44,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id002
 description: Searches databases for a given artist + album combination and returns recording engineering information.
 email: 
@@ -66,6 +66,7 @@ files:
 - lib/album_credits.rb
 - lib/album_credits/core_ext.rb
 - lib/album_credits/display.rb
+- lib/album_credits/exceptions.rb
 - lib/album_credits/finder.rb
 - lib/album_credits/version.rb
 has_rdoc: true