scene-toolkit 0.1.3 → 0.1.4

data/Rakefile

@@ -10,9 +10,9 @@ begin
     gem.email = "knoopx@gmail.com"
     gem.homepage = "http://github.com/knoopx/scene-toolkit"
     gem.authors = ["Víctor Martínez"]
-    gem.add_dependency "optitron", ">= 0.0.7"
-    gem.add_dependency "activesupport", ">= 2.3.5"
-    gem.add_dependency "rainbow", ">= 1.1"
+    gem.add_dependency "optitron", "~> 0.0.9"
+    gem.add_dependency "activesupport", "~> 2.3.5"
+    gem.add_dependency "rainbow", "~> 1.1"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/bin/scene-toolkit

@@ -1,20 +1,17 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -rubygems
 
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 
-require 'rubygems'
-require 'optitron'
 require 'scene_toolkit'
 
-
 Optitron.dispatch(SceneToolkit::CLI.new) do
-
   cmd "verify", "Verify library or release. Executes all validations if none specified" do
     arg "directory", "The root directory to verify"
     opt "name", "Validate release name"
     opt "required-files", "Validate inclusion of required files"
+    opt "playlist", "Validate playlist against existing files"
     opt "checksum", "Validate release CRC-32 checksum"
-    opt "display-valid", "Display valid releases too"
+    opt "hide-valid", "Do not display valid releases"
     opt "flush-cache", "Flush file modification cache"
     opt "move-invalid-to", "Move INVALID releases to specified folder", :type => :string
     opt "move-valid-to", "Move VALID releases to specified folder", :type => :string

data/lib/scene_toolkit/cache/releases.rb

@@ -27,7 +27,17 @@ class SceneToolkit::Cache::Releases
   def errors(release, validations = SceneToolkit::Release::VALIDATIONS)
     @cache.transaction(true) do
       if @cache[@cache_key].has_key?(release.path)
-        @cache[@cache_key][release.path][:errors].reject{ |validation, errors| not validations.include?(validation) }
+        @cache[@cache_key][release.path][:errors].reject { |validation, errors| not validations.include?(validation) }
+      else
+        raise RuntimeError.new("Release not catched")
+      end
+    end
+  end
+
+  def warnings(release, validations = SceneToolkit::Release::VALIDATIONS)
+    @cache.transaction(true) do
+      if @cache[@cache_key].has_key?(release.path)
+        @cache[@cache_key][release.path][:warnings].reject { |validation, warnings| not validations.include?(validation) }
       else
         raise RuntimeError.new("Release not catched")
       end
@@ -56,6 +66,7 @@ class SceneToolkit::Cache::Releases
     @cache.transaction do
       @cache[@cache_key][release.path] = {}
       @cache[@cache_key][release.path][:errors] = release.errors
+      @cache[@cache_key][release.path][:warnings] = release.warnings
       @cache[@cache_key][release.path][:files] = Dir.glob(File.join(release.path, "*")).inject({}) do |collection, f|
         collection[File.basename(f)] = File.stat(f).mtime
         collection

data/lib/scene_toolkit/cli.rb

@@ -1,4 +1,9 @@
 require 'fileutils'
+
+gem 'rainbow', "~> 1.1"
+gem "optitron", "~> 0.0.9"
+
+require 'optitron'
 require 'rainbow'
 
 class SceneToolkit::CLI
@@ -43,33 +48,31 @@ class SceneToolkit::CLI
 
       if release.valid?(validations)
         valid_releases += 1
-        if opts[:display_valid]
-          puts release.name.foreground(:green)
-          puts release.path
-          puts
-        end
-
-        unless valid_target_directory.nil?
-          move_release(release, valid_target_directory)
-        end
+        puts release.name.foreground(:green) unless opts[:hide_valid]
+        move_release(release, valid_target_directory) unless valid_target_directory.nil?
       else
         invalid_releases += 1
         puts release.name.foreground(:red)
-        puts release.path
-        release.errors.each do |validation, errors|
-          errors.each do |error|
-            puts " - #{error}"
-          end
-        end
+        move_release(release, invalid_target_directory) unless invalid_target_directory.nil?
+      end
 
-        puts
+      puts release.path
 
-        unless invalid_target_directory.nil?
-          move_release(release, invalid_target_directory)
+      puts "#{release.errors.values.sum(&:count)} errors"
+      release.errors.each do |validation, errors|
+        errors.each do |error|
+          puts " - #{error}".foreground(:red)
         end
+      end
 
-        puts
+      puts "#{release.warnings.values.sum(&:count)} warnings"
+      release.warnings.each do |validation, warnings|
+        warnings.each do |warning|
+          puts " - #{warning}".foreground(:yellow)
+        end
       end
+
+      puts
     end
 
     puts "#{valid_releases} of #{release_count} releases valid".foreground(:yellow)

data/lib/scene_toolkit/release.rb

@@ -3,21 +3,21 @@ require 'zlib'
 
 class SceneToolkit::Release
   REQUIRED_FILES = [:sfv, :nfo, :m3u]
-  VALIDATIONS = [:name, :required_files, :checksum]
+  VALIDATIONS = [:name, :required_files, :playlist, :checksum]
 
   attr_accessor :name, :path, :uid
-  attr_accessor :errors
+  attr_accessor :errors, :warnings
 
   def initialize(path, cache)
     @cache = cache
     @path = path
     @name = File.basename(path)
     @uid = Digest::MD5.hexdigest(@name.downcase.gsub(/[^A-Z0-9]/i, ' ').gsub(/\s+/, ' '))
-    @errors = {}
+    @errors, @warnings = {}, {}
   end
 
   def valid?(validations = VALIDATIONS)
-    @errors = {}
+    @errors, @warnings = {}, {}
 
     if @cache.releases.modified?(self)
       # if release was modified, invalidate all cached validations
@@ -34,26 +34,45 @@ class SceneToolkit::Release
         else
           @errors.merge!(validation_errors)
         end
+
+        validation_warnings = @cache.releases.warnings(self, [validation])
+        if validation_warnings.nil?
+          # execute validation if release was catched but this particular validation was not executed
+          send("valid_#{validation}?")
+        else
+          @warnings.merge!(validation_warnings)
+        end
       end
     end
-    
-    @cache.releases.store(self)
 
+    @cache.releases.store(self)
     @errors.sum { |validation, errors| errors.size }.zero?
   end
 
   def valid_required_files?
-    @errors[:required_files] = []
+    @errors[:required_files], @warnings[:required_files] = [], []
     REQUIRED_FILES.each do |ext|
       file_count = send("#{ext}_files")
       @errors[:required_files] << "No #{ext} found." if file_count.none?
-      @errors[:required_files] << "Multiple #{ext} found." if file_count.size > 1
+      @warnings[:required_files] << "Multiple #{ext} found." if file_count.size > 1
+    end
+  end
+
+  def valid_playlist?
+    @errors[:playlist], @warnings[:playlist] = [], []
+    playlist = m3u_files.first
+
+    unless playlist.nil?
+      File.read(m3u_files.first).split(/[\r\n]+/).each do |track|
+        next if track.blank? or track.start_with?("#")
+        @errors[:playlist] << "File not found #{track}" unless File.exist?(File.join(@path, track))
+      end
     end
   end
 
   def valid_checksum?
-    @errors[:checksum] = []
-    
+    @errors[:checksum], @warnings[:checksum] = [], []
+
     sfv_file = sfv_files.first
 
     return if sfv_file.nil?
@@ -67,9 +86,9 @@ class SceneToolkit::Release
     matched_something = false
 
     File.read(sfv_file).split(/[\r\n]+/).each do |line|
-#        if (/(generated|raped)/i =~ line and not /MorGoTH/i =~ line)
-#          @errors << "Possibly tampered SFV: #{line.strip}"
-#        end
+      if (/(generated|raped)/i =~ line and not /MorGoTH/i =~ line)
+        @warnings[:checksum] << "Possibly tampered SFV: #{line.strip}"
+      end
 
       if match = /^(.+?)\s+([\dA-Fa-f]{8})$/.match(line)
         filename, checksum = match.captures
@@ -86,7 +105,7 @@ class SceneToolkit::Release
   end
 
   def valid_name?
-    @errors[:name] = []
+    @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 lowercased" if @name.eql?(@name.downcase)
     @errors[:name] << "Release name is uppercased" if @name.eql?(@name.upcase)
@@ -95,10 +114,10 @@ class SceneToolkit::Release
   def files
     Dir.glob(File.join(@path, "*"))
   end
-  
+
   class << self
     protected
-    
+
     def has_files_with_extension(*exts)
       exts.each do |ext|
         define_method "#{ext}_files" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scene-toolkit
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - "V\xC3\xADctor Mart\xC3\xADnez"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 +02:00
+date: 2010-08-23 00:00:00 +02:00
 default_executable: scene-toolkit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 13
         segments: 
         - 0
         - 0
-        - 7
-        version: 0.0.7
+        - 9
+        version: 0.0.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 9
         segments: 
@@ -56,7 +56,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 13
         segments: