scene-toolkit 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/bin/scene-toolkit

@@ -12,7 +12,6 @@ Optitron.dispatch(SceneToolkit::CLI.new) do
     opt "playlist", "Validate playlist against existing files"
     opt "checksum", "Validate release CRC-32 checksum"
     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
   end

data/lib/scene_toolkit.rb

@@ -1,7 +1,7 @@
+gem "activesupport", "~> 2.3.5"
 require 'active_support'
 
 module SceneToolkit
-  require 'scene_toolkit/cache'
   require 'scene_toolkit/ext'
   require 'scene_toolkit/release'
   require 'scene_toolkit/cli'

data/lib/scene_toolkit/cli.rb

@@ -7,14 +7,6 @@ require 'optitron'
 require 'rainbow'
 
 class SceneToolkit::CLI
-  def initialize
-    @cache = SceneToolkit::Cache::Base.new
-  end
-
-  def flush_cache
-    @cache.releases.flush_all
-  end
-
   def verify(directory, opts)
     opts.underscore_and_symbolize_keys!
     validations = []
@@ -31,14 +23,11 @@ class SceneToolkit::CLI
       raise ArgumentError.new("#{invalid_target_directory} does not exist") unless File.directory?(invalid_target_directory)
     end
 
-
     valid_target_directory = opts.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
 
-    flush_cache if opts.delete(:flush_cache)
-
     release_count = 0
     valid_releases = 0
     invalid_releases = 0
@@ -46,32 +35,36 @@ class SceneToolkit::CLI
     each_release(directory) do |release|
       release_count += 1
 
-      if release.valid?(validations)
+      if release_valid = release.valid?(validations)
         valid_releases += 1
         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)
-        move_release(release, invalid_target_directory) unless invalid_target_directory.nil?
       end
 
       puts release.path
 
-      puts "#{release.errors.values.sum(&:count)} errors"
       release.errors.each do |validation, errors|
         errors.each do |error|
-          puts " - #{error}".foreground(:red)
+          puts "  ✕ #{error}".foreground(:red)
         end
       end
 
-      puts "#{release.warnings.values.sum(&:count)} warnings"
       release.warnings.each do |validation, warnings|
         warnings.each do |warning|
-          puts " - #{warning}".foreground(:yellow)
+          puts "  ✕ #{warning}".foreground(:yellow)
         end
       end
 
+      unless valid_target_directory.nil?
+        move_release(release, valid_target_directory) if release_valid
+      end
+
+      unless invalid_target_directory.nil?
+        move_release(release, invalid_target_directory) unless release_valid
+      end
+      
       puts
     end
 
@@ -83,10 +76,10 @@ class SceneToolkit::CLI
 
   def move_release(release, destination)
     target_dir = File.join(destination, release.name)
-    puts "Moving release to #{target_dir}".foreground(:yellow)
+    puts "  ■ Moving release to #{target_dir}".foreground(:yellow)
 
     if File.directory?(target_dir)
-      puts "Target directory already exists. Skipping.".foreground(:red)
+      puts "  ✕ Target directory already exists. Skipping.".foreground(:red)
     else
       begin
         FileUtils.mv(release.path, target_dir)
@@ -94,7 +87,6 @@ class SceneToolkit::CLI
         puts e.message.foreground(:red)
       end
     end
-    puts
   end
 
   def each_release(source, &block)
@@ -107,10 +99,11 @@ class SceneToolkit::CLI
       release_path = File.expand_path(File.dirname(file))
 
       unless releases.include?(release_path)
-        release = SceneToolkit::Release.new(release_path, @cache)
+        release = SceneToolkit::Release.new(release_path)
         releases << release_path
         yield(release)
       end
     end
   end
+
 end

data/lib/scene_toolkit/release.rb

@@ -8,8 +8,7 @@ class SceneToolkit::Release
   attr_accessor :name, :path, :uid
   attr_accessor :errors, :warnings
 
-  def initialize(path, cache)
-    @cache = cache
+  def initialize(path)
     @path = path
     @name = File.basename(path)
     @uid = Digest::MD5.hexdigest(@name.downcase.gsub(/[^A-Z0-9]/i, ' ').gsub(/\s+/, ' '))
@@ -18,34 +17,9 @@ class SceneToolkit::Release
 
   def valid?(validations = VALIDATIONS)
     @errors, @warnings = {}, {}
-
-    if @cache.releases.modified?(self)
-      # if release was modified, invalidate all cached validations
-      @cache.releases.flush(self)
-      validations.each do |validation|
-        send("valid_#{validation}?")
-      end
-    else
-      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
-
-        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
+    validations.each do |validation|
+      send("valid_#{validation}?")
     end
-
-    @cache.releases.store(self)
     @errors.sum { |validation, errors| errors.size }.zero?
   end
 
@@ -63,44 +37,48 @@ class SceneToolkit::Release
     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))
+      File.read(playlist).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 (M3U)" unless File.exist?(File.join(@path, filename))
       end
     end
   end
 
   def valid_checksum?
     @errors[:checksum], @warnings[:checksum] = [], []
+    sfv = sfv_files.first
 
-    sfv_file = sfv_files.first
-
-    return if sfv_file.nil?
-
-    files_to_check = files.inject({}) do |collection, file|
-      collection[File.basename(file).downcase] = File.expand_path(file)
-      collection
-    end
+    unless sfv.blank? do
+      files_to_check = files.inject({}) do |collection, file|
+        collection[File.basename(file).downcase] = File.expand_path(file)
+        collection
+      end
 
-    #todo: set warning if no matches were found on sfv file
-    matched_something = false
+      matched_something = false
+      File.read(sfv).split(/[\r\n]+/).each do |line|
+        line.strip!
 
-    File.read(sfv_file).split(/[\r\n]+/).each do |line|
-      if (/(generated|raped)/i =~ line and not /MorGoTH/i =~ line)
-        @warnings[:checksum] << "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
-        if files_to_check.has_key?(filename.downcase)
-          unless Zlib.crc32(File.read(files_to_check[filename.downcase])).eql?(checksum.hex)
-            @errors[:checksum] << "#{filename} is corrupted"
+        if match = /^(.+?)\s+([\dA-Fa-f]{8})$/.match(line)
+          matched_something = true
+          filename, checksum = match.captures
+          filename.strip!.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 (SFV)"
+            end
+          else
+            @errors[:checksum] << "File #{filename} not found (SFV)"
           end
-        else
-          @errors[:checksum] << "File #{filename} not found"
         end
-        matched_something = true
       end
+      @warnings[:checksum] << "No files to verify found (SFV)" unless matched_something
+    end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scene-toolkit
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - "V\xC3\xADctor Mart\xC3\xADnez"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +02:00
+date: 2010-08-24 00:00:00 +02:00
 default_executable: scene-toolkit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,9 +82,6 @@ files:
 - VERSION
 - bin/scene-toolkit
 - lib/scene_toolkit.rb
-- lib/scene_toolkit/cache.rb
-- lib/scene_toolkit/cache/base.rb
-- lib/scene_toolkit/cache/releases.rb
 - lib/scene_toolkit/cli.rb
 - lib/scene_toolkit/ext.rb
 - lib/scene_toolkit/ext/hash.rb

data/lib/scene_toolkit/cache.rb

@@ -1,4 +0,0 @@
-module SceneToolkit::Cache
-  require 'scene_toolkit/cache/base'
-  require 'scene_toolkit/cache/releases'
-end

data/lib/scene_toolkit/cache/base.rb

@@ -1,10 +0,0 @@
-require 'pstore'
-
-class SceneToolkit::Cache::Base < PStore
-  attr_reader :releases
-
-  def initialize
-    super(File.expand_path(File.join("~", ".scene-toolkit")))
-    @releases = SceneToolkit::Cache::Releases.new(self)
-  end
-end

data/lib/scene_toolkit/cache/releases.rb

@@ -1,76 +0,0 @@
-class SceneToolkit::Cache::Releases
-  def initialize(cache, cache_key = :releases)
-    @cache = cache
-    @cache_key = cache_key
-    @cache.transaction do
-      @cache[@cache_key] ||= {}
-    end
-  end
-
-  def modified?(release)
-    @cache.transaction(true) do
-      if @cache[@cache_key].has_key?(release.path)
-        @cache[@cache_key][release.path][:files].each do |filename, mtime|
-          file_path = File.join(release.path, filename)
-          unless File.exists?(file_path) and (@cache[@cache_key][release.path][:files].has_key?(filename) and File.stat(file_path).mtime.eql?(mtime))
-            flush(release)
-            return true
-          end
-        end
-        false
-      else
-        true
-      end
-    end
-  end
-
-  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) }
-      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
-    end
-  end
-
-  def files(release)
-    @cache.transaction(true) do
-      @cache[@cache_key][release.path][:files]
-    end
-  end
-
-  def flush(release)
-    @cache.transaction do
-      @cache[@cache_key].delete(release.path) if @cache[@cache_key].has_key?(release.path)
-    end
-  end
-
-  def flush_all
-    @cache.transaction do
-      @cache[@cache_key] = {}
-    end
-  end
-
-  def store(release)
-    @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
-      end
-    end
-  end
-end