musicfix 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b6c21ec0e1a27c4204d70c304f94b98f2992197
-  data.tar.gz: 715fc3b30320e2e58c9260e1c0d86728b94a24f2
+  metadata.gz: 95f3528586137687c1f38dafeb11fdc2666c9f51
+  data.tar.gz: 680c84a9847bdfbfe5bcfd21d5a8bc7dc7169ebf
 SHA512:
-  metadata.gz: 84809c52ad13adf4297ec81270a5e1f8b6274d08089a8918c9dc26aaa5576a1a12c7c589f6e50b8207e6b58d6a09e7ee7c4fb97f1a7ac5edc34ce9ad1629beb6
-  data.tar.gz: a8cf51d8efc196aa9bfd3c6aa205870287814cb85badf7c16b2e9f6b02fd5026f4db34ea3d9a987230d7d2db03930976e6e4e34f4da12b45dcb2b6513287b3cf
+  metadata.gz: 11b7c508f935e211ec32939fef9b84ba08309b2d6d4a4a60de14314824cce6b4cb45cbcbdc9557c061513830aaf0411c494a96d1ec5399ec5b2c12fba59fd3eb
+  data.tar.gz: 7138bb4481a4e627a4d0a7a5972a145703155afadfbc6b80a0e4fc3115f54dd01ecf0244f92501dd5a6a57ed56229359b04cf50e8e8bb0b6af2b65e1bfd29e48

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 0.1.6
+* Can now generate release files from audio file tags.
+* Add the release metadata saving functionality and loading logic.
+
 ## 0.1.5
 * Dummy song entries have empty pos, not nil (came with JSON change).
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012--2013 Lazaros Koromilas <lostd@2f30.org>
+Copyright (c) 2012--2014 Lazaros Koromilas <lostd@2f30.org>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README

@@ -1,4 +1,4 @@
-# $Id: README,v 1.14 2013/11/08 19:06:13 lostd Exp $
+# $Id: README,v 1.17 2014/01/12 17:03:44 lostd Exp $
 
 # Description
 
@@ -18,9 +18,15 @@ to the program.  Enjoy!
 
 # Usage
 
-    $ musicfix [fake] relid [tracks]
-    $ musicfix [fake] dump relid [relfile]
-    $ musicfix [fake] load [relfile]
+    $ musicfix        
+    Usage: musicfix [fake] relid [tracks]
+           musicfix [fake] dump relid [relfile]
+           musicfix [fake] load [relfile]
+           musicfix [fake] tags [relfile]
+
+The common path is to just give the release id:
+
+    $ musicfix 1234
 
 More sophisticated track selection can be performed by providing
 a tracks selector command line argument of the form:
@@ -34,7 +40,22 @@ in order to dump information from Discogs.com and/or load the information
 from file.  This way you can generate a base release file, edit to
 your needs, and then use it for tagging and renaming.  The fake prefix
 on all commands results in no files to be copied/written and no cover
-artwork to be downloaded.
+artwork to be downloaded.  For example:
+
+    $ musicfix dump 1234
+    $ musicfix fake load
+    $ musicfix load
+
+You may also generate a release file using the existing audio file tags
+and use that file instead:
+
+    $ musicfix tags
+    $ musicfix load
+
+The release metadata is saved together with the music files by default,
+and the load command looks for any YAML files in the current directory
+(if there is no relfile specified and `release.yaml` does not exist).
+This is useful for renaming files again using a new naming scheme.
 
 
 # Configuration
@@ -46,11 +67,12 @@ containing:
 
     mdir: ~/music/fixed
 
-Furthermore, templates are used for the naming of music files
-and the cover artwork image.  The defaults are:
+Furthermore, templates are used for the naming of music files, the
+cover artwork image and the release metadata file.  The defaults are:
 
     track: '"#{mdir}/#{fba}-#{my}-#{fb}-#{fv}/#{d}#{fn}-#{fa}-#{ft}.#{x}"'
     image: '"#{mdir}/#{fba}-#{my}-#{fb}-#{fv}/#{zz}-#{fba}-#{fb}_cover.jpg"'
