musicfix 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95f3528586137687c1f38dafeb11fdc2666c9f51
-  data.tar.gz: 680c84a9847bdfbfe5bcfd21d5a8bc7dc7169ebf
+  metadata.gz: 12ba6b8750f8ba21d9d439843de08a22a590ff65
+  data.tar.gz: ef0cf64ea385518284eab1dfc85a0d77f43b5367
 SHA512:
-  metadata.gz: 11b7c508f935e211ec32939fef9b84ba08309b2d6d4a4a60de14314824cce6b4cb45cbcbdc9557c061513830aaf0411c494a96d1ec5399ec5b2c12fba59fd3eb
-  data.tar.gz: 7138bb4481a4e627a4d0a7a5972a145703155afadfbc6b80a0e4fc3115f54dd01ecf0244f92501dd5a6a57ed56229359b04cf50e8e8bb0b6af2b65e1bfd29e48
+  metadata.gz: 86728467e24e4099e13b080d8f3127151939c53bcf234d05e334c195f69f4849c86c4b4c676d99ff72088330acea8e7946575c1f051fd6db3c9fe49938441676
+  data.tar.gz: 3d17efef7167e023755bb0d1a87a4545eaa01602bee11ad59531382a11619c5ac2e69dd739d915047a7f029d3a3e5dd129ddee79b8293e6df57878d56a1605cb

data/CHANGELOG

@@ -1,3 +1,9 @@
+## 0.1.7
+* Fix http requests to work with the current API.
+* All stdout output is valid YAML.
+* Sort tracklist of output release file in filename order.
+* Get artwork from the s.pixogs.com domain.
+
 ## 0.1.6
 * Can now generate release files from audio file tags.
 * Add the release metadata saving functionality and loading logic.

data/README

@@ -1,5 +1,3 @@
-# $Id: README,v 1.17 2014/01/12 17:03:44 lostd Exp $
-
 # Description
 
 Musicfix is a music file renamer and tagger with consistency concerns.

data/bin/musicfix

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-# $Id: musicfix,v 1.60 2014/01/12 17:40:11 lostd Exp $
-
 require 'rubygems'
 require 'fileutils'
 require 'open-uri'
@@ -11,7 +9,7 @@ require 'taglib'
 require 'yaml'
 
 # Headers
-Ver = '0.1.6'
+Ver = '0.1.7'
 Homepage = 'http://git.2f30.org/musicfix/'
 Headers = {'User-Agent' => "musicfix/#{Ver} +#{Homepage}"}
 
@@ -60,6 +58,9 @@ def mkname n
     n = n.gsub '12"', '12 inch'
     n = n.gsub "12''", "12 inch"
     n = n.gsub "12'", "12 inch"
+    n = n.gsub '10"', '10 inch'
+    n = n.gsub "10''", "10 inch"
+    n = n.gsub "10'", "10 inch"
     n = n.gsub '7"', '7 inch'
     n = n.gsub "7''", "7 inch"
     n = n.gsub "7'", "7 inch"
@@ -73,7 +74,8 @@ def getimgurl rel
     return nil unless rel['images']
     img = rel['images'].select {|i| i['type'] == 'primary'}.first ||
           rel['images'].first
-    img['uri']
+    img['uri'].gsub! 'api.discogs.com/images/R-90', 's.pixogs.com/image/R'
+    img['uri'].gsub! 'api.discogs.com/images/', 's.pixogs.com/image/'
 end
 
 # Construct position list from tracks filter
@@ -99,7 +101,7 @@ end
 # Make a sane format string also using format description
 def mkformat format
     f = []
-    # Ignore in favor of LP/EP/7"/12" descriptions
+    # Ignore in favor of LP/EP/7"/10"/12" descriptions
     unless format['name'] == "Vinyl"
         f << format['name']
     end
