musicfix 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f5c80d51297e9111600c9203d0623943d250d8b
-  data.tar.gz: 8ddb775d3aa6f2a3c83497a3b9aa159bb47d708f
+  metadata.gz: a17bc779557199bbf5d0a2a0fb73e8f2eba7111e
+  data.tar.gz: 718671ebe4f9ec0b17f1b9b041cec160dfb194af
 SHA512:
-  metadata.gz: 7cac8a4e9c952c4301c111bb650f40f73c7a645af434bba9969a11fde6d007c83098002293e9e0df70a106e9cf6c0352dfbc0632c02ecb9ecf42e02bbf262885
-  data.tar.gz: 3e761cb2de179b64a7456db4c0d3a8dfcc19a343db7bff57815e492808111e280ecc936bf8f8290cf91ac998af3a40a004bb67da6289b4108cc119d2a0694893
+  metadata.gz: 58271c448ab3602583c315ac1aef9439613c82ea64edc5c974d442dd4d161c63bef2693de599948b086a77e5b4011881b28c138d370d0029a0d0b1ef862d0b89
+  data.tar.gz: 39018cb6b5fc1092952b1ced6bb27cd1103a639fedc2382635c2b6021c524c6e1be5dad317bece6b4e0a0a494b8a3d3836198cee7edb1ef3ce4eca01b425c08d

data/CHANGELOG

@@ -0,0 +1,11 @@
+## 0.1.4
+* Remove the discogs-wrapper gem dependency and directly call the
+  Discogs API with JSON output format.
+* Most of the common release format abbreviations are in place.
+* Always start numbering of track lists from 1 ("A" becomes "A1").
+* Numbering in artist name can also appear before the article, strip it.
+
+## 0.1.3
+* Release format string is now abbreviated for file naming.
+* Add the fake command prefix to avoid writing to disk.
+* Start to keep a change log.

data/README

@@ -1,4 +1,4 @@
-# $Id: README,v 1.13 2013/06/27 15:30:07 lostd Exp $
+# $Id: README,v 1.14 2013/11/08 19:06:13 lostd Exp $
 
 # Description
 
@@ -13,7 +13,7 @@ to the program.  Enjoy!
 # Dependencies
 
   * System packages: taglib
-  * Ruby gems: discogs-wrapper stringex taglib-ruby
+  * Ruby gems: stringex taglib-ruby
 
 
 # Usage

data/bin/musicfix

@@ -1,27 +1,33 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-# $Id: musicfix,v 1.39 2013/08/06 10:42:41 lostd Exp $
+# $Id: musicfix,v 1.52 2013/11/11 11:15:10 lostd Exp $
 
 require 'rubygems'
 require 'fileutils'
 require 'open-uri'
-require 'discogs'
 require 'stringex'
 require 'taglib'
 require 'yaml'
 
+# Headers
+Ver = '0.1.4'
+Homepage = 'http://www.2f30.org/~lostd/musicfix/'
+Headers = {'User-Agent' => "musicfix/#{Ver} +#{Homepage}"}
+
 # Concatenate artist list using '&'
 # Convert "Sound, The (2)" to "The Sound"
+# Convert "Unknown (21), The" to "The Unknown"
 def mkartist al
-    nl = al.collect {|a| a.name}
+    nl = al.collect {|a| a['name']}
     nl.each {|n| n.gsub! /\s\(\d+\)$/, ''}
     nl.each {|n| n.gsub! /(.*), The$/, 'The \1'}
+    nl.each {|n| n.gsub! /\s\(\d+\)$/, ''}
     nl.join ' & '
 end
 
 # Convert "3" to (nil, "03")
-# Convert "A" to (nil, "A0")
+# Convert "A" to (nil, "A1")
 # Convert "A3" to (nil, "A3")
 # Convert "2.3" to ("2", "03")
 # Convert "2.03" to ("2", "03")
@@ -36,7 +42,7 @@ def mkdiscnum pos
         d = d.gsub /\D/, ''
     end
     if n.match /[A-Z]/
-        n = n.ljust(2, '0')
+        n = n.ljust(2, '1')
     else
         n = n.rjust(2, '0')
     end
@@ -64,10 +70,10 @@ end
 
 # Get cover artwork
 def getimgurl rel
-    return nil unless rel.images
-    img = rel.images.select {|i| i.type == 'primary'}.first ||
-          rel.images.first
-    img.uri.gsub 'api.discogs.com', 's.pixogs.com'
+    return nil unless rel['images']
+    img = rel['images'].select {|i| i['type'] == 'primary'}.first ||
+          rel['images'].first
+    img['uri']
 end
 
 # Construct position list from tracks filter
@@ -92,27 +98,50 @@ end
 
 # Make a sane format string also using format description
 def mkformat format
-    if format.descriptions
-        "#{format.descriptions.first} #{format.name}"
-    else
-        "#{format.name}"
+    f = []
+    # Ignore in favor of LP/EP/7"/12" descriptions
+    unless format['name'] == "Vinyl"
+        f << format['name']
     end
+    if format['descriptions']
+        # Too general
+        format['descriptions'].delete "Album"
+        unless format['descriptions'].empty?
+            f << format['descriptions'].first
+        end
+    end
+    f.join ' '
 end
 
 # Shorten certain common words that appear in format strings
 def mkshort n
