tagomatic 0.0.3 → 0.1.0

data/.gitignore

@@ -19,5 +19,8 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
-.idea/workspace.xml
-tagomatic.gemspec
+/.idea/workspace.xml
+/tagomatic.gemspec
+*.mp3
+*.jpg
+album.id

data/.idea/inspectionProfiles/profiles_settings.xml

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

data/Rakefile

@@ -52,3 +52,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
+Dir['lib/tasks/*.rb'].each {|t| load t}

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/lib/monkey/string.rb

@@ -2,9 +2,12 @@ class String
 
   def starts_with?(prefix)
     pattern = Regexp.new "^#{Regexp.escape(prefix)}"
-    ( pattern =~ self ) == MATCHED_AT_CHAR_POSITION_ZERO
+    not ( pattern =~ self ).nil?
   end
 
-  MATCHED_AT_CHAR_POSITION_ZERO = 0
+  def ends_with?(suffix)
+    pattern = Regexp.new "#{Regexp.escape(suffix)}$"
+    not ( pattern =~ self ).nil?
+  end
 
 end

data/lib/tagomatic/options.rb

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

data/lib/tagomatic/options_parser.rb

@@ -71,6 +71,9 @@ module Tagomatic
         opts.on("-w", "--showtags", "Show the resulting tags.") do |showtags|
           @options[:showtags] = showtags
         end
+        opts.on("-u", "--underscores", "Replace underscores with spaces before processing a file name.") do |underscores|
+          @options[:underscores] = underscores
+        end
 
         opts.separator ""
         opts.separator "Common options:"

data/lib/tagomatic/scanner.rb

@@ -33,10 +33,13 @@ module Tagomatic
     end
 
     def enter_scannable_folder(&block)
+      folder_path = @file_path
+      @logger.verbose "entering #{folder_path}"
       save_current_options
       apply_local_options if has_local_options?
-      do_scan_folder(@file_path, &block)
+      do_scan_folder(folder_path, &block)
       pop_local_options
+      @logger.verbose "leaving #{folder_path}"
     end
 
     def save_current_options
@@ -55,6 +58,7 @@ module Tagomatic
 
     def apply_local_options
       local_options = read_local_options
+      @logger.verbose "applying local options: #{local_options}"
       @parser.parse!(local_options)
     end
 
@@ -71,7 +75,7 @@ module Tagomatic
 
     def do_scan_folder(folder_path, &block)
       @logger.verbose "scanning #{folder_path}"
-      entries = Dir.entries(folder_path)
+      entries = Dir.entries(folder_path).sort
 
       local_formats = entries.select { |entry| entry.starts_with?('.format=') }
       apply_local_formats(local_formats)
@@ -83,6 +87,7 @@ module Tagomatic
     end
 
     def apply_local_formats(list_of_local_format_file_names)
+      @logger.verbose "applying local formats: #{list_of_local_format_file_names}"
       local_formats = list_of_local_format_file_names.map do |file_name|
         format = file_name.sub('.format=', '')
         format.gsub!('|', '/')

data/lib/tagomatic/tagger.rb

@@ -14,25 +14,24 @@ module Tagomatic
     FORMAT_ID_YEAR = 'y'
 
     KNOWN_FORMATS = [
-            "%g/%a/%y %b/%n_-_%t.mp3",
-            "%g/%a/%y %b/%n_%t.mp3",
-            "%g/%a/%y %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)/%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/%a_%b_%y/%n_%t.mp3",
-            "%g/%a/%b [%y]/%n - %t.mp3",
-            "%g/%a/%b/%a - %n - %t.mp3",
             "%g/%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/%a- %b/%n %t.mp3",
-            "%g/%a/%b/%a - %t.mp3",
-            "%g/%a/(%y) %b/%n - %t.mp3",
-            "%g/%a/%y %b/%n - %t.mp3",
-            "%a/%b/%n - %t.mp3",
-            "%a - %y - %b/%n - %t.mp3",
-            "%a - %b/%n - %t.mp3",
+            "%g/%a/%b/%n-%t.mp3",
+
+            "%a - %n - %t.mp3",
+            "%n - %a - %t.mp3",
     ]
 
     def initialize(options, compiler, mp3info, info_updater_factory, logger)
