tagomatic 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/tagomatic/format_compiler.rb

@@ -19,13 +19,17 @@ module Tagomatic
         tag = tag_and_tail[0, 1]
         tail = tag_and_tail[1..-1]
         tag_mapping << tag
-        regexp << FORMAT_REGEXP_ALBUM if tag == FORMAT_ID_ALBUM
         regexp << FORMAT_REGEXP_ARTIST if tag == FORMAT_ID_ARTIST
+        regexp << FORMAT_REGEXP_ARTIST_AGAIN if tag == FORMAT_ID_ARTIST_AGAIN
+        regexp << FORMAT_REGEXP_ALBUM if tag == FORMAT_ID_ALBUM
+        regexp << FORMAT_REGEXP_ALBUM_AGAIN if tag == FORMAT_ID_ALBUM_AGAIN
         regexp << FORMAT_REGEXP_DISC if tag == FORMAT_ID_DISC
         regexp << FORMAT_REGEXP_GENRE if tag == FORMAT_ID_GENRE
         regexp << FORMAT_REGEXP_IGNORE if tag == FORMAT_ID_IGNORE
-        regexp << FORMAT_REGEXP_TITLE if tag == FORMAT_ID_TITLE
         regexp << FORMAT_REGEXP_TRACKNUM if tag == FORMAT_ID_TRACKNUM
+        regexp << FORMAT_REGEXP_TITLE if tag == FORMAT_ID_TITLE
+        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 << Regexp.escape(tail)
       end

data/lib/tagomatic/format_matcher.rb

@@ -1,7 +1,11 @@
+require 'tagomatic/tags'
+
 module Tagomatic
 
   class FormatMatcher
 
+    include Tagomatic::Tags
+
     def initialize(compiled_regexp, tag_mapping, original_format)
       @regexp = compiled_regexp
       @mapping = tag_mapping
@@ -12,13 +16,14 @@ module Tagomatic
       matchdata = @regexp.match(file_path)
       return nil unless matchdata
       return nil unless matchdata.captures.size == @mapping.size
-      tags = {}
+      @tags = {}
       0.upto(@mapping.size) do |index|
         value = matchdata.captures[index]
         value = normalize(value) if value
-        tags[@mapping[index]] = value
+        @tags[@mapping[index]] = value
       end
-      tags
+      return nil unless valid_constraints?
+      @tags
     end
 
     def to_s
@@ -34,6 +39,17 @@ module Tagomatic
       capitalized.join(' ')
     end
 
+    def valid_constraints?
+      valid_double_match_with_same_value?(FORMAT_ID_ARTIST, FORMAT_ID_ARTIST_AGAIN) &&
+      valid_double_match_with_same_value?(FORMAT_ID_ALBUM, FORMAT_ID_ALBUM_AGAIN)
+    end
+
+    def valid_double_match_with_same_value?(base_tag, again_tag)
+      return true unless @tags.has_key?(again_tag)
+      return false unless @tags.has_key?(base_tag)
+      return @tags[base_tag] == @tags[again_tag]
+    end
+
   end
 
 end

data/lib/tagomatic/options_parser.rb

@@ -24,7 +24,7 @@ module Tagomatic
       OptionParser.new do |opts|
         opts.banner = "Usage: #{$0} [options..] files.."
 
-        opts.separator ""
+        opts.separator " "
         opts.separator "Specific options:"
 
         opts.on("-b", "--album [ALBUM]", "Set this album name.") do |album|
@@ -49,47 +49,57 @@ module Tagomatic
           @options[:year] = year
         end
 
+        opts.separator " "
+        opts.separator "Primary options:"
+
         opts.on("-f", "--format [FORMAT]", "Try applying this format string to determine tags. Multiple occurrences allowed.") do |format|
-          @options[:formats] << format
+          @options[:formats] << format.gsub('|', '/')
         end
 
+        opts.separator " "
+        
         opts.on("-c", "--[no-]cleantags", "Clean up tags by removing artist and album from title for example.") do |cleantags|
           @options[:cleantags]= cleantags
         end
-        opts.on("-k", "--[no-]cleartags", "Clear any existing v1 and v2 tags.") do |cleartags|
+        opts.on("-k", "--[no-]cleartags", "Clear any existing v1 and v2 tags. This is an expensive and destructive operation.") do |cleartags|
           @options[:cleartags]= cleartags
         end
         opts.on("-e", "--[no-]errorstops", "Stop execution if an error occurs.") do |errorstops|
           @options[:errorstops]= errorstops
         end
-        opts.on("-s", "--[no-]guess", "Use format guessing. Can be combined with --format.") do |guess|
+        opts.on("-s", "--[no-]guess", "Use format guessing. Used only if no --format matched.") do |guess|
           @options[:guess] = guess
         end
-        opts.on("-l", "--[no-]list", "List available formats for guessing.") do |list|
-          @options[:list] = list
-        end
         opts.on("-r", "--[no-]recurse", "Scan for files recursively.") do |recurse|
           @options[:recurse] = recurse
         end
-        opts.on("-w", "--[no-]showtags", "Show the resulting tags.") do |showtags|
-          @options[:showtags] = showtags
-        end
         opts.on("-u", "--[no-]underscores", "Replace underscores with spaces before processing a file name.") do |underscores|
           @options[:underscores] = underscores
         end
+        opts.on("-v", "--[no-]verbose", "Print verbose messages about processing operations.") do |verbose|
+          @options[:verbose] = verbose
+        end
+        opts.on("-w", "--[no-]showtags", "Show the resulting tags.") do |showtags|
+          @options[:showtags] = showtags
+        end
 
-        opts.separator ""
-        opts.separator "Common options:"
+        opts.separator " "
+        opts.separator "Informational options:"
 
-        opts.on("-v", "--[no-]verbose", "Run verbosely.") do |verbose|
-          @options[:verbose] = verbose
+        opts.on("--help-formats", "Show help on writing --format strings.") do
+          puts File.read(File.join(File.dirname($0), '..', 'lib/tagomatic/tags.rb'))
+          exit
         end
-        opts.on_tail("-h", "--help", "Show this message") do
-          puts opts
+        opts.on("--list-formats", "List built-in formats used for guessing with --guess option.") do |list|
+          @options[:list] = list
+        end
+        opts.on("--version", "Show version information.") do |version|
+          puts File.read(File.join(File.dirname($0), '..', 'VERSION'))
           exit
         end
-        opts.on_tail("--help-format", "Show help on writing --format strings") do
-          puts File.read(File.join(File.dirname($0), '..', 'lib/tagomatic/tags.rb'))
+
+        opts.on_tail("--help", "Show this message") do
+          puts opts
           exit
         end
       end

data/lib/tagomatic/scanner.rb

@@ -16,7 +16,7 @@ module Tagomatic
       @file_path = path_prefix.nil? ? file_or_folder : File.join(path_prefix, file_or_folder)
       @logger.verbose "processing #{@file_path}"
       if is_taggable_file?
-        yield @file_path
+        yield File.expand_path(@file_path)
       elsif is_scannable?
         enter_scannable_folder(&block)
       end

data/lib/tagomatic/tags.rb

@@ -17,21 +17,29 @@ module Tagomatic
     #   --format "%g/%a/%b - encoded by noone - %y/%n - %t.mp3"
 
     FORMAT_ID_ARTIST = 'a'
+    FORMAT_ID_ARTIST_AGAIN = 'A'
     FORMAT_ID_ALBUM = 'b'
+    FORMAT_ID_ALBUM_AGAIN = 'B'
     FORMAT_ID_DISC = 'd'
     FORMAT_ID_GENRE = 'g'
     FORMAT_ID_IGNORE = 'i'
-    FORMAT_ID_TITLE = 't'
     FORMAT_ID_TRACKNUM = 'n'
+    FORMAT_ID_TITLE = 't'
+    FORMAT_ID_WHITESPACE = 's'
+    FORMAT_ID_EXTENDED_WHITESPACE = 'S'
     FORMAT_ID_YEAR = 'y'
 
     FORMAT_REGEXP_ARTIST = '([^\/]+)'
+    FORMAT_REGEXP_ARTIST_AGAIN = FORMAT_REGEXP_ARTIST
     FORMAT_REGEXP_ALBUM = '([^\/]+)'
+    FORMAT_REGEXP_ALBUM_AGAIN = FORMAT_REGEXP_ALBUM
     FORMAT_REGEXP_DISC = '\s*([0-9]+)\s*'
     FORMAT_REGEXP_GENRE = '([^\/]+)'
     FORMAT_REGEXP_IGNORE = '([^\/]+)'
-    FORMAT_REGEXP_TITLE = '([^\/]+)'
     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*'
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tagomatic
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Daniel Lukic