tagomatic 0.1.7 → 0.1.8

data/.gitignore

@@ -19,6 +19,7 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+/.idea/.rakeTasks
 /.idea/encodings.xml
 /.idea/inspectionProfiles/
 /.idea/misc.xml

data/.idea/modules.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
+<project relativePaths="false" version="4">
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/tagomatic.iml" filepath="$PROJECT_DIR$/.idea/tagomatic.iml" />

data/.idea/tagomatic.iml

@@ -8,11 +8,14 @@
       <source manual="true" />
     </requirement>
   </component>
-  <component name="NewModuleRootManager">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="[gem] ruby-mp3info (v0.6.13, /usr/lib/ruby/gems/1.8/gems/ruby-mp3info-0.6.13)" level="application" />
   </component>
+  <component name="RModuleSettingsStorage">
+    <RMODULE_SETTINGS_STORAGE_ID NAME="NUMBER" VALUE="0" />
+  </component>
 </module>
 

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/tagomatic/format_matcher.rb

@@ -17,7 +17,7 @@ module Tagomatic
       return nil unless matchdata
       return nil unless matchdata.captures.size == @mapping.size
       @tags = {}
-      0.upto(@mapping.size) do |index|
+      0.upto(@mapping.size - 1) do |index|
         value = matchdata.captures[index]
         value = normalize(value) if value
         @tags[@mapping[index]] = value
@@ -48,9 +48,11 @@ module Tagomatic
     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]
+      return @tags[base_tag].casecmp(@tags[again_tag]) == STRING_CASECMP_IS_EQUAL
     end
 
+    STRING_CASECMP_IS_EQUAL = 0
+
   end
 
 end

data/lib/tagomatic/known_formats.rb

@@ -5,8 +5,10 @@ module Tagomatic
     PREFIXES = [
             "%g/%a/%b-%y",
             "%g/%a/%b %Y",
+            "%g/%a/%b %y",
             "%g/%a/%y-%b",
             "%g/%a/%Y %b",
+            "%g/%a/%y %b",
             "%g/%a/%b",
             ]
 
@@ -17,6 +19,9 @@ module Tagomatic
             "(disc%d)/",
             "(disk%d)/",
             "(cd%d)/",
+            "-disc%d/",
+            "-disk%d/",
+            "-cd%d/",
             " disc%d/",
             " disk%d/",
             " cd%d/",

data/lib/tagomatic/main.rb

@@ -7,6 +7,7 @@ require 'tagomatic/options_parser'
 require 'tagomatic/scanner'
 require 'tagomatic/system_configuration'
 require 'tagomatic/tagger'
+require 'tagomatic/tags_processing_chain'
 
 module Tagomatic
 
@@ -20,10 +21,12 @@ 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 :tags_processor_factory => Tagomatic::ObjectFactory.new
+        register :tags_processor_chain => Tagomatic::TagsProcessingChain.new(get_options, get_tags_processor_factory, get_logger)
         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)
+        register :tagger => Tagomatic::Tagger.new(get_options, get_compiler, get_tags_processor_chain, get_mp3info, get_info_updater_factory, get_logger)
       end
 
       parser = configuration[:parser]

data/lib/tagomatic/object_factory.rb

@@ -1,6 +1,10 @@
 require 'tagomatic/format_matcher'
 require 'tagomatic/info_updater'
 require 'tagomatic/local_options_matcher'
+require 'tagomatic/tag_cleaner'
+require 'tagomatic/tag_normalizer'
+require 'tagomatic/tag_setter'
+require 'tagomatic/url_remover'
 
 module Tagomatic
 
@@ -18,6 +22,22 @@ module Tagomatic
       Tagomatic::InfoUpdater.new(*arguments)
     end
 
+    def create_url_remover(*arguments)
+      Tagomatic::UrlRemover.new(*arguments)
+    end
+
+    def create_tag_cleaner(*arguments)
+      Tagomatic::TagCleaner.new(*arguments)
+    end
+
+    def create_tag_normalizer(*arguments)
+      Tagomatic::TagNormalizer.new(*arguments)
+    end
+
+    def create_tag_setter(*arguments)
+      Tagomatic::TagSetter.new(*arguments)
+    end
+
   end
 
 end

data/lib/tagomatic/options.rb

@@ -13,6 +13,7 @@ module Tagomatic
       self[:guess] = false
       self[:list] = false
       self[:recurse] = false
+      self[:removeurls] = false
       self[:showtags] = false
       self[:underscores] = false
       self[:verbose] = false

data/lib/tagomatic/options_parser.rb

@@ -73,6 +73,9 @@ module Tagomatic
         opts.on("-r", "--[no-]recurse", "Scan for files recursively.") do |recurse|
           @options[:recurse] = recurse
         end
+        opts.on(      "--[no-]removeurls", "Remove URLs from file names.") do |removeurls|
+          @options[:removeurls] = removeurls
+        end
         opts.on("-u", "--[no-]underscores", "Replace underscores with spaces before processing a file name.") do |underscores|
           @options[:underscores] = underscores
         end

data/lib/tagomatic/tag_cleaner.rb

@@ -0,0 +1,25 @@
+module Tagomatic
+
+  class TagCleaner
+
+    def process(tags_hash)
+      artist = tags_hash['a']
+      artist = Regexp.compile("[ -]*#{Regexp.escape(artist)}[ -]*", Regexp::IGNORECASE) if artist
+
+      album = tags_hash['b']
+      album = album.sub(artist, '') if artist and album
+      tags_hash['b'] = album unless album.nil? or album.empty?
+
+      album = Regexp.compile("[ -]*#{Regexp.escape(album)}[ -]*", Regexp::IGNORECASE) if album
+
+      title = tags_hash['t']
+      title = title.sub(artist, '') if artist and title
+      title = title.sub(album, '') if album and title
+      tags_hash['t'] = title unless title.nil? or title.empty?
+
+      tags_hash
+    end
+
+  end
+
+end

data/lib/tagomatic/tag_normalizer.rb

@@ -0,0 +1,50 @@
+module Tagomatic
+
+  class TagNormalizer
+
+    def process(tags_hash)
+      normalized = Hash.new
+      tags_hash.each do |tag, value|
+        next unless value
+
+        split_by_spaces_and_underscores value
+        strip_dashes_and_brackets
+        drop_empty_words
+        capitalize_words
+
+        normalized[tag] = get_resulting_value
+      end
+      normalized
+    end
+
+    def split_by_spaces_and_underscores(value)
+      @parts = value.split(NORMALIZER_SPLIT_REGEX)
+    end
+
+    def strip_dashes_and_brackets
+      @parts.map! { |part| part.sub(NORMALIZER_STRIP_LEFT, '').sub(NORMALIZER_STRIP_RIGHT, '') }
+    end
+
+    def drop_empty_words
+      @parts = @parts.select { |part| not part.empty? }
+    end
+
+    def capitalize_words
+      @parts.map! { |part| part.capitalize }
+    end
+
+    def get_resulting_value
+      @parts.join(' ')
+    end
+
+    NORMALIZER_SPLIT_REGEX = /[ _-]+/
+
+    NORMALIZER_LEFT_LITERALS = Regexp.escape('-([.')
+    NORMALIZER_RIGHT_LITERALS = Regexp.escape('-)].')
+
+    NORMALIZER_STRIP_LEFT = /^[#{NORMALIZER_LEFT_LITERALS}]+\s*/
+    NORMALIZER_STRIP_RIGHT = /\s*[#{NORMALIZER_RIGHT_LITERALS}]+$/
+
+  end
+
+end

data/lib/tagomatic/tag_setter.rb

@@ -0,0 +1,22 @@
+module Tagomatic
+
+  class TagSetter
+
+    def initialize(options)
+      @options = options
+    end
+
+    def process(tags_hash)
+      tags_hash[:a] if @options[:artist]
+      tags_hash[:b] if @options[:album]
+      tags_hash[:d] if @options[:discnum]
+      tags_hash[:g] if @options[:genre]
+      tags_hash[:n] if @options[:tracknum]
+      tags_hash[:t] if @options[:title]
+      tags_hash[:y] if @options[:year]
+      tags_hash
+    end
+
+  end
+
+end

data/lib/tagomatic/tagger.rb

@@ -12,9 +12,10 @@ module Tagomatic
     include Tagomatic::Tags
     include Tagomatic::KnownFormats
 
-    def initialize(options, compiler, mp3info, info_updater_factory, logger)
+    def initialize(options, compiler, tags_processor_chain, mp3info, info_updater_factory, logger)
       @options = options
       @compiler = compiler
+      @tags_processor_chain = tags_processor_chain
       @mp3info = mp3info
       @info_updater_factory = info_updater_factory
       @logger = logger
@@ -26,9 +27,7 @@ module Tagomatic
       prepare_for_current_file(file_path)
       replace_underscores if @options[:underscores]
       apply_formats
-      clean_tags if @options[:cleantags]
-      normalize_tags
-      apply_forced_tags
+      run_processor_chain
       try_updating_mp3file
     end
 
@@ -100,46 +99,9 @@ module Tagomatic
       formats.map! { |f| f.is_a?(FormatMatcher) ? f : @compiler.compile_format(f) }
     end
 
-    def clean_tags
-      return if @tags.nil? or @tags.empty?
-
-      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
-      return if @tags.nil? or @tags.empty?
-
-      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
+    def run_processor_chain
       @tags ||= Hash.new
-      @tags[:album] if @options[:album]
-      @tags[:artist] if @options[:artist]
-      @tags[:discnum] if @options[:discnum]
-      @tags[:genre] if @options[:genre]
-      @tags[:title] if @options[:title]
-      @tags[:tracknum] if @options[:tracknum]
-      @tags[:year] if @options[:year]
+      @tags_processor_chain.process!(@tags)
     end
 
     def try_updating_mp3file

data/lib/tagomatic/tags.rb

@@ -31,9 +31,9 @@ module Tagomatic
     FORMAT_ID_SURROUNDED_YEAR = 'Y'
 
     FORMAT_REGEXP_ARTIST = '([^\/]+)'
-    FORMAT_REGEXP_ARTIST_AGAIN = FORMAT_REGEXP_ARTIST
+    FORMAT_REGEXP_ARTIST_AGAIN = '([^-\/]+)' # do not allow dashes - 'AGAIN' is used mostly in file name part
     FORMAT_REGEXP_ALBUM = '([^\/]+)'
-    FORMAT_REGEXP_ALBUM_AGAIN = FORMAT_REGEXP_ALBUM
+    FORMAT_REGEXP_ALBUM_AGAIN = '([^-\/]+)' # do not allow dashes - 'AGAIN' is used mostly in file name part
     FORMAT_REGEXP_DISC = '\s*([0-9]+)\s*'
     FORMAT_REGEXP_GENRE = '([^\/]+)'
     FORMAT_REGEXP_IGNORE = '([^\/]+)'
@@ -41,7 +41,7 @@ module Tagomatic
     FORMAT_REGEXP_TITLE = '([^\/]+)'
     FORMAT_REGEXP_WHITESPACE = '\s*'
     FORMAT_REGEXP_EXTENDED_WHITESPACE = '[\s\-_\.]*'
-    FORMAT_REGEXP_YEAR = '\s*([0-9]+)\s*'
+    FORMAT_REGEXP_YEAR = '\s*([0-9]{4})\s*'
     FORMAT_REGEXP_SURROUNDED_YEAR = '\s*[\(\[]([0-9]+)[\)\]]\s*'
 
   end

data/lib/tagomatic/tags_processing_chain.rb

@@ -0,0 +1,32 @@
+module Tagomatic
+
+  class TagsProcessingChain
+
+    def initialize(options, tags_processor_factory, logger)
+      @options = options
+      @tags_processor_factory = tags_processor_factory
+      @logger = logger
+    end
+
+    def process!(tags_hash)
+      return if tags_hash.nil? or tags_hash.empty?
+      chain = create_processor_chain
+      chain.each do |processor|
+        tags_hash.merge! processor.process(tags_hash)
+      end
+    end
+
+    protected
+
+    def create_processor_chain
+      chain = []
+      chain << @tags_processor_factory.create_url_remover if @options[:removeurls]
+      chain << @tags_processor_factory.create_tag_cleaner if @options[:cleantags]
+      chain << @tags_processor_factory.create_tag_normalizer
+      chain << @tags_processor_factory.create_tag_setter(@options)
+      chain
+    end
+
+  end
+
+end

data/lib/tagomatic/url_remover.rb

@@ -0,0 +1,16 @@
+module Tagomatic
+
+  class UrlRemover
+
+    def process(tags_hash)
+      result = {}
+      tags_hash.each do |tag,value|
+        next unless value
+        result[tag] = value.gsub(/www\.[^\.]+\.[a-z]{2,4}/, '').gsub(/ by [a-zA-Z0-9]+[\w ]/, '')
+      end
+      result
+    end
+
+  end
+
+end

data/test/data/sorted/Rock/Peter_Green/Peter_Green-Me_And_The_Devil-2001/album.dat

@@ -0,0 +1,22 @@
+01-I__m A Steady Rollin' Man.mp3
+02-From four Until late.mp3
+03-Dead Shrimp Blues.mp3
+04-Little Queen of Spades.mp3
+05-They  re Red Hot.mp3
+06-Preachin   The Blues.mp3
+07-Hellhound On My Trail.mp3
+08-Travelling Riversida Blues.mp3
+09-Malted Milk.mp3
+10-Milkcow  s Calf Blues.mp3
+11-Drunken Hearted Man.mp3
+12-Cross road Blues.mp3
+13-Come On Into My Kitchen.mp3
+14-When You Got A Good Friend.mp3
+15-32-20 Blues.mp3
+16-Phonograph Blues.mp3
+17-Last Fair Deal Gone Down.mp3
+18-Stop Breakin   Down Blues.mp3
+19-Terraplane Blues.mp3
+20-Walkin' Blues.mp3
+21-Love In Vain Blues.mp3
+22-Rambling On My Mind.mp3

data/test/helper.rb

@@ -4,7 +4,6 @@ require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'tagomatic'
 
 class Test::Unit::TestCase
 end

data/test/tagomatic/test_tag_normalizer.rb

@@ -0,0 +1,19 @@
+require 'helper'
+
+require 'tagomatic/tag_normalizer'
+
+class TestTagNormalizer < Test::Unit::TestCase
+  context "A TagNormalizer" do
+    setup do
+      @tag_normalizer = Tagomatic::TagNormalizer.new
+    end
+
+    should "do something" do
+      test_tags = {:a => 'the artist', :b => 'the album - ', :t => '. title track -  by lupo -'}
+      result = @tag_normalizer.process(test_tags)
+      assert_equal 'The Artist', result[:a]
+      assert_equal 'The Album', result[:b]
+      assert_equal 'Title Track By Lupo', result[:t]
+    end
+  end
+end

data/test/tagomatic/test_url_remover.rb

@@ -0,0 +1,19 @@
+require 'helper'
+
+require 'tagomatic/url_remover'
+
+class TestUrlRemover < Test::Unit::TestCase
+  context "A UrlRemover" do
+    setup do
+      @url_remover = Tagomatic::UrlRemover.new
+    end
+
+    should "remove URLs from tag values" do
+      test_tags = {:a => 'the artist', :b => 'the album - www.albumses.net', :t => 'title track - www.nowhere.org by lupo'}
+      result = @url_remover.process(test_tags)
+      assert_equal 'the artist', result[:a]
+      assert_equal 'the album - ', result[:b]
+      assert_equal 'title track - ', result[:t]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tagomatic
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Daniel Lukic
@@ -99,7 +99,6 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
-- .idea/.rakeTasks
 - .idea/ant.xml
 - .idea/compiler.xml
 - .idea/dictionaries/dl.xml
@@ -128,13 +127,20 @@ files:
 - lib/tagomatic/options_parser.rb
 - lib/tagomatic/scanner.rb
 - lib/tagomatic/system_configuration.rb
+- lib/tagomatic/tag_cleaner.rb
+- lib/tagomatic/tag_normalizer.rb
+- lib/tagomatic/tag_setter.rb
 - lib/tagomatic/tagger.rb
 - lib/tagomatic/tags.rb
+- lib/tagomatic/tags_processing_chain.rb
+- lib/tagomatic/url_remover.rb
 - lib/tasks/test_data.rb
 - test/data/mp3_template_file
 - test/data/sorted/80s/Peter_Schilling/1982 Fehler im System/album.dat
+- test/data/sorted/Rock/Peter_Green/Peter_Green-Me_And_The_Devil-2001/album.dat
 - test/helper.rb
-- test/test_tagomatic.rb
+- test/tagomatic/test_tag_normalizer.rb
+- test/tagomatic/test_url_remover.rb
 has_rdoc: true
 homepage: http://github.com/DanielLukic/tagomatic
 licenses: []
@@ -165,4 +171,5 @@ specification_version: 3
 summary: Simple command-line mp3 tagger based on mp3info gem. Supports folder-specific configuration files.
 test_files: 
 - test/helper.rb
-- test/test_tagomatic.rb
+- test/tagomatic/test_url_remover.rb
+- test/tagomatic/test_tag_normalizer.rb

data/.idea/.rakeTasks

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Settings><!--This file was automatically generated by Ruby plugin.
-You are allowed to: 
-1. Remove rake task
-2. Add existing rake tasks
-To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Remove rcov products for rcov" fullCmd="clobber_rcov" taksId="clobber_rcov" /><RakeTask description="Remove rdoc products" fullCmd="clobber_rdoc" taksId="clobber_rdoc" /><RakeTask description="Analyze code coverage with tests" fullCmd="rcov" taksId="rcov" /><RakeTask description="Build the rdoc HTML Files" fullCmd="rdoc" taksId="rdoc" /><RakeTask description="Force a rebuild of the RDOC files" fullCmd="rerdoc" taksId="rerdoc" /><RakeTask description="Run tests" fullCmd="test" taksId="test" /><RakeTask description="" fullCmd="clobber" taksId="clobber" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="rdoc/index.html" taksId="rdoc/index.html" /></RakeGroup></Settings>

data/test/test_tagomatic.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestTagomatic < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end