@@ -44,6 +43,8 @@ module Tagomatic
     end
 
     def process!(file_path)
+      file_path.gsub '_', ' ' if @options[:underscores]
+
       @logger.verbose "tagging #{file_path}"
 
       prepare_for_current_file(file_path)
@@ -70,11 +71,11 @@ module Tagomatic
 
     def apply_custom_formats
       @tags = guess_tags_using(@options[:formats])
-      show_error("no custom format matched #{@file_path}") unless @tags
+      show_error("no custom format matched #{@file_path} using #{@options[:formats]}") unless @tags
     end
 
     def show_error(message, optional_exception = nil)
-      @logger.error("failed updating #{@file_path}", optional_exception)
+      @logger.error(message, optional_exception)
       exit 10 if @options[:errorstops]
     end
 
@@ -118,7 +119,7 @@ module Tagomatic
     def try_updating_mp3file
       update_mp3file
     rescue
-      show_error "failed updating #{@file_path}", $1
+      show_error "failed updating #{@file_path}", $!
     end
 
     def update_mp3file

data/lib/tasks/test_data.rb

@@ -0,0 +1,40 @@
+require 'monkey/string'
+
+namespace :test do
+
+  desc 'Create the test data mp3 files from their album.dat files.'
+  task :data do
+    Dir.glob('test/data/**/album.dat') do |album_dat_file_path|
+      puts "auto-generating album files for #{album_dat_file_path}"
+      album_folder = File.dirname(album_dat_file_path)
+      album_file_list = File.readlines(album_dat_file_path).map {|l| l.chomp}
+      album_file_list.each do |file_name|
+        puts "auto-generating album file #{file_name}"
+        file_name = file_name.chomp
+        file_path = File.join(album_folder, file_name)
+        create_fake_file file_path
+      end
+    end
+  end
+
+  def create_fake_file(file_path)
+    if is_mp3_file?(file_path)
+      create_mp3_fake_file file_path
+    else
+      create_empty_fake_file file_path
+    end
+  end
+
+  def is_mp3_file?(file_path)
+    file_path.ends_with?('.mp3')
+  end
+
+  def create_empty_fake_file(file_path)
+    system %Q[touch "#{file_path}"]
+  end
+
+  def create_mp3_fake_file(file_path)
+    system %Q[cp test/data/mp3_template_file "#{file_path}"]
+  end
+
+end

data/test/data/sorted/80s/Peter_Schilling/1982 Fehler im System/album.dat

@@ -0,0 +1,11 @@
+album.id
+Fehler Im System.jpg
+Peter Schilling - 01 - ...Dann truegt der Schein.mp3
+Peter Schilling - 02 - Fast alles konstruiert.mp3
+Peter Schilling - 03 - Die Wueste lebt.mp3
+Peter Schilling - 04 - Fehler im System.mp3
+Peter Schilling - 05 - Major Tom (Voellig losgeloest).mp3
+Peter Schilling - 06 - Major Tom.mp3
+Peter Schilling - 07 - U.S.A..mp3
+Peter Schilling - 08 - Ich hab keine Lust.mp3
+Peter Schilling - 09 - Stille Nacht, heilige Nacht.mp3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tagomatic
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Daniel Lukic
@@ -104,8 +104,9 @@ files:
 - lib/tagomatic/scanner.rb
 - lib/tagomatic/system_configuration.rb
 - lib/tagomatic/tagger.rb
-- test/data/sorted/80s/Peter_Schilling/Fast_alles_konstruiert/01-Fast_alles_konstruiert.mp3
-- test/data/sorted/80s/Peter_Schilling/Fast_alles_konstruiert/02-Dann_truegt_der_schein.mp3
+- lib/tasks/test_data.rb
+- test/data/mp3_template_file
+- test/data/sorted/80s/Peter_Schilling/1982 Fehler im System/album.dat
 - test/helper.rb
 - test/test_tagomatic.rb
 has_rdoc: true