lib/inspector.rb in pirate-autonzb-0.4.2 vs lib/inspector.rb in pirate-autonzb-0.4.3

- old
+ new

@@ -5,11 +5,13 @@ attr_accessor :backup_path, :movies, :nzbs def initialize(paths, options = {}) @paths = paths.split(',').map { |p| p.gsub(/\/$/,'') } @options = options - @options[:srt] = @options[:srt] ? @options[:srt].split(',') : ['none'] + p @options[:srt] + @options[:srt] = @options[:srt] ? (@options[:srt].split(',') - ["unknown"] + ['unknown']).uniq : nil + p @options[:srt] @options[:imdb_score] = @options[:imdb_score] ? @options[:imdb_score].to_f : 7.0 @options[:year] = @options[:year] ? @options[:year].to_i : 1950 @movies = [] initialize_movies @@ -100,12 +102,12 @@ def clean_dir(dir) dir.select { |e| !["..", ".", ".DS_Store", ".com.apple.timemachine.supported", "Icon\r"].include?(e) } end def valid?(movie) - srt_size = @options[:srt].size - (((@options[:srt] - movie.srt).size < srt_size) || @options[:srt].include?('none')) && - movie.year >= @options[:year] && movie.score >= @options[:imdb_score] + (@options[:srt].nil? || (((@options[:srt] - movie.srt).size < @options[:srt].size)) || movie.lang == 'FRENCH') && + movie.year >= @options[:year] && + movie.score >= @options[:imdb_score] end def srt_score(movie) srts = @options[:srt].reverse movie.srt.inject(-1) do |score, srt| \ No newline at end of file