scene-toolkit 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/bin/scene-toolkit

@@ -5,6 +5,7 @@ $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 require 'scene_toolkit'
 
 Optitron.dispatch(SceneToolkit::CLI.new) do
+  help
   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"
@@ -15,4 +16,10 @@ Optitron.dispatch(SceneToolkit::CLI.new) do
     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
+
+  cmd "repair", "Repair releases" do
+    arg "directory", "The root directory to repair"
+    opt "playlist", "Repair wrong playlist or generate missing ones"
+    opt "force", "Force the modification of existing files"
+  end
 end

data/lib/scene_toolkit/cli.rb

@@ -7,6 +7,41 @@ require 'optitron'
 require 'rainbow'
 
 class SceneToolkit::CLI
+  def repair(directory, opts)
+    opts.underscore_and_symbolize_keys!
+
+    each_release(directory) do |release|
+      if opts[:playlist]
+        unless release.valid_playlist?
+          puts release.name.foreground(:red)
+          puts release.path
+          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?
+            puts "  ✕ Unable to guess playlist filename".foreground(:red)
+            next
+          end
+
+          playlist_filename = [candidates.max { |k, v| v.size }.first, ".m3u"].join
+
+          playlist_path = File.join(release.path, playlist_filename)
+          if File.exist?(playlist_path) and not opts[:force]
+            puts "  ✕ Playlist #{playlist_filename} already exists. Use --force to replace it.".foreground(:red)
+          else
+            puts "  ■ Generating new playlist: #{playlist_filename}".foreground(:yellow)
+            File.open(playlist_path, "w") do |playlist_file|
+              release.mp3_files.map { |f| File.basename(f) }.each do |mp3_file|
+                playlist_file.puts mp3_file
+              end
+            end
+          end
+          puts
+        end
+      end
+    end
+  end
+
   def verify(directory, opts)
     opts.underscore_and_symbolize_keys!
     validations = []
@@ -34,46 +69,54 @@ class SceneToolkit::CLI
 
     each_release(directory) do |release|
       release_count += 1
-
-      if release_valid = release.valid?(validations)
+      if release.valid?(validations)
         valid_releases += 1
-        puts release.name.foreground(:green) unless opts[:hide_valid]
+        if not opts[:hide_valid] or not valid_target_directory.nil?
+          puts release.name.foreground(:green)
+          puts release.path
+          print_errors(release)
+          print_warnings(release)
+          unless valid_target_directory.nil?
+            move_release(release, valid_target_directory)
+          end
+          puts
+        end
       else
         invalid_releases += 1
         puts release.name.foreground(:red)
-      end
-
-      puts release.path
-
-      release.errors.each do |validation, errors|
-        errors.each do |error|
-          puts "  ✕ #{error}".foreground(:red)
-        end
-      end
-
-      release.warnings.each do |validation, warnings|
-        warnings.each do |warning|
-          puts "  ✕ #{warning}".foreground(:yellow)
+        puts release.path
+        print_errors(release)
+        print_warnings(release)
+        unless invalid_target_directory.nil?
+          move_release(release, invalid_target_directory)
         end
+        puts
       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
 
+    puts
     puts "#{valid_releases} of #{release_count} releases valid".foreground(:yellow)
     puts "#{invalid_releases} of #{release_count} releases invalid".foreground(:yellow)
   end
 
   protected
 
+  def print_errors(release)
+    release.errors.each do |validation, errors|
+      errors.each do |error|
+        puts "  ✕ [#{validation.to_s.humanize}] #{error}".foreground(:red)
+      end
+    end
+  end
+
+  def print_warnings(release)
+    release.warnings.each do |validation, warnings|
+      warnings.each do |warning|
+        puts "  ✕ [#{validation.to_s.humanize}] #{warning}".foreground(:yellow)
+      end
+    end
+  end
+
   def move_release(release, destination)
     target_dir = File.join(destination, release.name)
     puts "  ■ Moving release to #{target_dir}".foreground(:yellow)

data/lib/scene_toolkit/release.rb

@@ -27,59 +27,67 @@ class SceneToolkit::Release
     @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?
-      @warnings[:required_files] << "Multiple #{ext} found." if file_count.size > 1
+      @errors[:required_files] << "No *.#{ext} files found." if file_count.none?
+      @warnings[:required_files] << "Multiple *.#{ext} files found." if file_count.size > 1
     end
+    @warnings[:required_files].empty?
   end
 
   def valid_playlist?
     @errors[:playlist], @warnings[:playlist] = [], []
-    playlist = m3u_files.first
-
-    unless playlist.nil?
-      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))
+    if m3u_files.any?
+      m3u_files.each do |playlist|
+        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" unless File.exist?(File.join(@path, filename))
+        end
       end
+    else
+      @errors[:playlist] << "No *.m3u files found"
     end
+    @errors[:playlist].empty?
   end
 
   def valid_checksum?
     @errors[:checksum], @warnings[:checksum] = [], []
-    sfv = sfv_files.first
-
-    unless sfv.blank? do
-      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}"
+    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
         end
 
-        if match = /^(.+?)\s+([\dA-Fa-f]{8})$/.match(line)
-          matched_something = true
-          filename, checksum = match.captures
-          filename.strip!.downcase!
+        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 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)"
+          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
-          else
-            @errors[:checksum] << "File #{filename} not found (SFV)"
           end
         end
+        @warnings[:checksum] << "No files to verify found" unless matched_something
       end
-      @warnings[:checksum] << "No files to verify found (SFV)" unless matched_something
-    end
+    else
+      @errors[:checksum] << "No *.sfv files found"
     end
+    @errors[:checksum].empty?
   end
 
   def valid_name?
@@ -87,6 +95,7 @@ class SceneToolkit::Release
     @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)
+    @errors[:name].empty?
   end
 
   def files

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scene-toolkit
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - "V\xC3\xADctor Mart\xC3\xADnez"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 +02:00
+date: 2010-08-25 00:00:00 +02:00
 default_executable: scene-toolkit
 dependencies: 
 - !ruby/object:Gem::Dependency