taffy 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80726aa3548445e7ab5b0dd1e765c138c585e470
-  data.tar.gz: cfc8492d9a14ee9210f60ef79284bb1c50d68d1f
+  metadata.gz: 7b285af0466eca45d0e54a7b679e98603a260e13
+  data.tar.gz: c04e0465d601f3f6e077cc4cceffded7817ac745
 SHA512:
-  metadata.gz: e9a942aac1363f7364ce1b37c77718550462b462a62f4ae2f7215dac98e1216b9bbd023b0e14a93a8ebedabf25c95234ea0ceab71fdb9e289165049ff0d14576
-  data.tar.gz: bad018502a26c83940ac46070d3a67646cd73a78d60b54ed1a68bfc622eda1000f1795fb5f0915f2e3107eafe5a7de2464cde94c9c045aac730117dfe25f6384
+  metadata.gz: 660e523484ccd5d24db1adb78da2876379b55e9b9e82d2db11d29b4d874d87c031cb7267ed71c7ef6e2fe903e7c2a47832f8d6eca3f60b7a3ff05ce7f4c5aeb2
+  data.tar.gz: debe7f81f2e4235f33b0f345be2bf2228ab94530f42f80ae5952fb077461d43a91a7f259548db58e0ec5d100038d3090b70a61c9767a8678b8f360a8c14419a8

data/README.md

@@ -2,48 +2,56 @@ Taffy
 =====
 Taffy is a command-line tool for reading and writing audio metadata, as
 supported by [TagLib](http://taglib.github.io/). That means it can edit
-tags for MP3, Ogg Vorbis, FLAC, WAV, and MP4 files, along with a few
-other file formats I've never used.
+tags for MP3, Ogg Vorbis, FLAC, WAV, and MP4 files, along with several
+other file formats.
 
 Installation
 ------------
+If installing via `gem`, you must have already installed your
+distribution's TagLib package, usually called `taglib`, `taglib-devel`,
+or `libtag1-dev`. Then run:
+
 	gem install taffy
 
+If you use Arch Linux or a derivative, you may also install via the [AUR
+package](https://aur.archlinux.org/packages/taffy/).
+
 Usage
 -----
-    Usage: taffy [options] file ...
-
-    Tag options:
-        -l, --album ALBUM                Set album tag
-        -r, --artist ARTIST              Set artist tag
-        -c, --comment COMMENT            Set comment tag
-        -g, --genre GENRE                Set genre tag
-        -t, --title TITLE                Set title tag
-        -n, --track TRACK                Set track tag
-        -y, --year YEAR                  Set year tag
-            --no-album                   Clear album tag
-            --no-artist                  Clear artist tag
-            --no-comment                 Clear comment tag
-            --no-genre                   Clear genre tag
-            --no-title                   Clear title tag
-            --no-track                   Clear track tag
-            --no-year                    Clear year tag
-            --clear                      Clear all tags
-
-    Filename options:
-            --rename SPEC                Rename file based on tags
-
-    If no options are given, file tags are printed instead.
-
-    In a filename spec, a sequence such as %R or %r stands for
-    the corresponding tag, in this case the artist name. %R
-    leaves letter case intact, while %r downcases the tag. A
-    sequence such as %_t maps special characters in the tag
-    to the given substitute, in this case an underscore.
-
-    Other options:
-        -h, --help                       Show this message and exit
-            --version                    Show version and exit
+	Usage: taffy [options] file ...
+	
+	Tag options:
+	    -l, --album ALBUM                Set album tag
+	    -r, --artist ARTIST              Set artist tag
+	    -c, --comment COMMENT            Set comment tag
+	    -g, --genre GENRE                Set genre tag
+	    -t, --title TITLE                Set title tag
+	    -n, --track TRACK                Set track tag
+	    -y, --year YEAR                  Set year tag
+	        --no-album                   Clear album tag
+	        --no-artist                  Clear artist tag
+	        --no-comment                 Clear comment tag
+	        --no-genre                   Clear genre tag
+	        --no-title                   Clear title tag
+	        --no-track                   Clear track tag
+	        --no-year                    Clear year tag
+	        --clear                      Clear all tags
+	
+	Filename options:
+	        --extract SPEC               Extract tags from filename
+	        --rename SPEC                Rename file based on tags
+	
+	If no options are given, file tags are printed instead.
+	
+	In a filename spec, a sequence such as %R or %r stands for
+	the corresponding tag, in this case the artist name. In a
+	filename, %R leaves letter case intact, while %r downcases
+	the tag. A sequence such as %_t maps special characters in
+	the tag to the given substitute, in this case an underscore.
+	
+	Other options:
+	    -h, --help                       Show this message and exit
+	        --version                    Show version and exit
 
 Examples
 --------

data/bin/taffy

@@ -5,7 +5,7 @@ require 'shellwords'
 
 require 'taglib'
 
-VERSION = [1, 1, 2]
+VERSION = [1, 2, 0]
 
 FIELDS = [
   ['l', 'album',   String],
@@ -18,8 +18,8 @@ FIELDS = [
 ]
 
 actions = []
-rename_spec = nil
-status = 0
+extract_spec = rename_spec = nil
+$status = 0
 
 options = OptionParser.new do |opts|
   opts.banner += " file ..."
@@ -49,6 +49,9 @@ options = OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Filename options:"
 
+  opts.on("--extract SPEC", String, "Extract tags from filename") do |spec|
+    extract_spec = spec
+  end
   opts.on("--rename SPEC", String, "Rename file based on tags") do |spec|
     rename_spec = spec
   end
@@ -57,10 +60,10 @@ options = OptionParser.new do |opts|
   opts.separator "If no options are given, file tags are printed instead."
   opts.separator ""
   opts.separator "In a filename spec, a sequence such as %R or %r stands for"
-  opts.separator "the corresponding tag, in this case the artist name. %R"
-  opts.separator "leaves letter case intact, while %r downcases the tag. A"
-  opts.separator "sequence such as %_t maps special characters in the tag"
-  opts.separator "to the given substitute, in this case an underscore."
+  opts.separator "the corresponding tag, in this case the artist name. In a"
+  opts.separator "filename, %R leaves letter case intact, while %r downcases"
+  opts.separator "the tag. A sequence such as %_t maps special characters in"
+  opts.separator "the tag to the given substitute, in this case an underscore."
   opts.separator ""
   opts.separator "Other options:"
 
@@ -98,6 +101,30 @@ def print_info(filename, tag)
   puts
 end
 
+def extract(tag, spec, filename)
+  name = File.basename(filename)
+  name = name.slice(0, name.size - File.extname(name).size)
+  regexp = Regexp.new(spec.gsub(/%(\W|_)?([lrcgt])/, '(.+)').
+                           gsub(/%(\W|_)?([ny])/, '(\d+)'))
+  if filematch = regexp.match(name)
+    i = 1
+    loop do
+      specmatch = /%(?:\W|_)?([lrcgtny])/.match(spec)
+      break unless specmatch
+      FIELDS.each do |f|
+        next if f[0] != specmatch[1]
+        val = 'ny'.include?(f[0]) ? filematch[i].to_i : filematch[i]
+        tag.send("#{f[1]}=", val)
+      end
+      spec = specmatch.post_match
+      i += 1
+    end
+  else
+    warn("#{filename} did not match extraction spec")
+    $status = 2
+  end
+end
+
 def rename(tag, spec)
   spec = spec.dup
 
@@ -117,22 +144,33 @@ ARGV.each do |filename|
   TagLib::FileRef.open(filename) do |fileref|
     if fileref.null?
       warn("Could not open file: #{filename}")
-      status = 2
+      $status = 2
       next
     end
 
-    if actions.empty? and !rename_spec
+    if extract_spec
+      extract(fileref.tag, extract_spec, filename)
+      fileref.save
+    end
+
+    if actions.empty? and !(extract_spec or rename_spec)
       print_info(filename, fileref.tag)
-    else
+    elsif !actions.empty?
       actions.each { |action| action.call(fileref.tag) }
       fileref.save
     end
 
     if rename_spec
       name = rename(fileref.tag, rename_spec) + File.extname(filename)
-      File.rename(filename, File.join(File.dirname(filename), name))
+      path = File.join(File.dirname(filename), name)
+      if File.exist?(path)
+        warn("Cannot rename; file exists: #{name}")
+        $status = 2
+      else
+        File.rename(filename, path)
+      end
     end
   end
 end
 
-exit(status)
+exit($status)

data/taffy.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'taffy'
-  s.version     = '1.1.2'
-  s.date        = '2015-04-27'
+  s.version     = '1.2.0'
+  s.date        = '2015-04-29'
   s.summary     = 'A command-line audio tagging tool'
   s.description = "A command-line tool for reading and writing audio \
                    metadata.".squeeze(' ')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taffy
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Brandon Mulcahy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby