album_credits 0.0.4 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 80bf27bd1fc0c831872bf6600a8ffefb0504bfaa
+  data.tar.gz: f26221d2909563f3f6905d129bfb48dec7021447
+SHA512:
+  metadata.gz: 27db64ce9bd20302867b072ce1c44cdc4687bca63ff399c75386755d18b0657bd9fd35bae554604aee877a708ae3db52efcec798559d6b3915f4a012747696be
+  data.tar.gz: df08043ceb206cff4fcc896a6f1168b4460ebb16e9f3b0eaced5a4add22e9658344602c0f4251922b31fcda2cf68f0c07b1aaa718116eab476f9f338c37db424

data/Gemfile

@@ -1,3 +1,2 @@
-source :rubygems
-
+source 'https://rubygems.org'
 gemspec

data/album_credits.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "discogs-wrapper"
-  s.add_development_dependency "ruby-debug"
+  s.add_development_dependency "awesome_print"
 end

data/bin/album_credits

@@ -6,11 +6,10 @@ 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
 
 begin
-  releases = ac.find_releases(artist, album, year)
+  releases = ac.find_releases(artist, album)
 rescue Exception => e
   puts e.message
   exit

data/engineering_data.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'discogs'
-require 'cgi'
-require 'ruby-debug'
+require 'awesome_print'
+
 COLORS = {
   :clear => "\e[0m",
   :bold => "\e[1m",
@@ -18,40 +18,34 @@ def color_puts(text, color=:white, bold=false)
   puts "#{embolden}#{COLORS[color]}#{text}#{COLORS[:clear]}"
 end
 
-def parse_discogs_id(search_result)
-  search_result.uri.split('/').last
-end
-
 def discogs
   return @discogs if @discogs
-  @discogs = Discogs::Wrapper.new("bff9085fc7")
+  @discogs = Discogs::Wrapper.new("album_credits", user_token: "vTVvYBauSDUjTGNmVGdjqEavQHRWdkhtWerSqJul")
 end
 
-def find_releases(artist, album, year=nil)
+def find_releases(artist, album)
   releases = []
-  [nil, 'CD', 'HDCD', 'vinyl'].each do |format|
-    format = " AND format:#{format}" if format
-    query = CGI.escape("#{album} AND artist:#{artist}#{format}")
-    possibilities = discogs.search(query, 'releases')
-    if 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
-        end
+  possibilities = discogs.search(album, type: 'release', artist: artist)
+  if possibilities.pagination.items > 0
+    puts "Found #{possibilities.pagination.items} to look through"
+    possibilities.results.each do |found_album|
+      begin
+        release = discogs.get_release(found_album.id)
+      rescue Exception => e
+        puts "Failed to find release id #{found_album.id}: #{e}"
+        next
+      end
+      # Make sure the album is actually is in an Accepted state (as per Discogs).
+      if release.status == 'Accepted'
+        releases << release
+      else
+        puts "#{release.artists.first.name} - #{release.title} Status: #{release.status}"
       end
-    else
-      # puts "no results for #{query}"
     end
+  else
+    puts "no results for #{artist} #{album}"
   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
-
   # Only return unique releases
   seen = {}
   uniq_releases = releases.inject([]) do |uniq, rel|
@@ -62,9 +56,7 @@ def find_releases(artist, album, year=nil)
     uniq
   end
 
-  # Only return with nil release date filter unless it filters out everything.
-  pristine_releases = uniq_releases.reject{|release| release.released.nil?}
-  pristine_releases.size < uniq_releases.size ? pristine_releases : uniq_releases
+  uniq_releases
 end
 
 def engineers_for_release(release)
@@ -73,9 +65,12 @@ def engineers_for_release(release)
   end
 end
 
-def discography_for_artist(artist)
-  debugger
-  discogs.get_artist(CGI.escape(artist)) rescue []
+def get_artist_discog(artist)
+  begin
+    discogs.get_artists_releases(artist.id, per_page: 25, page: 1)
+  rescue Exception => e
+    puts e
+  end
 end
 
 def image_uri_for_release(release)
@@ -88,9 +83,10 @@ end
 def display_release(release, engineers, options={})
   color = options.delete(:color) || :white
   show_discography = options[:show_discography] == true
-
+  label = release.labels.empty? ? "" : "[#{release.labels.first.name}]"
   color_puts "="*40, color
-  color_puts "#{release.title} #{release.released} ID: #{release.id}", color
+  color_puts "#{release.artists.first.name} - #{release.title} #{release.released} #{label}", color
+  color_puts release.uri, color
   color_puts "#{release.tracklist.size} songs", color
   color_puts image_uri_for_release(release), color
   color_puts release.notes, color
@@ -98,11 +94,12 @@ def display_release(release, engineers, options={})
   engineers.each do |engineer|
     color_puts "#{engineer.role} #{engineer.name}", color, true
     # Print the first 100 releases in the engineer's discography
-    if show_discography && !(artist = discogs.get_artist(CGI.escape(engineer.name))).nil?
-      color_puts "#{artist.aliases} #{artist.aliases} #{artist.namevariations}", color
-      color_puts "#{artist.releases.size} releases in discography", color
-      artist.releases.slice(0,99).each do |disk|
-        color_puts "\t* #{disk.year} #{disk.title} [#{disk.label}]", color
+    releases = get_artist_discog(engineer)
+    if show_discography && !releases.nil?
+      sorted_releases = releases.releases.sort_by {|rel| rel.year.nil? ? 0 : rel.year }.reverse
+      color_puts "Recent releases in discography", color
+      sorted_releases.each do |disk|
+        color_puts "\t* #{disk.year} #{disk.artist} - #{disk.title} [#{disk.role}]", color
       end
       # IDEA: show a cross-section of their work.
       # maybe start with around the year that current album was released if there are many.
@@ -117,8 +114,7 @@ end
 
 artist = ARGV[0]
 album = ARGV[1]
-year = ARGV[2]
-releases = find_releases(artist, album, year)
+releases = find_releases(artist, album)
 raise "No releases" if releases.empty?
 puts "Found #{releases.size} releases"
 
@@ -129,13 +125,13 @@ sorted_releases = releases.inject([]) do |rel_array, release|
   rel_array
 end.sort_by{|arr| arr.last.size}.reverse
 
-raise "No engineering data though :/" if sorted_releases.empty?
+raise "No engineering data :/" if sorted_releases.empty?
 
 best_guess = sorted_releases.shift
-display_release(best_guess.first, best_guess.last, :color => :green, :show_discography => true)
-
-sorted_releases.each do |release, engineers|
-  display_release(release, engineers)
-end
-
+display_release(best_guess.first, best_guess.last, color: :green, show_discography: true)
+#ap best_guess.first
+#sorted_releases.each do |release, engineers|
+ # ap release
+ # display_release(release, engineers)
+#end
 

data/lib/album_credits/display.rb

@@ -39,7 +39,8 @@ module AlbumCredits
       @default_color = opts.delete(:color) || :white
 
       cp "="*40
-      cp "#{release.title} #{release.released} ID: #{release.id}"
+      cp "#{release.title} #{release.released}"
+      cp release.uri
       cp "#{release.tracklist.size} songs"
       cp image_uri_for_release(release)
       cp release.notes
@@ -47,6 +48,14 @@ module AlbumCredits
       display_engineer_data(engineers, opts)
     end
 
+    def get_artist_discog(artist)
+      begin
+        discogs.get_artists_releases(artist.id, per_page: 25, page: 1)
+      rescue Exception => e
+        puts e
+      end
+    end
+
     # TODO: Put logical engineer sorting
     # IDEA: show a cross-section of their work.
     # maybe start with around the year that current album was released if there are many.
@@ -62,16 +71,21 @@ module AlbumCredits
         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 || []
+        engineer_discog = get_artist_discog(engineer)
+        engineer = discogs.get_artist(engineer.id)
+        if show_discography && !engineer_discog.nil?
+          aka = engineer.namevariations || []
+          aka << engineer.aliases.map(&:name) unless engineer.aliases.nil?
+          if !(aliases = aka.flatten.uniq.sort).empty?
+            cp "AKA: #{aliases.join(', ')}"
+          end
+          cp "#{engineer_discog.releases.size} releases in discography", :color => :yellow
 
-          cp "AKA: #{aka.flatten.uniq.sort.join(', ')}"
-          cp "#{artist.releases.size} releases in discography", :color => :yellow
+          cp engineer.uri
 
           # 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|
+            engineer_discog.releases.group_by{ |disk| disk.artist }.sort_by{ |artist, albums| artist }.each do |artist, albums|
               cp artist.to_s + " (#{albums.size} total)", :bold => true, :color => :blue
               # Print the oldest version of this album
               albums.group_by{ |a| a.title }.each do |title, albums|

data/lib/album_credits/finder.rb

@@ -5,8 +5,8 @@ module AlbumCredits
 
     attr_reader :discogs
 
-    def initialize(api_key="bff9085fc7")
-      @discogs = Discogs::Wrapper.new(api_key)
+    def initialize(api_key="vTVvYBauSDUjTGNmVGdjqEavQHRWdkhtWerSqJul")
+      @discogs = Discogs::Wrapper.new("album_credits", user_token: api_key)
     end
 
     def parse_discogs_id(search_result)
@@ -30,37 +30,36 @@ module AlbumCredits
       begin
         discogs.search(CGI.escape(search_string), :type => 'releases')
       rescue  Discogs::UnknownResource => e
-        debug "Nothing found for #{search_string}"
+        debug "Nothing found for #{search_string} #{e}"
       end
     end
 
-    def find_releases(artist, album, year=nil)
+    def find_releases(artist, album)
 
       releases = []
-
-      [nil, 'CD', 'HDCD', 'vinyl'].each do |format|
-
-        possibilities = search(album, :artist => artist, :year => year, :format => format)
-
-        if possibilities && possibilities.searchresults.size > 0
-          possibilities.searchresults.each do |found_album|
-            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
+      possibilities = discogs.search(album, type: 'release', artist: artist, format: 'album')
+
+      if possibilities.pagination.items > 0
+        possibilities.results.each do |found_album|
+          begin
+            release = discogs.get_release(found_album.id)
+          rescue Exception => e
+            debug "Failed to find release id #{found_album.id}: #{e}"
+            next
+          end
+          # Make sure the album is actually in an Accepted state (as per Discogs).
+          if release.status == 'Accepted'
+            releases << release
+          else
+            debug "unacceptable: #{release.title} #{release.status}"
           end
-        else
-          debug "no results for #{artist} #{album} #{year} #{format}"
         end
-
-
-        raise AlbumCredits::NoReleasesFound.new(artist, album, year) if releases.empty?
+      else
+        debug "no results for #{artist} #{album} #{year} #{format}"
       end
 
+      raise AlbumCredits::NoReleasesFound.new(artist, album, year) if releases.empty?
+
       # Sometimes Discogs returns duplicate releases so
       # filter out any duplicates based on id.
       seen = {}

data/lib/album_credits/version.rb

@@ -1,3 +1,3 @@
 module AlbumCredits
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/lib/album_credits.rb

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

metadata

@@ -1,61 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: album_credits
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - bassnode
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-07-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: discogs-wrapper
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: Searches databases for a given artist + album combination and returns recording engineering information.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Searches databases for a given artist + album combination and returns
+  recording engineering information.
+email:
 - bassnode@gmail.com
-executables: 
+executables:
 - album_credits
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -70,37 +62,26 @@ files:
 - lib/album_credits/version.rb
 homepage: https://github.com/bassnode/album_credits
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: album_credits
-rubygems_version: 1.8.11
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides album engineering credits
 test_files: []
-
 has_rdoc: