tagomatic 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/tagomatic/format_compiler.rb

@@ -6,8 +6,9 @@ module Tagomatic
 
     include Tagomatic::Tags
 
-    def initialize(format_matcher_factory)
+    def initialize(format_matcher_factory, logger)
       @format_matcher_factory = format_matcher_factory
+      @logger = logger
     end
 
     def compile_format(format)
@@ -31,11 +32,15 @@ module Tagomatic
         regexp << FORMAT_REGEXP_WHITESPACE if tag == FORMAT_ID_WHITESPACE
         regexp << FORMAT_REGEXP_EXTENDED_WHITESPACE if tag == FORMAT_ID_EXTENDED_WHITESPACE
         regexp << FORMAT_REGEXP_YEAR if tag == FORMAT_ID_YEAR
+        regexp << FORMAT_REGEXP_SURROUNDED_YEAR if tag == FORMAT_ID_SURROUNDED_YEAR
         regexp << Regexp.escape(tail)
       end
 
       compiled = Regexp.compile(regexp, Regexp::IGNORECASE)
       @format_matcher_factory.create_format_matcher(compiled, tag_mapping, format)
+    rescue
+      @logger.error "failed compiling #{format}", $!
+      raise $!
     end
 
   end

data/lib/tagomatic/format_matcher.rb

@@ -22,6 +22,7 @@ module Tagomatic
         value = normalize(value) if value
         @tags[@mapping[index]] = value
       end
+      @tags[FORMAT_ID_YEAR] ||= @tags[FORMAT_ID_SURROUNDED_YEAR]
       return nil unless valid_constraints?
       @tags
     end

data/lib/tagomatic/known_formats.rb

@@ -2,43 +2,55 @@ module Tagomatic
 
   module KnownFormats
 
-    KNOWN_FORMATS = [
-            "%g/%a/%b/Disc%d/%n-%t.mp3",
-            "%g/%a/%b/Disc%d/%n.%t.mp3",
-            "%g/%a/%b/Disc%d/%n%t.mp3",
-            "%g/%a/%b/Disc%d/%t.mp3",
-            "%g/%a/%b/cd%d/%n-%t.mp3",
-            "%g/%a/%b/cd%d/%n.%t.mp3",
-            "%g/%a/%b/cd%d/%n%t.mp3",
-            "%g/%a/%b/cd%d/%t.mp3",
-
-            "%g/%a/%b[%y]/%a-%b-%n-%t.mp3",
-            "%g/%a/%b[%y]/%n-%t.mp3",
-            "%g/%a/%b[%y]/%n.%t.mp3",
-            "%g/%a/%b[%y]/%n%t.mp3",
-
-            "%g/%a/%b(%y)/%a-%b-%n-%t.mp3",
-            "%g/%a/%b(%y)/%n-%t.mp3",
-            "%g/%a/%b(%y)/%n.%t.mp3",
-            "%g/%a/%b(%y)/%n%t.mp3",
-
-            "%g/%a/(%y)%b/%a-%b-%n-%t.mp3",
-            "%g/%a/(%y)%b/%n-%t.mp3",
-            "%g/%a/(%y)%b/%n.%t.mp3",
-            "%g/%a/(%y)%b/%n%t.mp3",
-
-            "%g/%a/%y - %b/%a-%b-%n-%t.mp3",
-            "%g/%a/%y - %b/%n-%t.mp3",
-            "%g/%a/%y - %b/%n.%t.mp3",
-            "%g/%a/%y - %b/%n%t.mp3",
-
-            "%g/%a/%b/%a-%b-%n-%t.mp3",
-            "%g/%a/%b/%n-%t.mp3",
-            "%g/%a/%b/%n.%t.mp3",
-            "%g/%a/%b/%n%t.mp3",
-
-            "%g/%a/%b/%t.mp3",
-    ]
+    PREFIXES = [
+            "%g/%a/%b-%y",
+            "%g/%a/%b %Y",
+            "%g/%a/%y-%b",
+            "%g/%a/%Y %b",
+            "%g/%a/%b",
+            ]
+
+    INFIXES = [
+            "[disc%d]/",
+            "[disk%d]/",
+            "[cd%d]/",
+            "(disc%d)/",
+            "(disk%d)/",
+            "(cd%d)/",
+            " disc%d/",
+            " disk%d/",
+            " cd%d/",
+            "/disc%d/",
+            "/disk%d/",
+            "/cd%d/",
+            "/",
+            ]
+
+    SUFFIXES = [
+            "%A-%B-%n-%t.mp3",
+            "%B-%n-%t.mp3",
+            "%A-%n-%t.mp3",
+            "%n-%A-%t.mp3",
+            "%n-%B-%t.mp3",
+            "%n-%t.mp3",
+            "%n.%t.mp3",
+            "%n%t.mp3",
+            "%t.mp3",
+            ]
+
+    def self.inflate_formats
+      formats = []
+      PREFIXES.each do |p|
+        INFIXES.each do |i|
+          SUFFIXES.each do |s|
+            formats << (p + i + s)
+          end
+        end
+      end
+      formats
+    end
+
+    KNOWN_FORMATS = inflate_formats
 
   end
 

data/lib/tagomatic/main.rb

@@ -20,7 +20,7 @@ module Tagomatic
         register :logger => Tagomatic::Logger.new(get_options)
         register :scanner => Tagomatic::Scanner.new(get_options, get_parser, get_local_options_matcher_factory, get_logger)
         register :format_matcher_factory => Tagomatic::ObjectFactory.new
-        register :compiler => Tagomatic::FormatCompiler.new(get_format_matcher_factory)
+        register :compiler => Tagomatic::FormatCompiler.new(get_format_matcher_factory, get_logger)
         register :mp3info => Tagomatic::Mp3InfoWrapper.new
         register :info_updater_factory => Tagomatic::ObjectFactory.new
         register :tagger => Tagomatic::Tagger.new(get_options, get_compiler, get_mp3info, get_info_updater_factory, get_logger)
@@ -39,7 +39,6 @@ module Tagomatic
     def run!
       options = @configuration[:options]
 
-      show_known_formats_and_exit if options[:list]
       show_usage_and_exit if options[:files].empty?
 
       scanner = @configuration[:scanner]
@@ -58,11 +57,6 @@ module Tagomatic
       exit 1
     end
 
-    def show_known_formats_and_exit
-      puts Tagomatic::Tagger::KNOWN_FORMATS
-      exit 1
-    end
-
   end
 
 end

data/lib/tagomatic/options_parser.rb

@@ -88,19 +88,20 @@ module Tagomatic
 
         opts.on("--help-formats", "Show help on writing --format strings.") do
           puts File.read(File.join(File.dirname($0), '..', 'lib/tagomatic/tags.rb'))
-          exit
+          exit 1
         end
         opts.on("--list-formats", "List built-in formats used for guessing with --guess option.") do |list|
-          @options[:list] = list
+          puts Tagomatic::Tagger::KNOWN_FORMATS
+          exit 1
         end
         opts.on("--version", "Show version information.") do |version|
           puts File.read(File.join(File.dirname($0), '..', 'VERSION'))
-          exit
+          exit 1
         end
 
         opts.on_tail("--help", "Show this message") do
           puts opts
-          exit
+          exit 1
         end
       end
     end

data/lib/tagomatic/tags.rb

@@ -28,6 +28,7 @@ module Tagomatic
     FORMAT_ID_WHITESPACE = 's'
     FORMAT_ID_EXTENDED_WHITESPACE = 'S'
     FORMAT_ID_YEAR = 'y'
+    FORMAT_ID_SURROUNDED_YEAR = 'Y'
 
     FORMAT_REGEXP_ARTIST = '([^\/]+)'
     FORMAT_REGEXP_ARTIST_AGAIN = FORMAT_REGEXP_ARTIST
@@ -36,11 +37,12 @@ module Tagomatic
     FORMAT_REGEXP_DISC = '\s*([0-9]+)\s*'
     FORMAT_REGEXP_GENRE = '([^\/]+)'
     FORMAT_REGEXP_IGNORE = '([^\/]+)'
-    FORMAT_REGEXP_TRACKNUM = '\s*([0-9]+)\s*'
+    FORMAT_REGEXP_TRACKNUM = '\s*\[?([0-9]+)\]?\s*'
     FORMAT_REGEXP_TITLE = '([^\/]+)'
     FORMAT_REGEXP_WHITESPACE = '\s*'
     FORMAT_REGEXP_EXTENDED_WHITESPACE = '[\s\-_\.]*'
     FORMAT_REGEXP_YEAR = '\s*([0-9]+)\s*'
+    FORMAT_REGEXP_SURROUNDED_YEAR = '\s*[\(\[]([0-9]+)[\)\]]\s*'
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tagomatic
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Daniel Lukic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 +01:00
+date: 2009-11-04 00:00:00 +01:00
 default_executable: tagomatic
 dependencies: 
 - !ruby/object:Gem::Dependency