-    n = n.gsub "Album CD", "CD"
-    n = n.gsub "LP Vinyl", "LP"
-    n = n.gsub "EP Vinyl", "EP"
-    n = n.gsub "Mini-Album Vinyl", "MiniLP"
-    n = n.gsub '12" Vinyl', '12inch'
-    n = n.gsub '7" Vinyl', '7inch'
-    n = n.gsub "Cassette", "Cass"
-    n = n.gsub "Limited Edition", "Ltd"
-    n = n.gsub "Compilation", "Comp"
-    n = n.gsub "Reissue", "RE"
-    n = n.gsub "Enhanced", "Enh"
-    n = n.gsub "Unofficial Release", "Unofficial"
+    ft = {
+        'Cassette' => 'Cass',
+        '12"' => '12inch',
+        '7"' => '7inch',
+        'Mini-Album' => 'MiniAlbum',
+        'Maxi-Single' => 'Maxi',
+        'Picture Disc' => 'Pic',
+        'Flexi-disc' => 'Flexi',
+        'Reissue' => 'RE',
+        'Remaster' => 'RM',
+        'Repress' => 'RP',
+        'Mispress' => 'MP',
+        'Test Pressing' => 'TP',
+        'Enhanced' => 'Enh',
+        'Digipak ' => 'Dig',
+        'Box Set' => 'Box',
+        'Limited Edition' => 'Ltd',
+        'Club Edition' => 'Club',
+        'Compilation' => 'Comp',
+        'Sampler' => 'Smplr',
+        'Numbered' => 'Num',
+        'Unofficial Release' => 'Unofficial',
+        'Single Sided' => 'S/Sided',
+    }
+    # Note that prefix substitution is broken
+    ftre = /(#{ft.keys.join('|')})/
+    n.gsub(ftre, ft)
 end
 
 # Parse command line
@@ -182,38 +211,41 @@ if cmd == 'load' then
 else
     # Get release data from Discogs
     puts "Geting release data..."
-    discogs = Discogs::Wrapper.new("musicfix")
-    r = discogs.get_release(relid)
-    mr = if r.master_id then discogs.get_master_release(r.master_id) end
+    r = YAML.load(open("http://api.discogs.com/release/#{relid}?f=json",
+        Headers))['resp']['release']
+    mr = if r['master_id'] then
+        YAML.load(open("http://api.discogs.com/master/#{r['master_id']}?f=json",
+            Headers))['resp']['master']
+    end
     # Tracklist can contain dummy header tracks, strip them
-    tl = r.tracklist.select {|t| t.position}
+    tl = r['tracklist'].select {|t| t['position']}
     # Apply tracks filter if given
     if tracks then
         pl = mkposlist tracks
         puts "Invalid tracks filter: #{tracks}" unless pl
-        tl = tl.select {|t| pl.include? t.position}
+        tl = tl.select {|t| pl.include? t['position']}
     end
     # Gather release-wide data
     rel = {}
-    rel['artist'] = mkartist r.artists
-    rel['album'] = r.title
-    rel['year'] = r.released
-    rel['masteryear'] = if mr then mr.year end || r.released
+    rel['artist'] = mkartist r['artists']
+    rel['album'] = r['title']
+    rel['year'] = r['released']
+    rel['masteryear'] = if mr then mr['year'] end || r['released']
     # Year can be full-date so keep only the year part
-    rel['year'] = rel['year'].slice(0..3)
-    rel['masteryear'] = rel['masteryear'].slice(0..3)
-    rel['genre'] = if r.styles then r.styles.first end ||
-                   if r.genres then r.genres.first end
-    rel['format'] = mkformat r.formats.first
-    rel['comment'] = "Discogs: #{r.id}"
+    rel['year'] = rel['year'].to_s.slice(0..3).to_i
+    rel['masteryear'] = rel['masteryear'].to_s.slice(0..3).to_i
+    rel['genre'] = if r['styles'] then r['styles'].first end ||
+                   if r['genres'] then r['genres'].first end
+    rel['format'] = mkformat r['formats'].first
+    rel['comment'] = "Discogs: #{r['id']}"
     rel['imgurl'] = getimgurl r
     rel['tracklist'] = []
     # Populate tracklist
     tl.each do |s|
         trk = {}
-        trk['pos'] = s.position
-        trk['artist'] = mkartist s.artists if s.artists
-        trk['title'] = s.title
+        trk['pos'] = s['position']
+        trk['artist'] = mkartist s['artists'] if s['artists']
+        trk['title'] = s['title']
         rel['tracklist'] << trk
     end
 end
@@ -285,7 +317,7 @@ fl.each do |ofname|
             f.tag.album = b
             f.tag.title = t
             f.tag.track = tn
-            f.tag.year = y.to_i
+            f.tag.year = y
             f.tag.genre = g
             f.tag.comment = c
             f.save
@@ -299,7 +331,7 @@ imgname = eval cfg['image']
 if rel['imgurl'] then
     puts "Save cover to #{imgname}"
     unless fake
-        img = open(rel['imgurl'], {"User-Agent" => "Mozilla 5.0"}).read
+        img = open(rel['imgurl'], Headers).read
         File.open(imgname, 'wb').write img
     end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: musicfix
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Lazaros Koromilas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: discogs-wrapper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -63,7 +49,8 @@ files:
 - bin/musicfix
 - README
 - LICENSE
-homepage: http://www.2f30.org/~lostd/musicfix
+- CHANGELOG
+homepage: http://www.2f30.org/~lostd/musicfix/
 licenses:
 - BSD
 metadata: {}