album_credits 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80bf27bd1fc0c831872bf6600a8ffefb0504bfaa
-  data.tar.gz: f26221d2909563f3f6905d129bfb48dec7021447
+  metadata.gz: ac07de44a12fbd6a53ce480b1104a52ff0d78115
+  data.tar.gz: 15c6c24b1dc5e5dfafa84996525a9e5fd82f8e2e
 SHA512:
-  metadata.gz: 27db64ce9bd20302867b072ce1c44cdc4687bca63ff399c75386755d18b0657bd9fd35bae554604aee877a708ae3db52efcec798559d6b3915f4a012747696be
-  data.tar.gz: df08043ceb206cff4fcc896a6f1168b4460ebb16e9f3b0eaced5a4add22e9658344602c0f4251922b31fcda2cf68f0c07b1aaa718116eab476f9f338c37db424
+  metadata.gz: 41ab815a49130b66bc8c89617b188b3c7a4849878ce1d11938403e8f79457ab3d4e504ae23066f534b113b4b14a64c3f46045ea6aa14f5d735c129f00c54e5d7
+  data.tar.gz: 65d4224ad5b9d3cbbeb4f5d1b0efe1a92f4a08071e859757e1b8957a3eb208545b6de80682828d7659a0345c8a3c3967604e757ace8dd48f48e1955dce3b1c98

data/bin/album_credits

@@ -23,12 +23,7 @@ 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 found." 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

data/lib/album_credits/display.rb

@@ -13,8 +13,14 @@ module AlbumCredits
       :blue => "\e[34m"
     }
 
-    @default_color = :white
-    attr_accessor :default_color
+
+    def default_color
+      :white
+    end
+
+    def engineer_discog_max
+      100
+    end
 
     # Prints the text in color
     #
@@ -24,7 +30,7 @@ module AlbumCredits
     # @options opts [Symbol] :color (default is .default_color)
     def cp(text, opts={})
       embolden = opts[:bold] ? COLORS[:bold] : ''
-      color = opts[:color] || @default_color
+      color = opts[:color] || default_color
       puts "#{embolden}#{COLORS[color]}#{text}#{COLORS[:clear]}"
     end
 
@@ -36,27 +42,23 @@ module AlbumCredits
     end
 
     def display_release(release, engineers, opts={})
-      @default_color = opts.delete(:color) || :white
-
       cp "="*40
-      cp "#{release.title} #{release.released}"
+      cp release.title
+      cp "#{release.tracklist.size} songs, released: #{release.released}"
       cp release.uri
-      cp "#{release.tracklist.size} songs"
-      cp image_uri_for_release(release)
       cp release.notes
-
+      cp ""
       display_engineer_data(engineers, opts)
     end
 
     def get_artist_discog(artist)
       begin
-        discogs.get_artists_releases(artist.id, per_page: 25, page: 1)
+        discogs.get_artists_releases(artist.id, per_page: engineer_discog_max, 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.
     # ALSO: could filter their discog. output by x-ref w/ the role they
@@ -68,36 +70,36 @@ module AlbumCredits
       cp "Engineers:", :color => :yellow
       engineers.each do |engineer|
         next if displayed.include? engineer.name
-        cp "#{engineer.role} #{engineer.name}", :bold => true, :color => :red
+        cp "#{engineer.name}: #{engineer.role}", :bold => true, :color => :red
 
-        # Print the engineer's discography
-        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?
+        engineer_details = discogs.get_artist(engineer.id)
+        if (!engineer_details.nil?)
+          aka = engineer_details.namevariations || []
+          aka << engineer_details.aliases.map(&:name) unless engineer_details.aliases.nil?
           if !(aliases = aka.flatten.uniq.sort).empty?
-            cp "AKA: #{aliases.join(', ')}"
+            cp "AKA: #{aliases.first(10).join(', ')}"
           end
-          cp "#{engineer_discog.releases.size} releases in discography", :color => :yellow
-
-          cp engineer.uri
-
-          # Don't show discog for assistants
-          unless engineer.role =~ /assisted|assistant|additional/i
-            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|
-                artist_release = albums.sort_by{ |album| album.year.to_i }.first
-                cp "\t* #{artist_release.title} [#{artist_release.year} #{artist_release.label}]"
-              end
+        end
+
+        # Print the engineer's discography
+        engineer_discog = get_artist_discog(engineer_details)
+
+        if show_discography && !engineer_discog.nil? && engineer.role.match(/assisted|assistant|additional/i).nil?
+          discog_cnt = engineer_discog.releases.size == engineer_discog_max ? "#{engineer_discog_max}+" : engineer_discog.releases.size
+          cp "#{discog_cnt} releases in discography", :color => :yellow
+
+          cp engineer_details.uri
+
+          engineer_discog.releases.group_by{ |disk| disk.year }.sort_by{ |year, _| year || 0 }.reverse.each do |year, albums|
+            cp year, :bold => true, :color => :blue
+            albums.each do |a|
+              cp "  * #{a.artist} - \"#{a.title}\", [#{a.role}]"
             end
           end
 
-          displayed << engineer.name
-          puts
+          displayed << engineer_details.name
         end
+        puts
       end
     end
   end

data/lib/album_credits/exceptions.rb

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

data/lib/album_credits/finder.rb

@@ -13,31 +13,9 @@ 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} #{e}"
-      end
-    end
-
     def find_releases(artist, album)
-
       releases = []
-      possibilities = discogs.search(album, type: 'release', artist: artist, format: 'album')
+      possibilities = discogs.search(album, type: 'release', artist: artist)
 
       if possibilities.pagination.items > 0
         possibilities.results.each do |found_album|
@@ -55,10 +33,10 @@ module AlbumCredits
           end
         end
       else
-        debug "no results for #{artist} #{album} #{year} #{format}"
+        debug "no results for #{artist} #{album}"
       end
 
-      raise AlbumCredits::NoReleasesFound.new(artist, album, year) if releases.empty?
+      raise AlbumCredits::NoReleasesFound.new(artist, album) if releases.empty?
 
       # Sometimes Discogs returns duplicate releases so
       # filter out any duplicates based on id.
@@ -76,14 +54,9 @@ module AlbumCredits
       pristine_releases.size < uniq_releases.size ? pristine_releases : uniq_releases
     end
 
+    # TODO: Look into filtering.
     def engineers_for_release(release)
-      if release.extraartists && !(engineers = release.extraartists.select{|a| a.role =~ /mix|master|engineer/i}).empty?
-        return engineers
-      end
-    end
-
-    def discography_for_artist(artist)
-      discogs.get_artist(CGI.escape(artist)) rescue []
+      release.extraartists
     end
 
     private

data/lib/album_credits/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: album_credits
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - bassnode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discogs-wrapper