scene-toolkit 0.2.6 → 0.3.0

data/Gemfile.lock

@@ -1,24 +1,27 @@
 PATH
   remote: .
   specs:
-    scene-toolkit (0.2.4)
-      activesupport (~> 3.0.0)
+    scene-toolkit (0.2.6)
+      active_support (>= 3.0.0)
       colored
       i18n
       nestful
+      nokogiri
       optitron
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.9)
-    callsite (0.0.5)
-      bundler (~> 1.0.0)
+    active_support (3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
+    callsite (0.0.11)
     colored (1.2)
     i18n (0.6.0)
-    nestful (0.0.6)
+    nestful (0.0.8)
       activesupport (>= 3.0.0.beta)
-    optitron (0.3.2)
+    nokogiri (1.5.0)
+    optitron (0.3.3)
       callsite (~> 0.0.4)
       parameters_extra (~> 0.2.0)
     parameters_extra (0.2.0)
@@ -28,9 +31,9 @@ GEM
     ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.0.6)
+    ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.5)
+    sexp_processor (3.0.10)
 
 PLATFORMS
   ruby

data/bin/scene-toolkit

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -rubygems
 
-require "bundler/setup"
+$: << File.expand_path("../../lib", __FILE__)
 require 'scene_toolkit/cli'
 
 SceneToolkit::CLI.dispatch

data/lib/scene_toolkit/cli/auto_rename.rb

@@ -1,23 +1,26 @@
 # encoding: utf-8
 
 require 'nestful'
+require 'nokogiri'
 require 'scene_toolkit/ext'
 
 module SceneToolkit
   class CLI < Optitron::CLI
     class GoogleMatcher
       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
+        response = Nestful.get("http://www.google.com/search", :params => {:q => name, :num => 100})
+        response = Nokogiri::HTML(response).search(".g").text.encode("utf-8", "utf-8", :invalid => :replace)
 
-    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?)
+        if name =~ /[\d+]$/ # artist-ablum-2012
+          regex = /#{Regexp.escape(name)}(?:-[A-Za-z0-9]+)*/i
+          matches = response.scan(regex).reject(&:downcase?).reject { |m| m.size == name.size }.uniq
+
+        else # artist-ablum-2012-group
+          regex = /#{Regexp.escape(name)}/i
+          matches = response.scan(regex).reject(&:downcase?).select { |m| m.size == name.size }.uniq
+        end
+
+        matches.reject { |m| m == name }.select { |m| m =~ Release::Validations::Name::REGEXP }
       end
     end
 
@@ -36,7 +39,8 @@ module SceneToolkit
         next if release_name.blank?
 
         match = nil
-        [OrlyDbMatcher, GoogleMatcher].each do |matcher|
+        matches = []
+        [GoogleMatcher].each do |matcher|
           matches = matcher.match(release_name)
           if matches.one?
             match = matches.first
@@ -47,8 +51,10 @@ module SceneToolkit
         if match.present?
           heading(release, :green) { info "Renamed #{release.name} => #{match}" }
           release.rename!(match)
+        elsif matches.any?
+          heading(release, :red) { error (["Multiple matches found for #{release_name}:"] + matches).join("\r\n    * ") }
         else
-          heading(release, :red) { error "No matches found for #{release.name}" }
+          heading(release, :red) { error "No matches found for #{release_name}" }
         end
       end
     end

data/lib/scene_toolkit/cli/helpers.rb

@@ -26,18 +26,14 @@ module SceneToolkit
     end
 
     def print_errors(release)
-      release.errors.each do |validation, errors|
-        errors.each do |error|
-          warn "[#{validation.to_s.humanize}] #{error}"
-        end
+      release.errors.uniq.each do |message|
+        error(message)
       end
     end
 
     def print_warnings(release)
-      release.warnings.each do |validation, warnings|
-        warnings.each do |warning|
-          warn "[#{validation.to_s.humanize}] #{warning}"
-        end
+      release.warnings.each do |message|
+        warn(message)
       end
     end
 

data/lib/scene_toolkit/cli/playlists.rb

@@ -15,15 +15,9 @@ module SceneToolkit
           heading(release, :green) do
             print_errors(release)
 
-            candidates = release.files.select { |f| %w(.nfo .m3u .sfv).include?(File.extname(f).downcase) }.group_by { |f| File.basename(f, '.*') }
-            if candidates.none?
-              error "Unable to guess playlist filename"
-              next
-            end
-
-            playlist_filename = [candidates.max { |k, v| v.size }.first, ".m3u"].join
-
+            playlist_filename = release.heuristic_filename("m3u")
             playlist_path = File.join(release.path, playlist_filename)
+
             if File.exist?(playlist_path) and not params["force"]
               error "Playlist #{playlist_filename} already exists. Use --force to replace it."
             else

data/lib/scene_toolkit/cli/verify.rb

@@ -10,25 +10,26 @@ module SceneToolkit
     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
+    opt "repository", "Directory to look up in order to resolve missing files", :type => :string
 
     def verify(directory_string)
       validations_to_exec = []
-      SceneToolkit::Release.available_validations.keys.each do |name|
+      SceneToolkit::Release.available_validations.each do |name|
         validations_to_exec << name if params.delete(name).eql?(true)
       end
 
       if validations_to_exec.none?
-        validations_to_exec = SceneToolkit::Release::available_validations.keys
+        validations_to_exec = SceneToolkit::Release::available_validations
       end
 
       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)
+        raise ArgumentError.new("#{invalid_target_directory.inspect} does not exist") unless File.directory?(invalid_target_directory)
       end
 
       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)
+        raise ArgumentError.new("#{valid_target_directory.inspect} does not exist") unless File.directory?(valid_target_directory)
       end
 
       release_count = 0
@@ -37,7 +38,7 @@ module SceneToolkit
 
       each_release(directory_string) do |release|
         release_count += 1
-        if release.valid?(validations_to_exec, :case_sensitive => !params["ignore-filename-case"])
+        if release.valid?(validations_to_exec, params)
           valid_releases += 1
           if not params["hide-valid"] or not valid_target_directory.nil?
             heading(release, :green) do

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

@@ -9,54 +9,63 @@ module SceneToolkit
         end
 
         def valid_checksum?(params = {})
-          @errors[:checksum], @warnings[:checksum] = [], []
+          recover_file!(self.heuristic_filename("sfv"), params["repository"]) if params["repository"] and sfv_files.none?
+
           if sfv_files.any?
             sfv_files.each do |sfv|
               begin
-                validate_checksum(sfv)
+                validate_checksum(sfv, params)
               rescue => e
-                @errors[:checksum] << e.message
+                @errors << e.message
               end
             end
           else
-            @errors[:checksum] << "No *.sfv files found"
+            file_not_found!(self.heuristic_filename("sfv"))
           end
-          @errors[:checksum].empty?
+
+          @errors.none?
         end
 
         protected
 
-        def validate_checksum(sfv)
-          files_to_check = files.inject({ }) do |collection, file|
+        def validate_checksum(sfv, params)
+          filenames = files.each_with_object({}) do |file, collection|
             collection[File.basename(file).downcase] = File.expand_path(file)
-            collection
           end
 
-          matched_something = false
+          filename_match = false
           File.read(sfv, :mode => "rb").split(/[\r\n]+/).each do |line|
             line.strip!
 
             if (/(generated|raped)/i =~ line and not /MorGoTH/i =~ line)
-              @warnings[:checksum] << "Possibly tampered SFV: #{line.strip}"
+              @warnings << "Possibly tampered SFV: #{line.strip}"
             end
 
             if match = /^(.+?)\s+([\dA-Fa-f]{8})$/.match(line)
