scene-toolkit 0.2.4 → 0.2.5

data/lib/scene_toolkit/cli/{rename.rb → auto_rename.rb}

@@ -6,33 +6,36 @@ require 'scene_toolkit/ext'
 module SceneToolkit
   class CLI < Optitron::CLI
     class GoogleMatcher
-      def self.match(release)
-        regex = Regexp.new(Regexp.escape(release.name), Regexp::IGNORECASE)
-        response = Nestful.get("http://www.google.com/search", :params => { :q => release.name, :num => 100 })
+      def self.match(name)
+        regex = Regexp.new(Regexp.escape(name), Regexp::IGNORECASE)
+        response = Nestful.get("http://www.google.com/search", :params => { :q => name, :num => 100 })
         response.scan(regex).uniq.reject(&:downcase?)
       end
     end
 
-    class OrlydbMatcher
-      def self.match(release)
-        regex = Regexp.new(Regexp.escape(release.name), Regexp::IGNORECASE)
-        response = Nestful.get("http://orlydb.com", :params => { :q => release.search_string })
+    class OrlyDbMatcher
+      def self.match(name)
+        regex = Regexp.new(Regexp.escape(name), Regexp::IGNORECASE)
+        response = Nestful.get("http://orlydb.com", :params => { :q => name.to_search_string })
         response.scan(regex).uniq.reject(&:downcase?)
       end
     end
 
     desc "Repair release names"
 
-    def rename(directory_string)
+    def auto_rename(directory_string)
       each_release(directory_string) do |release|
-        unless release.name.downcase?
-          heading(release, :green) { info "Skipping. Release name seems to be OK." }
-          next
+        next if release.valid_name? and not release.name.downcase?
+
+        if release.valid_name?
+          release_name = release.name
+        else
+          release_name = release.heuristic_name
         end
 
         match = nil
-        [OrlydbMatcher, GoogleMatcher].each do |matcher|
-          matches = matcher.match(release)
+        [OrlyDbMatcher, GoogleMatcher].each do |matcher|
+          matches = matcher.match(release_name)
           if matches.one?
             match = matches.first
             break

data/lib/scene_toolkit/cli/helpers.rb

@@ -60,7 +60,7 @@ module SceneToolkit
 
       releases = []
 
-      Dir.glob(File.join(source, "**", "*.mp3")).each do |file|
+      Dir.glob(File.join(Regexp.escape(source), "**", "*.mp3")).each do |file|
         release_path = File.expand_path(File.dirname(file))
 
         unless releases.include?(release_path)

data/lib/scene_toolkit/cli/verify.rb

@@ -6,9 +6,10 @@ module SceneToolkit
   class CLI < Optitron::CLI
     desc "Verify library or release. Executes all validations if none specified"
     SceneToolkit::Release.available_validations.each { |name, desc| opt name, desc }
-    opt "hide_valid", "Do not display valid releases"
-    opt "move_invalid_to", "Move INVALID releases to specified folder", :type => :string
-    opt "move_valid_to", "Move VALID releases to specified folder", :type => :string
+    opt "hide-valid", "Do not display valid releases results"
+    opt "ignore-filename-case", "Ignore case when validating SFV/M3U filenames"
+    opt "move-invalid-to", "Move INVALID releases to specified folder", :type => :string
+    opt "move-valid-to", "Move VALID releases to specified folder", :type => :string
 
     def verify(directory_string)
       validations_to_exec = []
@@ -20,12 +21,12 @@ module SceneToolkit
         validations_to_exec = SceneToolkit::Release::available_validations.keys
       end
 
-      invalid_target_directory = params.delete("move_invalid_to")
+      invalid_target_directory = params.delete("move-invalid-to")
       unless invalid_target_directory.nil?
         raise ArgumentError.new("#{invalid_target_directory} does not exist") unless File.directory?(invalid_target_directory)
       end
 
-      valid_target_directory = params.delete("move_valid_to")
+      valid_target_directory = params.delete("move-valid-to")
       unless valid_target_directory.nil?
         raise ArgumentError.new("#{invalid_target_directory} does not exist") unless File.directory?(valid_target_directory)
       end
@@ -36,9 +37,9 @@ module SceneToolkit
 
       each_release(directory_string) do |release|
         release_count += 1
-        if release.valid?(validations_to_exec)
+        if release.valid?(validations_to_exec, :case_sensitive => !params["ignore-filename-case"])
           valid_releases += 1
-          if not params["hide_valid"] or not valid_target_directory.nil?
+          if not params["hide-valid"] or not valid_target_directory.nil?
             heading(release, :green) do
               print_errors(release)
               print_warnings(release)

data/lib/scene_toolkit/cli.rb

@@ -6,7 +6,7 @@ require 'colored'
 require 'scene_toolkit/release'
 require 'scene_toolkit/cli/helpers'
 require 'scene_toolkit/cli/playlists'
-require 'scene_toolkit/cli/rename'
+require 'scene_toolkit/cli/auto_rename'
 require 'scene_toolkit/cli/verify'
 
 module SceneToolkit

data/lib/scene_toolkit/ext.rb

@@ -2,4 +2,8 @@ class String
   def downcase?
     self == self.downcase
   end
+
+  def to_search_string
+    self.gsub(/[^A-Za-z0-9]+/, " ").gsub(/\s+/, " ")
+  end
 end

data/lib/scene_toolkit/release/{rename.rb → auto_rename.rb}

@@ -2,16 +2,12 @@ require 'active_support/concern'
 
 module SceneToolkit
   class Release
-    module Rename
+    module AutoRename
       extend ActiveSupport::Concern
 
       def rename!(new_name)
         File.rename(@path, File.join(File.dirname(@path), new_name))
       end
-
-      def search_string
-        @name.gsub(/[^A-Za-z0-9]+/, " ").gsub(/\s+/, " ")
-      end
     end
   end
 end

data/lib/scene_toolkit/release/helpers.rb

@@ -5,6 +5,10 @@ module SceneToolkit
     module Helpers
       extend ActiveSupport::Concern
 
+      def files
+        Dir.glob(File.join(Regexp.escape(@path), "*"))
+      end
+
       included do
         has_files_with_extension :mp3, :sfv, :nfo, :m3u
       end

data/lib/scene_toolkit/release/validations/checksum.rb

@@ -8,7 +8,7 @@ module SceneToolkit
           base.register_validation(:checksum, "Validate release CRC-32 checksum")
         end
 
-        def valid_checksum?
+        def valid_checksum?(params = {})
           @errors[:checksum], @warnings[:checksum] = [], []
           if sfv_files.any?
             sfv_files.each do |sfv|
@@ -44,6 +44,7 @@ module SceneToolkit
               matched_something = true
               filename, checksum = match.captures
               filename.strip!
+              next if filename.blank? or filename.start_with?("#") or filename.start_with?(";")
               filename.downcase!
 
               if files_to_check.has_key?(filename)

data/lib/scene_toolkit/release/validations/files.rb

@@ -0,0 +1,23 @@
+module SceneToolkit
+  class Release
+    module Validations
+      module Files
+        REQUIRED_FILES = [:sfv, :nfo, :m3u]
+
+        def self.included(base)
+          base.register_validation(:files, "Validate inclusion of required files")
+        end
+
+        def valid_files?(params = {})
+          @errors[:files], @warnings[:files] = [], []
+          REQUIRED_FILES.each do |ext|
+            file_count = send("#{ext}_files")
+            @errors[:files] << "No *.#{ext} files found." if file_count.none?
+            @warnings[:files] << "Multiple *.#{ext} files found." if file_count.size > 1
+          end
+          @warnings[:files].empty?
+        end
+      end
+    end
+  end
+end

data/lib/scene_toolkit/release/validations/name.rb

@@ -2,14 +2,16 @@ module SceneToolkit
   class Release
     module Validations
       module Name
+        REGEXP = /^([A-Z0-9\-_.()&]+)\-(\d{4}|\d{3}x|\d{2}xx)\-([A-Z0-9_]+)$/i
+
         def self.included(base)
           base.register_validation(:name, "Validate release name")
         end
 
-        def valid_name?
+        def valid_name?(params = {})
           @errors[:name], @warnings[:name] = [], []
 
-          @errors[:name] << "Release name is not a valid scene release name" unless @name =~ /^([A-Z0-9\-_.()&]+)\-(\d{4}|\d{3}x|\d{2}xx)\-([A-Z0-9_]+)$/i
+          @errors[:name] << "Release name is not a valid scene release name" unless @name =~ REGEXP
           @errors[:name] << "Release name is lowercased" if @name.eql?(@name.downcase)
           @errors[:name] << "Release name is uppercased" if @name.eql?(@name.upcase)
           @errors[:name].empty?

data/lib/scene_toolkit/release/validations/playlist.rb

@@ -6,12 +6,12 @@ module SceneToolkit
           base.register_validation(:playlist, "Validate playlist against existing files")
         end
 
-        def valid_playlist?
+        def valid_playlist?(params = {})
           @errors[:playlist], @warnings[:playlist] = [], []
           if m3u_files.any?
             m3u_files.each do |playlist|
               begin
-                validate_playlist(playlist)
+                validate_playlist(playlist, params[:case_sensitive])
               rescue => e
                 @errors[:playlist] << e.message
               end
@@ -25,13 +25,21 @@ module SceneToolkit
 
         protected
 
-        def validate_playlist(playlist)
+        def validate_playlist(playlist, case_sensitive = true)
           File.read(playlist, :mode => "rb").split(/[\r\n]+/).each do |filename|
             filename.strip!
             next if filename.blank? or filename.start_with?("#") or filename.start_with?(";")
-            @errors[:playlist] << "File #{filename} not found" unless File.exist?(File.join(@path, filename))
+            if case_sensitive
+              file_not_found(filename) unless File.exist?(File.join(@path, filename))
+            else
+              file_not_found(filename) unless files.select { |file| file.downcase == File.join(@path, filename).downcase }.any?
+            end
           end
         end
+
+        def file_not_found(filename)
+          @errors[:playlist] << "File #{filename} not found"
+        end
       end
     end
   end

data/lib/scene_toolkit/release/validations.rb

@@ -6,10 +6,10 @@ module SceneToolkit
     module Validations
       extend ActiveSupport::Concern
 
-      def valid?(validations_to_exec = @available_validations)
+      def valid?(validations_to_exec = @available_validations, params = { })
         @errors, @warnings = { }, { }
         validations_to_exec.each do |name|
-          send("valid_#{name}?")
+          send("valid_#{name}?", params)
         end
         @errors.values.sum { |errors| errors.size }.zero?
       end

data/lib/scene_toolkit/release.rb

@@ -1,10 +1,10 @@
 require 'scene_toolkit/release/helpers'
-require 'scene_toolkit/release/rename'
+require 'scene_toolkit/release/auto_rename'
 require 'scene_toolkit/release/validations'
 require 'scene_toolkit/release/validations/checksum'
 require 'scene_toolkit/release/validations/name'
 require 'scene_toolkit/release/validations/playlist'
-require 'scene_toolkit/release/validations/required_files'
+require 'scene_toolkit/release/validations/files'
 
 module SceneToolkit
   class Release
@@ -12,13 +12,13 @@ module SceneToolkit
     attr_accessor :errors, :warnings
 
     include Validations
-    include Rename
+    include AutoRename
     include Helpers
 
     include Validations::Checksum
     include Validations::Name
     include Validations::Playlist
-    include Validations::RequiredFiles
+    include Validations::Files
 
     def initialize(path)
       @path = File.expand_path(path)
@@ -26,8 +26,9 @@ module SceneToolkit
       @errors, @warnings = { }, { }
     end
 
-    def files
-      Dir.glob(File.join(@path, "*"))
+    def heuristic_name
+      candidates = (m3u_files + nfo_files + sfv_files).map { |f| File.basename(f, ".*") }
+      candidates.group_by { |name| name }.max { |a, b| a.last.size <=> b.last.size }.first.gsub(/^\d+[-_]/, "")
     end
   end
 end

data/lib/scene_toolkit.rb

@@ -1,3 +1,3 @@
 module SceneToolkit
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scene-toolkit
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-09 00:00:00.000000000 +02:00
+date: 2011-07-11 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153745240 !ruby/object:Gem::Requirement
+  requirement: &2155260360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153745240
+  version_requirements: *2155260360
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153744820 !ruby/object:Gem::Requirement
+  requirement: &2155259940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153744820
+  version_requirements: *2155259940
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &2153744360 !ruby/object:Gem::Requirement
+  requirement: &2155259480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153744360
+  version_requirements: *2155259480
 - !ruby/object:Gem::Dependency
   name: optitron
-  requirement: &2153743940 !ruby/object:Gem::Requirement
+  requirement: &2155259060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153743940
+  version_requirements: *2155259060
 - !ruby/object:Gem::Dependency
   name: nestful
-  requirement: &2153743520 !ruby/object:Gem::Requirement
+  requirement: &2155258640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153743520
+  version_requirements: *2155258640
 description: Tool to assist scene MP3 library maintenance
 email:
 - knoopx@gmail.com
@@ -85,19 +85,19 @@ files:
 - bin/scene-toolkit
 - lib/scene_toolkit.rb
 - lib/scene_toolkit/cli.rb
+- lib/scene_toolkit/cli/auto_rename.rb
 - lib/scene_toolkit/cli/helpers.rb
 - lib/scene_toolkit/cli/playlists.rb
-- lib/scene_toolkit/cli/rename.rb
 - lib/scene_toolkit/cli/verify.rb
 - lib/scene_toolkit/ext.rb
 - lib/scene_toolkit/release.rb
+- lib/scene_toolkit/release/auto_rename.rb
 - lib/scene_toolkit/release/helpers.rb
-- lib/scene_toolkit/release/rename.rb
 - lib/scene_toolkit/release/validations.rb
 - lib/scene_toolkit/release/validations/checksum.rb
+- lib/scene_toolkit/release/validations/files.rb
 - lib/scene_toolkit/release/validations/name.rb
 - lib/scene_toolkit/release/validations/playlist.rb
-- lib/scene_toolkit/release/validations/required_files.rb
 - scene-toolkit.gemspec
 has_rdoc: true
 homepage: http://github.com/knoopx/scene-toolkit

data/lib/scene_toolkit/release/validations/required_files.rb

@@ -1,23 +0,0 @@
-module SceneToolkit
-  class Release
-    module Validations
-      module RequiredFiles
-        REQUIRED_FILES = [:sfv, :nfo, :m3u]
-
-        def self.included(base)
-          base.register_validation(:required_files, "Validate inclusion of required files")
-        end
-
-        def valid_required_files?
-          @errors[:required_files], @warnings[:required_files] = [], []
-          REQUIRED_FILES.each do |ext|
-            file_count = send("#{ext}_files")
-            @errors[:required_files] << "No *.#{ext} files found." if file_count.none?
-            @warnings[:required_files] << "Multiple *.#{ext} files found." if file_count.size > 1
-          end
-          @warnings[:required_files].empty?
-        end
-      end
-    end
-  end
-end