musicfix 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e6161997b72e0c71c437d4b84534a4c3ae0ad66
-  data.tar.gz: c5dfe3555ee3ba7d9350d0dfb85e4d9fc965e6ea
+  metadata.gz: 4f5c80d51297e9111600c9203d0623943d250d8b
+  data.tar.gz: 8ddb775d3aa6f2a3c83497a3b9aa159bb47d708f
 SHA512:
-  metadata.gz: 90d4d7d82ad86c294ac6253a20cf612b425bbb6050a4fcb2d965ec4f093a1f816c42a5d68dae2f7334cdea8062837a21d57f4f1b122507095a1a26d6a7d0a9ac
-  data.tar.gz: 039b2873127b44bc800b9a0c1b29c93ba8785c883feb9ef9b945659ba55c47334372e6ec841b57659f44c5fa5791d49a1560f3cec89488fe74a76f5325072d70
+  metadata.gz: 7cac8a4e9c952c4301c111bb650f40f73c7a645af434bba9969a11fde6d007c83098002293e9e0df70a106e9cf6c0352dfbc0632c02ecb9ecf42e02bbf262885
+  data.tar.gz: 3e761cb2de179b64a7456db4c0d3a8dfcc19a343db7bff57815e492808111e280ecc936bf8f8290cf91ac998af3a40a004bb67da6289b4108cc119d2a0694893

data/README

@@ -1,4 +1,4 @@
-# $Id: README,v 1.11 2013/02/02 09:44:52 lostd Exp $
+# $Id: README,v 1.13 2013/06/27 15:30:07 lostd Exp $
 
 # Description
 
@@ -18,12 +18,12 @@ to the program.  Enjoy!
 
 # Usage
 
-    $ musicfix relid [tracks]
-    $ musicfix dump relid [relfile]
-    $ musicfix load [relfile]
+    $ musicfix [fake] relid [tracks]
+    $ musicfix [fake] dump relid [relfile]
+    $ musicfix [fake] load [relfile]
 
 More sophisticated track selection can be performed by providing
-a second command line argument of the form:
+a tracks selector command line argument of the form:
 
     "1--3,5,8"
     "A2--A4,B3"
@@ -32,14 +32,19 @@ a second command line argument of the form:
 Alternatively, YAML metadata files can be used (`release.yaml` by default)
 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.
+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.
 
 
 # Configuration
 
-The simplest `~/.musicfixrc` configuration file only contains:
+In the simplest case no configuration is needed!  The music files are
+copied to the ~/music directory, which is created if needed.  If you
+want to change that, create a `~/.musicfixrc` configuration file
+containing:
 
-    mdir: ~/music
+    mdir: ~/music/fixed
 
 Furthermore, templates are used for the naming of music files
 and the cover artwork image.  The defaults are:

data/bin/musicfix

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-# $Id: musicfix,v 1.30 2013/06/13 23:09:01 lostd Exp $
+# $Id: musicfix,v 1.39 2013/08/06 10:42:41 lostd Exp $
 
 require 'rubygems'
 require 'fileutils'
@@ -48,7 +48,9 @@ syms = {"≠" => "not equals"}
 Stringex::Localization.store_translations :en, :transliterations, syms
 
 # Convert to lowercase ASCII without punctuation
+# Convert "Jean-Michel Jarre" to "jean_michel_jarre"
 def mkname n
+    # These may be in track titles like "(7'' Version)"
     n = n.gsub '12"', '12 inch'
     n = n.gsub "12''", "12 inch"
     n = n.gsub "12'", "12 inch"
@@ -56,6 +58,7 @@ def mkname n
     n = n.gsub "7''", "7 inch"
     n = n.gsub "7'", "7 inch"
     n = n.gsub " & ", " and "
+    # Transliterate
     n.to_url.gsub '-', '_'
 end
 
@@ -87,11 +90,38 @@ def mkposlist tracks
     pl.flatten
 end
 
+# Make a sane format string also using format description
+def mkformat format
+    if format.descriptions
+        "#{format.descriptions.first} #{format.name}"
+    else
+        "#{format.name}"
+    end
+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"
+end
+
 # Parse command line
 usage = ''
-usage << "Usage: musicfix relid [tracks]\n"
-usage << "       musicfix dump relid [relfile]\n"
-usage << "       musicfix load [relfile]\n"
+usage << "Usage: musicfix [fake] relid [tracks]\n"
+usage << "       musicfix [fake] dump relid [relfile]\n"
+usage << "       musicfix [fake] load [relfile]\n"
+fake = ARGV[0] == 'fake'
+ARGV.delete 'fake'
 cmd = ARGV[0] || (puts usage; exit)
 case cmd
 when 'load' then
@@ -106,7 +136,7 @@ end
 
 # Default configuration
 cfg = {}
-cfg['mdir'] = '/var/music'
+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['after'] = '"mpc update #{fba}-#{my}-#{fb}-#{fv}"'
@@ -174,7 +204,7 @@ else
     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'] = r.formats.first.name
+    rel['format'] = mkformat r.formats.first
     rel['comment'] = "Discogs: #{r.id}"
     rel['imgurl'] = getimgurl r
     rel['tracklist'] = []
@@ -191,8 +221,10 @@ end
 # Output release info
 puts rel.to_yaml
 if cmd == 'dump' then
-    File.open(relfile, 'w') do |f|
-        f.puts rel.to_yaml
+    unless fake
+        File.open(relfile, 'w') do |f|
+            f.puts rel.to_yaml
+        end
     end
     exit
 end
@@ -208,7 +240,7 @@ v = rel['format']
 c = rel['comment']
 fba = mkname ba
 fb = mkname b
-fv = mkname v
+fv = mkname (mkshort v)
 # Internal use only
 tl = rel['tracklist']
 
@@ -245,17 +277,19 @@ fl.each do |ofname|
     x = File.extname(ofname).delete('.').downcase
     nfname = eval cfg['track']
     puts "Copy track to #{nfname}"
-    FileUtils.makedirs(File.dirname nfname)
-    FileUtils.copy(ofname, nfname)
-    TagLib::FileRef.open(nfname) do |f|
-        f.tag.artist = a
-        f.tag.album = b
-        f.tag.title = t
-        f.tag.track = tn
-        f.tag.year = y.to_i
-        f.tag.genre = g
-        f.tag.comment = c
-        f.save
+    unless fake
+        FileUtils.makedirs(File.dirname nfname)
+        FileUtils.copy(ofname, nfname)
+        TagLib::FileRef.open(nfname) do |f|
+            f.tag.artist = a
+            f.tag.album = b
+            f.tag.title = t
+            f.tag.track = tn
+            f.tag.year = y.to_i
+            f.tag.genre = g
+            f.tag.comment = c
+            f.save
+        end
     end
 end
 
@@ -264,8 +298,10 @@ zz = '0' * (mkdiscnum tl.last['pos'].to_s).join.length
 imgname = eval cfg['image']
 if rel['imgurl'] then
     puts "Save cover to #{imgname}"
-    img = open(rel['imgurl'], {"User-Agent" => "Mozilla"}).read
-    File.open(imgname, 'wb').write img
+    unless fake
+        img = open(rel['imgurl'], {"User-Agent" => "Mozilla 5.0"}).read
+        File.open(imgname, 'wb').write img
+    end
 end
 
 # Execute command if provided

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musicfix
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Lazaros Koromilas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discogs-wrapper
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Music file renamer and tagger that uses Discogs.com