-              matched_something = true
+              filename_match = 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)
-                unless Zlib.crc32(File.read(files_to_check[filename])).eql?(checksum.hex)
-                  @errors[:checksum] << "File #{filename} is corrupted"
+              if params["repository"] and not filenames.has_key?(filename)
+                recover_file!(filename, params["repository"])
+                filenames = files.each_with_object({}) do |file, collection|
+                  collection[File.basename(file).downcase] = File.expand_path(file)
+                end
+              end
+
+              if filenames.has_key?(filename)
+                unless Zlib.crc32(File.read(filenames[filename])).eql?(checksum.hex)
+                  recover_file!(File.basename(filenames[filename]), params["repository"], false) if params["repository"]
+                  unless Zlib.crc32(File.read(filenames[filename])).eql?(checksum.hex)
+                    @errors << "File #{filename.inspect} is corrupted. (#{filename.to_search_string})"
+                  end
                 end
-              else
-                @errors[:checksum] << "File #{filename} not found"
               end
             end
           end
-          @warnings[:checksum] << "No files to verify found" unless matched_something
+          @errors << "No files to verify found" unless filename_match
         end
       end
     end

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

@@ -2,20 +2,25 @@ module SceneToolkit
   class Release
     module Validations
       module Files
-        REQUIRED_FILES = [:sfv, :nfo, :m3u]
+        REQUIRED_FILES_EXT = [: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
+          REQUIRED_FILES_EXT.each do |ext|
+            if params["repository"] and not File.exists?(File.join(self.path, self.heuristic_filename(ext)))
+              recover_file!(self.heuristic_filename(ext), params["repository"])
+            end
+
+            required_files = send("#{ext}_files")
+
+            file_not_found!(self.heuristic_filename(ext)) if required_files.none?
+
+            @warnings << "Multiple *.#{ext} files found." if required_files.size > 1
           end
-          @warnings[:files].empty?
+          @errors.none?
         end
       end
     end

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

@@ -2,19 +2,17 @@ module SceneToolkit
   class Release
     module Validations
       module Name
-        REGEXP = /^([A-Z0-9\-_.()&]+)\-(\d{4}|\d{3}x|\d{2}xx)\-([A-Z0-9_]+)$/i
+        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?(params = {})
-          @errors[:name], @warnings[:name] = [], []
+          @errors << "#{@name.inspect} is not a valid scene release name" unless @name =~ REGEXP
+          @errors << "#{@name.inspect} is lowercased" if @name.eql?(@name.downcase)
 
-          @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?
+          @errors.none?
         end
       end
     end

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

@@ -7,21 +7,22 @@ module SceneToolkit
         end
 
         def valid_playlist?(params = {})
-          @errors[:playlist], @warnings[:playlist] = [], []
+          recover_file!(self.heuristic_filename("m3u"), params["repository"]) if params["repository"] and m3u_files.none?
+
           if m3u_files.any?
             m3u_files.each do |playlist|
               begin
-                validate_playlist(playlist, params[:case_sensitive])
+                validate_playlist(playlist, params["case-sensitive"])
               rescue => e
-                @errors[:playlist] << e.message
+                @errors << e.message
               end
             end
           else
-            @errors[:playlist] << "No *.m3u files found"
+            file_not_found!(self.heuristic_filename("m3u"))
           end
-          @errors[:playlist].empty?
-        end
 
+          @errors.none?
+        end
 
         protected
 
@@ -30,16 +31,12 @@ module SceneToolkit
             filename.strip!
             next if filename.blank? or filename.start_with?("#") or filename.start_with?(";")
             if case_sensitive
-              file_not_found(filename) unless File.exist?(File.join(@path, filename))
+              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?
+              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

@@ -1,25 +1,48 @@
-require 'active_support/concern'
-require "active_support/core_ext/class/attribute_accessors"
+require 'active_support/all'
 
 module SceneToolkit
   class Release
     module Validations
       extend ActiveSupport::Concern
 
-      def valid?(validations_to_exec = @available_validations, params = { })
-        @errors, @warnings = { }, { }
+      def valid?(validations_to_exec = @available_validations, params = {})
         validations_to_exec.each do |name|
           send("valid_#{name}?", params)
         end
-        @errors.values.sum { |errors| errors.size }.zero?
+        @errors.none?
+      end
+
+      protected
+
+      def recover_file!(filename, repository, warn = true)
+        if repository_file = lookup_file(filename, repository)
+          target_file = File.join(self.path, filename)
+
+          unless File.expand_path(target_file) == File.expand_path(repository_file)
+            @warnings << " * File #{filename.inspect} recovered from #{File.dirname(repository_file).inspect}"
+
+            File.delete(target_file) if File.exists?(target_file)
+            FileUtils.mv(repository_file, target_file)
+          end
+        else
+          file_not_found!(filename)
+        end
+      end
+
+      def lookup_file(filename, repository)
+        Dir.glob(File.join(Shellwords.shellescape(repository), "**", Shellwords.shellescape(filename))).first
+      end
+
+      def file_not_found!(filename)
+        @errors << "File #{filename.inspect} not found. (#{filename.to_search_string})"
       end
 
       included do
         cattr_accessor :available_validations
-        @@available_validations = { }
+        @@available_validations = []
 
         def self.register_validation(name, description)
-          @@available_validations[name] = description
+          @@available_validations << name
         end
       end
     end

data/lib/scene_toolkit/release.rb

@@ -1,10 +1,10 @@
 require 'scene_toolkit/release/helpers'
 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/files'
+require 'scene_toolkit/release/validations/playlist'
+require 'scene_toolkit/release/validations/checksum'
 
 module SceneToolkit
   class Release
@@ -15,23 +15,38 @@ module SceneToolkit
     include AutoRename
     include Helpers
 
-    include Validations::Checksum
     include Validations::Name
-    include Validations::Playlist
     include Validations::Files
+    include Validations::Playlist
+    include Validations::Checksum
 
     def initialize(path)
       @path = File.expand_path(path)
       @name = File.basename(path)
-      @errors, @warnings = { }, { }
+      @errors, @warnings = [], []
     end
 
     def heuristic_name
-      files = (m3u_files + nfo_files + sfv_files).map { |f| File.basename(f, ".*") }
-      candidates = files.group_by { |name| name }.max { |a, b| a.last.size <=> b.last.size }
-      if candidates
+      if candidates = common_filenames
         candidates.first.gsub(/^\d+[-_]/, "")
+      else
+        self.name
+      end
+    end
+
+    def heuristic_filename(ext)
+      if candidates = common_filenames
+        "#{candidates.first}.#{ext}"
+      else
+        "00-#{self.name.downcase}.#{ext}"
       end
     end
+
+    protected
+
+    def common_filenames
+      files = (m3u_files + nfo_files + sfv_files).map { |f| File.basename(f, ".*") }
+      files.group_by { |name| name }.max { |a, b| a.last.size <=> b.last.size }
+    end
   end
 end

data/lib/scene_toolkit.rb

@@ -1,3 +1,3 @@
 module SceneToolkit
-  VERSION = "0.2.6"
+  VERSION = "0.3.0"
 end

data/scene-toolkit.gemspec

@@ -14,10 +14,11 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
-  s.add_dependency("activesupport", ["~> 3.0.0"])
+  s.add_dependency("active_support", [">= 3.0.0"])
   s.add_dependency("i18n")
   s.add_dependency("colored")
   s.add_dependency("optitron")
   s.add_dependency("nestful")
+  s.add_dependency("nokogiri")
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scene-toolkit
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-16 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70191468494620 !ruby/object:Gem::Requirement
+  name: active_support
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70191468494620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70191468510280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70191468510280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70191468509620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70191468509620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: optitron
-  requirement: &70191468509160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70191468509160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nestful
-  requirement: &70191468508700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,28 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70191468508700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Tool to assist scene MP3 library maintenance
 email:
 - knoopx@gmail.com
@@ -118,8 +159,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Tool to assist scene MP3 library maintenance
 test_files: []
+has_rdoc: