scene-toolkit 0.1.1 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/scene_toolkit/cli.rb

@@ -56,8 +56,10 @@ class SceneToolkit::CLI
         invalid_releases += 1
         puts release.name.foreground(:red)
         puts release.path
-        release.errors.each do |error|
-          puts " - #{error}"
+        release.errors.each do |validation, errors|
+          errors.each do |error|
+            puts " - #{error}"
+          end
         end
 
         puts
@@ -97,7 +99,6 @@ class SceneToolkit::CLI
     raise ArgumentError("#{source} is not a directory") unless File.directory?(source)
 
     releases = []
-    uids = {}
 
     Dir.glob(File.join(source, "**", "*.mp3")).each do |file|
       release_path = File.expand_path(File.dirname(file))
@@ -106,12 +107,6 @@ class SceneToolkit::CLI
         release = SceneToolkit::Release.new(release_path, @cache)
         releases << release_path
         yield(release)
-
-        if uids.has_key?(release.uid)
-          release.errors << "Duplicate release of #{uids[release.uid]}"
-        else
-          uids[release.uid] = release.path
-        end
       end
     end
   end

data/lib/scene_toolkit/release.rb

@@ -4,46 +4,46 @@ require 'zlib'
 class SceneToolkit::Release
   REQUIRED_FILES = [:sfv, :nfo, :m3u]
   VALIDATIONS = [:name, :required_files, :checksum]
-  
+
   attr_accessor :name, :path, :uid
   attr_accessor :errors
 
-  class << self
-    def has_files_with_extension(*exts)
-      exts.each do |ext|
-        define_method "#{ext}_files" do
-          files.select { |f| File.extname(f).downcase.eql?(".#{ext}") }
-        end
-      end
-    end
-  end
-  has_files_with_extension :mp3, :sfv, :nfo, :m3u
-
   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 = {}
-    VALIDATIONS.each do |validation|
-      @errors[validation] = []
-    end
   end
 
   def valid?(validations = VALIDATIONS)
+    @errors = {}
+
     if @cache.releases.modified?(self)
-      @errors = []
+      # if release was modified, invalidate all cached validations
+      @cache.releases.flush(self)
       validations.each do |validation|
         send("valid_#{validation}?")
       end
-      @cache.releases.store(self)
     else
-      @errors = @cache.releases.errors(self, validations)
+      validations.each do |validation|
+        validation_errors = @cache.releases.errors(self, [validation])
+        if validation_errors.nil?
+          # execute validation if release was catched but this particular validation was not executed
+          send("valid_#{validation}?")
+        else
+          @errors.merge!(validation_errors)
+        end
+      end
     end
-    @errors.none?
+    
+    @cache.releases.store(self)
+
+    @errors.sum { |validation, errors| errors.size }.zero?
   end
 
   def valid_required_files?
+    @errors[:required_files] = []
     REQUIRED_FILES.each do |ext|
       file_count = send("#{ext}_files")
       @errors[:required_files] << "No #{ext} found." if file_count.none?
@@ -51,11 +51,9 @@ class SceneToolkit::Release
     end
   end
 
-  def files
-    Dir.glob(File.join(@path, "*"))
-  end
-
   def valid_checksum?
+    @errors[:checksum] = []
+    
     sfv_file = sfv_files.first
 
     return if sfv_file.nil?
@@ -88,9 +86,27 @@ class SceneToolkit::Release
   end
 
   def valid_name?
+    @errors[: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)
   end
+
+  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
+          files.select { |f| File.extname(f).downcase.eql?(".#{ext}") }
+        end
+      end
+    end
+  end
+  has_files_with_extension :mp3, :sfv, :nfo, :m3u
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scene-toolkit
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - "V\xC3\xADctor Mart\xC3\xADnez"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 +02:00
+date: 2010-08-19 00:00:00 +02:00
 default_executable: scene-toolkit
 dependencies: 
 - !ruby/object:Gem::Dependency