scene-toolkit 0.2.0 → 0.2.1

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

@@ -1,3 +1,5 @@
+require 'zlib'
+
 module SceneToolkit
   class Release
     module Validations
@@ -8,43 +10,52 @@ module SceneToolkit
 
         def valid_checksum?
           @errors[:checksum], @warnings[:checksum] = [], []
-
           if sfv_files.any?
             sfv_files.each do |sfv|
-              files_to_check = files.inject({ }) do |collection, file|
-                collection[File.basename(file).downcase] = File.expand_path(file)
-                collection
+              begin
+                validate_checksum(sfv)
+              rescue => e
+                @errors[:playlist] << e.message
               end
+            end
+          else
+            @errors[:checksum] << "No *.sfv files found"
+          end
+          @errors[:checksum].empty?
+        end
 
-              matched_something = false
-              File.read(sfv).split(/[\r\n]+/).each do |line|
-                line.strip!
+        protected
 
-                if (/(generated|raped)/i =~ line and not /MorGoTH/i =~ line)
-                  @warnings[:checksum] << "Possibly tampered SFV: #{line.strip}"
-                end
+        def validate_checksum(sfv)
+          files_to_check = files.inject({ }) do |collection, file|
+            collection[File.basename(file).downcase] = File.expand_path(file)
+            collection
+          end
+
+          matched_something = false
+          File.read(sfv).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}"
+            end
 
-                if match = /^(.+?)\s+([\dA-Fa-f]{8})$/.match(line)
-                  matched_something = true
-                  filename, checksum = match.captures
-                  filename.strip!
-                  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"
-                    end
-                  else
-                    @errors[:checksum] << "File #{filename} not found"
-                  end
+            if match = /^(.+?)\s+([\dA-Fa-f]{8})$/.match(line)
+              matched_something = true
+              filename, checksum = match.captures
+              filename.strip!
+              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"
                 end
+              else
+                @errors[:checksum] << "File #{filename} not found"
               end
-              @warnings[:checksum] << "No files to verify found" unless matched_something
             end
-          else
-            @errors[:checksum] << "No *.sfv files found"
           end
-          @errors[:checksum].empty?
+          @warnings[:checksum] << "No files to verify found" unless matched_something
         end
       end
     end

data/lib/scene_toolkit/release.rb

@@ -1,6 +1,3 @@
-require 'digest/md5'
-require 'zlib'
-
 require 'scene_toolkit/release/helpers'
 require 'scene_toolkit/release/rename'
 require 'scene_toolkit/release/validations'
@@ -11,7 +8,7 @@ require 'scene_toolkit/release/validations/required_files'
 
 module SceneToolkit
   class Release
-    attr_accessor :name, :path, :uid
+    attr_accessor :name, :path
     attr_accessor :errors, :warnings
 
     include Validations
@@ -26,7 +23,6 @@ module SceneToolkit
     def initialize(path)
       @path = File.expand_path(path)
       @name = File.basename(path)
-      @uid = Digest::MD5.hexdigest(@name.downcase.gsub(/[^A-Z0-9]/i, ' ').gsub(/\s+/, ' '))
       @errors, @warnings = { }, { }
     end
 

data/lib/scene_toolkit.rb

@@ -1,3 +1,3 @@
 module SceneToolkit
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scene-toolkit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157064380 !ruby/object:Gem::Requirement
+  requirement: &2153049440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157064380
+  version_requirements: *2153049440
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2157063960 !ruby/object:Gem::Requirement
+  requirement: &2153049020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157063960
+  version_requirements: *2153049020
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &2157063480 !ruby/object:Gem::Requirement
+  requirement: &2153048560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157063480
+  version_requirements: *2153048560
 - !ruby/object:Gem::Dependency
   name: optitron
-  requirement: &2157063060 !ruby/object:Gem::Requirement
+  requirement: &2153048140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157063060
+  version_requirements: *2153048140
 - !ruby/object:Gem::Dependency
   name: nestful
-  requirement: &2157062640 !ruby/object:Gem::Requirement
+  requirement: &2153047720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157062640
+  version_requirements: *2153047720
 description: Tool to assist scene MP3 library maintenance
 email:
 - knoopx@gmail.com