@@ -118,6 +120,7 @@ def mkshort n
     ft = {
         'Cassette' => 'Cass',
         '12"' => '12inch',
+        '10"' => '10inch',
         '7"' => '7inch',
         'Mini-Album' => 'MiniAlbum',
         'Maxi-Single' => 'Maxi',
@@ -139,6 +142,9 @@ def mkshort n
         'Numbered' => 'Num',
         'Unofficial Release' => 'Unofficial',
         'Single Sided' => 'S/Sided',
+        'File MP3' => 'MP3',
+        'File FLAC' => 'FLAC',
+        'File WAV' => 'WAV',
     }
     # Note that prefix substitution is broken
     ftre = /(#{ft.keys.join('|')})/
@@ -195,13 +201,13 @@ end
 cfg['mdir'] = File.expand_path cfg['mdir']
 
 # Print configuration
-puts 'Configuration'
+puts '# Configuration'
 puts cfg.to_yaml
 
 # Early file checks
 if cmd == 'dump' or cmd == 'tags' then
     if File.exists? relfile then
-        puts "Release file #{relfile} exists!"
+        STDERR.puts "Release file #{relfile} exists!"
         exit
     end
 end
@@ -212,11 +218,11 @@ unless cmd == 'dump' then
     # Construct file list
     fl = Dir['*'].select {|f| File.extname(f).match fmtre}.sort
     if fl.empty? then
-        puts 'No music files found!'
-        exit
+        STDERR.puts 'No music files found!'
+        exit 1
     end
     # Output file list
-    puts 'Files to process'
+    puts '# Files to process'
     puts fl.to_yaml
 end
 
@@ -226,8 +232,8 @@ if cmd == 'load' then
     if relfile then
         # The user specified some file
         unless File.exists? relfile then
-            puts "Release file #{relfile} not found!"
-            exit
+            STDERR.puts "Release file #{relfile} not found!"
+            exit 1
         end
     else
         # Look for 'release.yaml' first
@@ -239,14 +245,15 @@ if cmd == 'load' then
             relfile = relfl.sort.first
         end
         unless relfile then
-            puts 'No release file found!'
-            exit
+            STDERR.puts 'No release file found!'
+            exit 1
         end
     end
-    puts "Loading release data..."
+    STDERR.puts "Loading release data from file..."
     rel = YAML.load File.open(relfile, 'r')
 elsif cmd == 'tags' then
     # Generate release file from audio file tags
+    STDERR.puts "Generating release data from tags..."
     rel = {}
     rel['artist'] = []
     rel['album'] = []
@@ -292,20 +299,27 @@ elsif cmd == 'tags' then
     rel['format'] = 'CD'
 else
     # Get release data from Discogs
-    puts "Getting release data..."
-    r = YAML.load(open("http://api.discogs.com/release/#{relid}?f=json",
-        Headers))['resp']['release']
+    STDERR.puts "Getting release data from Discogs..."
+    r = YAML.load(open("http://api.discogs.com/releases/#{relid}",
+        Headers))
     mr = if r['master_id'] then
-        YAML.load(open("http://api.discogs.com/master/#{r['master_id']}?f=json",
-            Headers))['resp']['master']
+        YAML.load(open("http://api.discogs.com/masters/#{r['master_id']}",
+            Headers))
     end
     # Tracklist can contain dummy header tracks, strip them
     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
+        unless pl
+            STDERR.puts "Invalid tracks filter: #{tracks}"
+            exit 1
+        end
         tl = tl.select {|t| pl.include? t['position']}
+        if tl.empty?
+            STDERR.puts "Filter returned no tracks: #{tracks}"
+            exit 1
+        end
     end
     # Gather release-wide data
     rel = {}
@@ -320,6 +334,9 @@ else
                    if r['genres'] then r['genres'].first end
     rel['format'] = mkformat r['formats'].first
     rel['comment'] = "Discogs: #{r['id']}"
+    if tracks then
+        rel['comment'] += ", tracks: #{tracks}"
+    end
     rel['imgurl'] = getimgurl r
     rel['tracklist'] = []
     # Populate tracklist
@@ -333,8 +350,10 @@ else
 end
 
 # Output release info
+puts '# Release data'
 puts rel.to_yaml
 if cmd == 'dump' or cmd == 'tags' then
+    STDERR.puts "Save rdata to #{relfile}"
     unless fake
         File.open(relfile, 'w') do |f|
             f.puts rel.to_yaml
@@ -390,7 +409,9 @@ fl.each do |ofname|
     fn = mkname n
     x = File.extname(ofname).delete('.').downcase
     nfname = eval cfg['track']
-    puts "Copy track to #{nfname}"
+    # Add filename to track descriptor
+    trk['file'] = nfname
+    STDERR.puts "Copy track to #{nfname}"
     unless fake
         FileUtils.makedirs(File.dirname nfname)
         FileUtils.copy(ofname, nfname)
@@ -411,7 +432,7 @@ end
 zz = '0' * (mkdiscnum tl.last['pos'].to_s).join.length
 imgname = eval cfg['image']
 if rel['imgurl'] then
-    puts "Save image to #{imgname}"
+    STDERR.puts "Save image to #{imgname}"
     unless fake
         img = open(rel['imgurl'], Headers).read
         File.open(imgname, 'wb').write img
@@ -419,8 +440,11 @@ if rel['imgurl'] then
 end
 # Also save the release file for future use
 relfile = eval cfg['rdata']
-puts "Save rdata to #{relfile}"
+STDERR.puts "Save rdata to #{relfile}"
 unless fake
+    # Sort tracklist in filename order and delete filenames
+    rel['tracklist'].sort_by! {|s| s['file']}
+    rel['tracklist'].each {|s| s.delete 'file'}
     File.open(relfile, 'w') do |f|
         f.puts rel.to_yaml
     end
@@ -428,10 +452,10 @@ end
 
 # Execute command if provided
 if cfg['after'] then
-    puts "Executing finishing command"
+    run = eval cfg['after']
+    STDERR.puts "Executing #{run}"
     unless fake
-        run = eval cfg['after']
-        `#{run}`
+        puts `#{run}`
     end
 end
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: musicfix
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Lazaros Koromilas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stringex
   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: taglib-ruby
   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'
 description: Musicfix is a music file renamer and tagger with consistency concerns.
@@ -46,10 +46,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/musicfix
-- README
-- LICENSE
 - CHANGELOG
+- LICENSE
+- README
+- bin/musicfix
 homepage: http://git.2f30.org/musicfix/
 licenses:
 - BSD
@@ -60,17 +60,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Music file renamer and tagger that uses Discogs.com