tagomatic 0.1.0 → 0.1.1

data/.idea/inspectionProfiles/profiles_settings.xml

@@ -1,7 +1,8 @@
 <component name="InspectionProjectProfileManager">
   <settings>
     <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+    <scopes />
+    <list size="0" />
   </settings>
 </component>

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/monkey/id3v2.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'mp3info'
+require 'mp3info/id3v2'
+
+class ID3v2
+
+  alias :original_decode_tag :decode_tag
+
+  def decode_tag(name, raw_value)
+    original_decode_tag name, raw_value
+  rescue
+    nil
+  end
+
+end

data/lib/tagomatic/format_compiler.rb

@@ -4,12 +4,12 @@ module Tagomatic
 
     FORMAT_REGEXP_ARTIST = '([^\/]+)'
     FORMAT_REGEXP_ALBUM = '([^\/]+)'
-    FORMAT_REGEXP_DISC = '([0-9]+)'
+    FORMAT_REGEXP_DISC = '\s*([0-9]+)\s*'
     FORMAT_REGEXP_GENRE = '([^\/]+)'
     FORMAT_REGEXP_IGNORE = '([^\/]+)'
     FORMAT_REGEXP_TITLE = '([^\/]+)'
-    FORMAT_REGEXP_TRACKNUM = '([0-9]+)'
-    FORMAT_REGEXP_YEAR = '([0-9]+)'
+    FORMAT_REGEXP_TRACKNUM = '\s*([0-9]+)\s*'
+    FORMAT_REGEXP_YEAR = '\s*([0-9]+)\s*'
 
     def initialize(format_matcher_factory)
       @format_matcher_factory = format_matcher_factory

data/lib/tagomatic/format_matcher.rb

@@ -15,12 +15,7 @@ module Tagomatic
       tags = {}
       0.upto(@mapping.size) do |index|
         value = matchdata.captures[index]
-        if value
-          value = value.gsub('_', ' ')
-          parts = value.split(' ')
-          capitalized = parts.map {|p| p.capitalize}
-          value = capitalized.join(' ')
-        end
+        value = normalize(value) if value
         tags[@mapping[index]] = value
       end
       tags
@@ -30,6 +25,15 @@ module Tagomatic
       @format
     end
 
+    protected
+
+    def normalize(value)
+      value = value.gsub('_', ' ')
+      parts = value.split(' ')
+      capitalized = parts.map {|p| p.capitalize}
+      capitalized.join(' ')
+    end
+
   end
 
 end

data/lib/tagomatic/info_updater.rb

@@ -46,11 +46,12 @@ module Tagomatic
     protected
 
     def update(tag, value)
+      value.strip if value.respond_to?(:strip)
       @updates[tag] = value
     end
 
     def read(tag)
-      @info.tag2.send(tag)
+      @info.tag.send(tag)
     end
 
     def write(tag, value)

data/lib/tagomatic/logger.rb

@@ -8,7 +8,12 @@ module Tagomatic
 
     def error(message, optional_exception = nil)
       puts "ERROR: #{message}"
-      $stderr.puts optional_exception.backtrace if optional_exception
+      exception optional_exception if optional_exception
+    end
+
+    def exception(exception)
+      $stderr.puts exception.to_s
+      $stderr.puts exception.backtrace
     end
 
     def verbose(message)

data/lib/tagomatic/options.rb

@@ -5,6 +5,7 @@ module Tagomatic
   class Options < Hash
 
     def initialize
+      self[:cleantags] = false
       self[:cleartags] = false
       self[:files] = []
       self[:formats] = []

data/lib/tagomatic/options_parser.rb

@@ -53,11 +53,14 @@ module Tagomatic
           @options[:formats] << format
         end
 
+        opts.on("-c", "--cleantags", "Clean up tags by removing artist and album from title for example.") do |cleantags|
+          @options[:cleantags]= cleantags
+        end
         opts.on("-k", "--cleartags", "Clear any existing v1 and v2 tags.") do |cleartags|
-          @options[:cleartags ]= cleartags
+          @options[:cleartags]= cleartags
         end
         opts.on("-e", "--errorstops", "Stop execution if an error occurs.") do |errorstops|
-          @options[:errorstops ]= errorstops
+          @options[:errorstops]= errorstops
         end
         opts.on("-s", "--guess", "Use format guessing. Can be combined with --format.") do |guess|
           @options[:guess] = guess

data/lib/tagomatic/tagger.rb

@@ -1,3 +1,6 @@
+require 'fileutils'
+
+require 'monkey/id3v2'
 require 'tagomatic/info_updater'
 
 module Tagomatic
@@ -14,24 +17,31 @@ module Tagomatic
     FORMAT_ID_YEAR = 'y'
 
     KNOWN_FORMATS = [
-            "%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)/%n - %t.mp3",
-            "%g/%a/%b (%y)/%n-%t.mp3",
-            "%g/%a/%b (%y)/%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/%n - %t.mp3",
-            "%g/%a/%b/%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/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)/%a-%b-%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/%b/%a-%b-%n-%t.mp3",
             "%g/%a/%b/%n-%t.mp3",
+            "%g/%a/%b/%n%t.mp3",
 
-            "%a - %n - %t.mp3",
-            "%n - %a - %t.mp3",
+            "%g/%a/%b/%t.mp3",
+            "%g/%a/%b/%t.MP3",
     ]
 
     def initialize(options, compiler, mp3info, info_updater_factory, logger)
@@ -43,12 +53,13 @@ module Tagomatic
     end
 
     def process!(file_path)
-      file_path.gsub '_', ' ' if @options[:underscores]
-
       @logger.verbose "tagging #{file_path}"
 
       prepare_for_current_file(file_path)
+      replace_underscores if @options[:underscores]
       apply_formats
+      clean_tags if @options[:cleantags]
+      normalize_tags
       apply_forced_tags
       try_updating_mp3file
     end
@@ -60,6 +71,17 @@ module Tagomatic
       @tags = nil
     end
 
+    def replace_underscores
+      folder_path = File.dirname(@file_path)
+      file_name = File.basename(@file_path)
+      clean = file_name.gsub('_', ' ')
+      return if clean == file_name
+      @logger.verbose "renaming #{file_name} to #{clean}"
+      FileUtils.cd folder_path
+      FileUtils.mv file_name, clean
+      @file_path = File.join(folder_path, clean)
+    end
+
     def apply_formats
       apply_custom_formats if custom_formats_available?
       apply_known_formats if no_tags_set? and guessing_allowed?
@@ -105,6 +127,33 @@ module Tagomatic
       formats.map! { |f| f.is_a?(FormatMatcher) ? f : @compiler.compile_format(f) }
     end
 
+    def clean_tags
+      artist = @tags['a']
+      artist = Regexp.compile("[ -]*#{Regexp.escape(artist)}[ -]*", Regexp::IGNORECASE) if artist
+
+      album = @tags['b']
+      album = album.sub(artist, '') if artist and album
+      @tags['b'] = album unless album.nil? or album.empty?
+
+      album = Regexp.compile("[ -]*#{Regexp.escape(album)}[ -]*", Regexp::IGNORECASE) if album
+
+      title = @tags['t']
+      title = title.sub(artist, '') if artist and title
+      title = title.sub(album, '') if album and title
+      @tags['t'] = title unless title.nil? or title.empty?
+    end
+
+    def normalize_tags
+      normalized = Hash.new
+      @tags.each do |tag, value|
+        next if value.nil?
+        parts = value.gsub('_', ' ').split(' ')
+        capitalized = parts.map {|p| p.capitalize}
+        normalized[tag] = capitalized.join(' ')
+      end
+      @tags = normalized
+    end
+
     def apply_forced_tags
       @tags ||= Hash.new
       @tags[:album] if @options[:album]
@@ -164,6 +213,7 @@ module Tagomatic
       end
 
       updater.apply if updater.dirty?
+      puts "updated #{@file_path}" if updater.dirty?
     end
 
     def show_tags
@@ -174,9 +224,9 @@ module Tagomatic
       output << '/b='
       output << ( @mp3.tag.album || '<album>' )
       output << '/y='
-      output << ( @mp3.tag.year ? "#{@mp3.tag2.TYER}" : '<year>' )
+      output << ( @mp3.tag.year ? "#{@mp3.tag.year}" : '<year>' )
       output << '/n='
-      output << ( @mp3.tag.tracknum ? "#{@mp3.tag2.TRCK}" : '<tracknum>' )
+      output << ( @mp3.tag.tracknum ? "#{@mp3.tag.tracknum}" : '<tracknum>' )
       output << '/t='
       output << ( @mp3.tag.title || '<title>' )
       puts output

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tagomatic
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Daniel Lukic
@@ -90,6 +90,7 @@ files:
 - Rakefile
 - VERSION
 - bin/tagomatic
+- lib/monkey/id3v2.rb
 - lib/monkey/string.rb
 - lib/tagomatic/format_compiler.rb
 - lib/tagomatic/format_matcher.rb
@@ -138,5 +139,5 @@ signing_key:
 specification_version: 3
 summary: Simple command-line mp3 tagger based on mp3info gem. Supports folder-specific configuration files.
 test_files: 
-- test/test_tagomatic.rb
 - test/helper.rb
+- test/test_tagomatic.rb