+    rdata: '"#{mdir}/#{fba}-#{my}-#{fb}-#{fv}/#{zz}-#{fba}-#{fb}_release.yaml"'
 
 To run a shell command upon completion use the `after` attribute.
 For example, to update the MPD database:
@@ -78,7 +100,7 @@ Only for track naming:
     tn: track number counter
     x: file extension in lowercase
 
-Only for image naming:
+Only for image and rdata naming:
 
     zz: zeros that match d + n width
 

data/bin/musicfix

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-# $Id: musicfix,v 1.53 2013/11/11 14:46:42 lostd Exp $
+# $Id: musicfix,v 1.60 2014/01/12 17:40:11 lostd Exp $
 
 require 'rubygems'
 require 'fileutils'
@@ -11,8 +11,8 @@ require 'taglib'
 require 'yaml'
 
 # Headers
-Ver = '0.1.4'
-Homepage = 'http://www.2f30.org/~lostd/musicfix/'
+Ver = '0.1.6'
+Homepage = 'http://git.2f30.org/musicfix/'
 Headers = {'User-Agent' => "musicfix/#{Ver} +#{Homepage}"}
 
 # Concatenate artist list using '&'
@@ -124,6 +124,7 @@ def mkshort n
         'Picture Disc' => 'Pic',
         'Flexi-disc' => 'Flexi',
         'Reissue' => 'RE',
+        'Remastered' => 'RM',
         'Remaster' => 'RM',
         'Repress' => 'RP',
         'Mispress' => 'MP',
@@ -144,20 +145,32 @@ def mkshort n
     n.gsub(ftre, ft)
 end
 
+# Return single item if array is full of duplicates
+def flatten_if_one ary
+    if ary.uniq.length == 1 then
+        ary.first
+    else
+        ary.uniq
+    end
+end
+
 # Parse command line
 usage = ''
 usage << "Usage: musicfix [fake] relid [tracks]\n"
 usage << "       musicfix [fake] dump relid [relfile]\n"
 usage << "       musicfix [fake] load [relfile]\n"
+usage << "       musicfix [fake] tags [relfile]\n"
 fake = ARGV[0] == 'fake'
 ARGV.delete 'fake'
 cmd = ARGV[0] || (puts usage; exit)
 case cmd
 when 'load' then
-    relfile = ARGV[1] || 'release.yaml'
+    relfile = ARGV[1] || nil
 when 'dump' then
     relid = ARGV[1] || (puts usage; exit)
     relfile = ARGV[2] || 'release.yaml'
+when 'tags' then
+    relfile = ARGV[1] || 'release.yaml'
 else
     relid = ARGV[0]
     tracks = ARGV[1] || nil
@@ -168,6 +181,7 @@ cfg = {}
 cfg['mdir'] = '~/music'
 cfg['track'] = '"#{mdir}/#{fba}-#{my}-#{fb}-#{fv}/#{d}#{fn}-#{fa}-#{ft}.#{x}"'
 cfg['image'] = '"#{mdir}/#{fba}-#{my}-#{fb}-#{fv}/#{zz}-#{fba}-#{fb}_cover.jpg"'
+cfg['rdata'] = '"#{mdir}/#{fba}-#{my}-#{fb}-#{fv}/#{zz}-#{fba}-#{fb}_release.yaml"'
 #cfg['after'] = '"mpc update #{fba}-#{my}-#{fb}-#{fv}"'
 
 # User configuration overrides
@@ -184,6 +198,14 @@ cfg['mdir'] = File.expand_path cfg['mdir']
 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!"
+        exit
+    end
+end
+
 unless cmd == 'dump' then
     # Supported formats
     fmtre = /mp3|ogg|m4a|mpc|flac|wv/i
@@ -201,16 +223,76 @@ end
 # Initialize release info
 if cmd == 'load' then
     # Load release data from file
-    if File.exists? relfile then
-        puts "Loading release data..."
-        rel = YAML.load File.open(relfile, 'r')
+    if relfile then
+        # The user specified some file
+        unless File.exists? relfile then
+            puts "Release file #{relfile} not found!"
+            exit
+        end
     else
-        puts "Release file #{relfile} not found."
-        exit
+        # Look for 'release.yaml' first
+        if File.exists? 'release.yaml' then
+            relfile = 'release.yaml'
+        else
+            # Look for any '.yaml' file
+            relfl = Dir['*'].select {|f| File.extname(f).match /yaml/i}
+            relfile = relfl.sort.first
+        end
+        unless relfile then
+            puts 'No release file found!'
+            exit
+        end
+    end
+    puts "Loading release data..."
+    rel = YAML.load File.open(relfile, 'r')
+elsif cmd == 'tags' then
+    # Generate release file from audio file tags
+    rel = {}
+    rel['artist'] = []
+    rel['album'] = []
+    rel['year'] = []
+    rel['masteryear'] = nil
+    rel['genre'] = []
+    rel['format'] = nil
+    rel['comment'] = []
+    rel['imgurl'] = nil
+    rel['tracklist'] = []
+    # Populate tracklist
+    fl.each do |fname|
+        TagLib::FileRef.open(fname) do |f|
+            trk = {}
+            trk['pos'] = f.tag.track
+            trk['artist'] = f.tag.artist
+            trk['title'] = f.tag.title
+            rel['tracklist'] << trk
+            # Make lists and flatten afterwards
+            rel['artist'] << f.tag.artist
+            rel['album'] << f.tag.album
+            rel['year'] << f.tag.year
+            rel['genre'] << f.tag.genre
+            rel['comment'] << f.tag.comment
+        end
     end
+    if rel['artist'].uniq.length == 1 then
+        # Single-artist release
+        rel['artist'] = rel['artist'].first
+        rel['tracklist'].each do |trk|
+            trk.delete 'artist'
+        end
+    else
+        rel['artist'] = 'Various'
+    end
+    # These should be the same on all files
+    rel['album'] = flatten_if_one rel['album']
+    rel['year'] = flatten_if_one rel['year']
+    rel['genre'] = flatten_if_one rel['genre']
+    rel['comment'] = flatten_if_one rel['comment']
+    # Assumptions
+    rel['masteryear'] = rel['year']
+    rel['format'] = 'CD'
 else
     # Get release data from Discogs
-    puts "Geting release data..."
+    puts "Getting release data..."
     r = YAML.load(open("http://api.discogs.com/release/#{relid}?f=json",
         Headers))['resp']['release']
     mr = if r['master_id'] then
@@ -252,7 +334,7 @@ end
 
 # Output release info
 puts rel.to_yaml
-if cmd == 'dump' then
+if cmd == 'dump' or cmd == 'tags' then
     unless fake
         File.open(relfile, 'w') do |f|
             f.puts rel.to_yaml
@@ -329,18 +411,28 @@ end
 zz = '0' * (mkdiscnum tl.last['pos'].to_s).join.length
 imgname = eval cfg['image']
 if rel['imgurl'] then
-    puts "Save cover to #{imgname}"
+    puts "Save image to #{imgname}"
     unless fake
         img = open(rel['imgurl'], Headers).read
         File.open(imgname, 'wb').write img
     end
 end
+# Also save the release file for future use
+relfile = eval cfg['rdata']
+puts "Save rdata to #{relfile}"
+unless fake
+    File.open(relfile, 'w') do |f|
+        f.puts rel.to_yaml
+    end
+end
 
 # Execute command if provided
 if cfg['after'] then
     puts "Executing finishing command"
-    run = eval cfg['after']
-    `#{run}`
+    unless fake
+        run = eval cfg['after']
+        `#{run}`
+    end
 end
 
 # vim:set ts=4 sw=4 et:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musicfix
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Lazaros Koromilas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stringex
@@ -50,7 +50,7 @@ files:
 - README
 - LICENSE
 - CHANGELOG
-homepage: http://www.2f30.org/~lostd/musicfix/
+homepage: http://git.2f30.org/musicfix/
 licenses:
 - BSD
 metadata: {}