apple-tv-converter 0.4.4 → 0.5.1

data/lib/apple_tv_converter/command_line.rb

@@ -18,7 +18,6 @@ module AppleTvConverter
         end
       rescue ArgumentError => e
         puts "Error: #{e.message}"
-        puts e.backtrace
       rescue => e
         puts "Error: #{e.message}"
         puts e.backtrace
@@ -38,7 +37,9 @@ module AppleTvConverter
         options.skip_metadata = false
         options.skip_cleanup = false
         options.add_to_itunes = false
-        options.check_imdb = false
+        options.skip_online_metadata = false
+        options.plex_format = false
+        options.interactive = true
         options.imdb_id = nil
         options.languages = []
         options.media = []
@@ -47,27 +48,17 @@ module AppleTvConverter
           opts.banner = "Usage: apple-tv-converter [options] [file]\n" +
                         "       [file] must be provided unless the -d (--dir) switch is present.\n"
 
-          opts.on('--no-transcoding', "Don't transcode video or audio") do |v|
-            options.skip_transcoding = true
-          end
-
-          opts.on('--no-subtitles', "Don't add subtitles") do |v|
-            options.skip_subtitles = true
-          end
-
-          opts.on('--no-metadata', "Don't add metadata") do |m|
-            options.skip_metadata = true
-          end
-
-          opts.on('--no-cleanup', "Don't cleanup the source files after processing") do |c|
-            options.skip_cleanup = true
+          opts.on('-i', '--id id', "Set a specific id for fetching metadata from online services") do |id|
+            options.imdb_id = id
           end
 
           opts.on('-l', '--languages eng,por,...', Array, "Only keep audio and subtitles in the specified languages") do |languages|
             options.languages.push *languages
+            # If filtering by languages, always include the undetermined language
+            options.languages.push 'und' unless options.languages.include?('und')
           end
 
-          opts.on('-d', '--dir [DIRECTORY]', 'Process all files in DIRECTORY recursively') do |dir|
+          opts.on('-d', '--dir DIRECTORY', 'Process all files in DIRECTORY recursively') do |dir|
             raise ArgumentError.new("Path not found: #{dir}") unless File.exists?(dir)
             raise ArgumentError.new("Path is not a directory: #{dir}") unless File.directory?(dir)
 
@@ -85,18 +76,56 @@ module AppleTvConverter
             options.add_to_itunes = true
           end
 
-          opts.on('--imdb [ID]',
-              "Gather data from IMDB (optionally specifying movie id. If an id isn't specified",
-              "the program looks for a file on the same directory, named <id>.imdb)"
-            ) do |id|
-            options.check_imdb = true
-            options.imdb_id = id if id
-          end
-
           opts.on('--os', "Download subtitles and infer IMDB ID from opensubtitles.org") do |i|
             options.download_subtitles = true
           end
 
+          opts.on('--plex', 'Rename file(s) to Plex Media Server recommended format') do
+            options.plex_format = true
+            options.skip_online_metadata = false
+          end
+
+          opts.separator ""
+
+          opts.on('--no-transcoding', "Don't transcode video or audio") do |v|
+            options.skip_transcoding = true
+          end
+
+          opts.on('--no-subtitles', "Don't add subtitles") do |v|
+            options.skip_subtitles = true
+          end
+
+          opts.on('--no-metadata', "Don't add metadata (implies --no-online-metadata)") do |m|
+            options.skip_metadata = true
+          end
+
+          opts.on('--no-online-metadata', "Don't fetch metadata from online services (IMDB or TheTVDB)") do |m|
+            options.skip_online_metadata = true
+          end
+
+          opts.on('--no-interactive', "Perform all operations without user intervention, using sensible defaults") do |m|
+            options.interactive = false
+          end
+
+          opts.on('--no-cleanup', "Don't cleanup the source files after processing") do |c|
+            options.skip_cleanup = true
+          end
+
+          opts.separator ""
+          opts.separator "Other options:"
+
+          opts.on('-f', '--ffmpeg LOCATION', 'Set path to ffmpeg binary') do |f|
+            FFMPEG.ffmpeg_binary = f
+          end
+
+          opts.separator ""
+          opts.separator "DEPRECATED options:"
+
+          opts.on('--imdb', "Gather data from IMDB (optionally specifying movie id)") do
+            puts "Warning: Switch --imdb is DEPRECATED, and will be removed in a future version. It is now activated by default"
+            puts "         If you want to specify an id, please use the switch --id."
+          end
+
           opts.separator ""
           opts.separator "Common options:"
 
@@ -131,16 +160,33 @@ module AppleTvConverter
           # [1] - Show name
           begin
             e = AppleTvConverter::Media.new
-            # Extract name
-            match = File.dirname(file).match(/.*\/(.*?)(?:S(\d+))?$/i)
+
+            # Extract name (check if the folder name is Season XX, and use the parent folder name if it is)
+            test_path = File.basename(File.dirname(file)) =~ /^season\s*\d+/i ? File.dirname(File.dirname(file)) : File.dirname(file)
+
+            match = test_path.match(/.*\/(.*?)(?:S(\d+))?$/i)
+
             e.show = match[1].strip
 
-            # Extract season an media number
-            match = File.basename(file).match(/.*?(?:S(\d+)E(\d+)|(\d+)x(\d+)).*/i)
+            # Extract season and media number
+            match = File.basename(file).match(/.*?S(\d+)E(\d+)(?:(?:[-E]+(\d+))*).*?/i)
+
+            # /.*?S(\d+)E(\d+)(?:(?:[-E]+(\d+))*).*?/ -> S00E01, S00E01(E02)+, S00E01(-E02)+, S00E01(-02)+
             if match
-              e.season = (match[1] || match[3]).to_i
-              e.number = (match[2] || match[4]).to_i
+              e.season = match[1].to_i
+              e.number = match[2].to_i
+              e.last_number = match[3].to_i if match[3]
+            else
+              match = File.basename(file).match(/(\d+)x(\d+)(?:(?:_?(?:\1)x(\d+))*)/i)
+
+              # /(\d+)x(\d+)(?:(?:_?(?:\1)x(\d+))*)/ -> 0x01, 0x01(_0x02)+ , assuming same season number (0x01_1x02 fails!)
+              if match
+                e.season = match[1].to_i
+                e.number = match[2].to_i
+                e.last_number = match[3].to_i if match[3]
+              end
             end
+
             e.original_filename = file
 
             return e

data/lib/apple_tv_converter/media.rb

@@ -1,16 +1,14 @@
 module AppleTvConverter
   class Media
-    attr_accessor :show, :season, :number
-    attr_accessor :imdb_movie, :imdb_id
+    attr_accessor :show, :season, :number, :last_number
+    attr_accessor :imdb_movie, :imdb_id, :imdb_episode_id
+    attr_accessor :tvdb_movie
+    attr_accessor :network, :tvdb_id, :tvdb_season_id, :tvdb_episode_id, :first_air_date, :release_date, :episode_title
     attr_reader :original_filename
 
-    def self.subtitle_extensions
-      ['srt', 'sub', 'ssa', 'ass']
-    end
+    def self.subtitle_extensions ; ['srt', 'sub', 'ssa', 'ass'] ; end
 
-    def self.ignored_extensions
-      ['nfo', 'jpg', 'png', 'bmp', 'sfv', 'imdb']
-    end
+    def self.ignored_extensions ; ['nfo', 'jpg', 'png', 'bmp', 'sfv', 'imdb'] ; end
 
     def original_filename=(value)
       @original_filename = value
@@ -28,40 +26,51 @@ module AppleTvConverter
         @converted_filename = original_filename.gsub(File.extname(original_filename), "_2#{File.extname(original_filename)}")
         @converted_filename_equals_original_filename = true
       end
-    end
 
-    def converted_filename_equals_original_filename?
-      @converted_filename_equals_original_filename || false
-    end
+      load_data_file
 
-    def artwork_filename
-      @artwork_filename ||= self.original_filename.gsub(File.extname(self.original_filename), '.jpg')
+      @original_filename
     end
 
-    def subtitle_filename
-      @subtitle_filename ||= self.original_filename.gsub(File.extname(self.original_filename), '.srt')
-    end
+    def converted_filename_equals_original_filename? ; @converted_filename_equals_original_filename || false ; end
 
-    def converted_filename
-      @converted_filename ||= self.original_filename.gsub(File.extname(self.original_filename), '.mp4')
-    end
+    def artwork_filename ; @artwork_filename ||= self.original_filename.gsub(File.extname(self.original_filename), '.jpg') ; end
 
-    def converted_filename=(value)
-      @converted_filename = value
-    end
+    def subtitle_filename ; @subtitle_filename ||= self.original_filename.gsub(File.extname(self.original_filename), '.srt') ; end
 
-    def backup_filename
-      @backup_filename ||= "#{self.original_filename}.backup"
-    end
+    def converted_filename ; @converted_filename ||= self.original_filename.gsub(File.extname(self.original_filename), '.mp4') ; end
+
+    def converted_filename=(value) ; @converted_filename = value ; end
 
-    def converted_filename_with_subtitles
-      @converted_filename_with_subtitles ||= self.original_filename.gsub(/\.(mkv|avi|m4v)/, '_subtitled.mp4')
+    def base_location
+      unless @base_location
+        @base_location = File.dirname(original_filename)
+        @base_location = File.dirname(@base_location) if File.basename(@base_location) =~ /^season \d+$/i
+      end
+      @base_location
     end
 
-    def ffmpeg_data
-      @ffmpeg_data ||= FFMPEG::Movie.new(original_filename)
+    def data_file ; @data_file ||= File.join(base_location, '.apple-tv-converter.data') ; end
+    def has_data_file? ; File.exists?(data_file) ; end
+
+    def plex_format_filename
+      filename = if is_tv_show_episode?
+        %Q[#{show} - s#{season.to_s.rjust(2, '0')}e#{number.to_s.rjust(2, '0')}#{"-e#{last_number.to_s.rjust(2, '0')}" if last_number}#{" - #{episode_title.gsub(/\\|\//, '-').gsub(/\:/, '.').gsub(/&/, '&').strip}" if !episode_title.nil? && !episode_title.blank?}.mp4]
+      else
+        "#{show} (#{release_date || imdb_movie.year}).mp4"
+      end
+
+      File.join(File.dirname(converted_filename), filename)
     end
 
+    def resulting_filename ; File.exists?(plex_format_filename) ? plex_format_filename : converted_filename ; end
+
+    def backup_filename ; @backup_filename ||= "#{self.original_filename}.backup" ; end
+
+    def converted_filename_with_subtitles ; @converted_filename_with_subtitles ||= self.original_filename.gsub(/\.(mkv|avi|m4v)/, '_subtitled.mp4') ;end
+
+    def ffmpeg_data ; @ffmpeg_data ||= FFMPEG::Movie.new(original_filename) ; end
+
     def quality
       if !@quality
         @quality = '1080p' if ffmpeg_data.height == 1080 || ffmpeg_data.width == 1920
@@ -72,37 +81,21 @@ module AppleTvConverter
       @quality
     end
 
-    def genre
-      is_tv_show_episode? ? show : "#{quality} Movies"
-    end
+    def genre ; is_tv_show_episode? ? show : "#{quality} Movies" ; end
 
-    def quality=(value)
-      @quality = value
-    end
+    def quality=(value) ; @quality = value ; end
 
-    def name
-      %Q[#{show}#{" S#{season.to_s.rjust(2, '0')}E#{number.to_s.rjust(2, '0')}" if is_tv_show_episode?}]
-    end
+    def name ; %Q[#{show}#{" S#{season.to_s.rjust(2, '0')}E#{number.to_s.rjust(2, '0')}" if is_tv_show_episode?}] ; end
 
-    def is_tv_show_episode?
-      !season.nil? && !number.nil?
-    end
+    def is_tv_show_episode? ; !season.nil? && !number.nil? ; end
 
-    def is_movie?
-      !is_tv_show_episode?
-    end
+    def is_movie? ; !is_tv_show_episode? ; end
 
-    def is_mp4?
-      ffmpeg_data.container =~ /mp4/ rescue File.extname(original_filename) =~ /\.(m4v|mp4)$/
-    end
+    def is_mp4? ; ffmpeg_data.container =~ /mp4/ rescue File.extname(original_filename) =~ /\.(m4v|mp4)$/ ; end
 
-    def is_valid?
-      ffmpeg_data.valid?
-    end
+    def is_valid? ; ffmpeg_data.valid? ; end
 
-    def backup!
-      FileUtils.cp original_filename, backup_filename
-    end
+    def backup! ; FileUtils.cp original_filename, backup_filename ; end
 
     def has_embedded_subtitles?(languages = [])
       languages = languages.map { |l| l.downcase.to_sym }
@@ -115,44 +108,41 @@ module AppleTvConverter
       return @streams
     end
 
-    def video_streams
-      streams :video
-    end
+    def video_streams ; streams :video ; end
 
-    def audio_streams
-      streams :audio
-    end
+    def audio_streams ; streams :audio ; end
 
-    def subtitle_streams
-      streams :subtitle
-    end
+    def subtitle_streams ; streams :subtitle ; end
 
-    def needs_audio_conversion?
-      return ffmpeg_data.audio_codec !~ /(?:aac)/i
-    end
+    def needs_audio_conversion? ; return ffmpeg_data.audio_codec !~ /(?:aac)/i ; end
 
-    def needs_video_conversion?
-      return ffmpeg_data.video_codec !~ /(?:.*?h264|^mpeg4).*/i || ffmpeg_data.video_codec =~ /.*(?:xvid|divx).*/i
-    end
+    def needs_video_conversion? ; return ffmpeg_data.video_codec !~ /(?:.*?h264|^mpeg4).*/i || ffmpeg_data.video_codec =~ /.*(?:xvid|divx).*/i ; end
 
-    def needs_subtitles_conversion?
-      return ffmpeg_data.subtitle_streams.any?
-    end
+    def needs_subtitles_conversion? ; return ffmpeg_data.subtitle_streams.any? ; end
 
-    def needs_transcoding?
-      !(is_valid? && is_mp4? && !needs_video_conversion? && !needs_audio_conversion?)
-    end
+    def needs_transcoding? ; !(is_valid? && is_mp4? && !needs_video_conversion? && !needs_audio_conversion?) ; end
 
-    def hd?
-      ['1080p', '720p'].include?(quality)
-    end
+    def hd? ; ['1080p', '720p'].include?(quality) ; end
 
-    def movie_file_size
-      @movie_file_size ||= File.size(original_filename)
+    def movie_file_size ; @movie_file_size ||= File.size(original_filename) ; end
+
+    def movie_hash ; @movie_hash ||= AppleTvConverter::MovieHasher.compute_hash(original_filename) ; end
+
+    def tvdb_movie_data(key, default = nil) ;
+      return tvdb_movie[:episode][key].gsub(/`/, '') if tvdb_movie && tvdb_movie.has_key?(:episode) && tvdb_movie[:episode].has_key?(key) && !tvdb_movie[:episode][key].blank? rescue default
+      return default
     end
 
-    def movie_hash
-      @movie_hash ||= AppleTvConverter::MovieHasher.compute_hash(original_filename)
+    def tvdb_movie_poster
+      local_file = AppleTvConverter::TvDbFetcher.get_poster(self)
+
+      unless File.exists?(local_file)
+        artwork_filename = imdb_movie.poster if imdb_movie && imdb_movie.poster
+
+        AppleTvConverter.copy artwork_filename, local_file unless artwork_filename.blank?
+      end
+
+      local_file
     end
 
     def get_new_subtitle_filename(language, subid = nil)
@@ -160,5 +150,40 @@ module AppleTvConverter
       existing_subtitle_counter = subid.nil? ? Dir[File.join(dir_name, '*.srt')].length : subid
       return File.join(dir_name, File.basename(original_filename).gsub(File.extname(original_filename), ".#{existing_subtitle_counter}.#{language}.srt"))
     end
+
+    def update_data_file!
+      data = has_data_file? ? YAML.load_file(data_file) : {}
+
+      data[:tvdb_id] = self.tvdb_id if self.tvdb_id
+      data[:imdb_id] = self.imdb_id if self.imdb_id
+
+      if self.is_tv_show_episode?
+        episode_data = {}
+        episode_data[:tvdb_episode_id] = self.tvdb_episode_id if self.tvdb_episode_id
+        episode_data[:tvdb_season_id] = self.tvdb_season_id if self.tvdb_season_id
+        episode_data[:imdb_episode_id] = self.imdb_episode_id if self.imdb_episode_id
+
+        data[:episodes] ||= {}
+        data[:episodes][:"s#{self.season}e#{self.number}"] = episode_data
+      end
+
+      File.open(self.data_file, 'w') do |f|
+        f.write data.to_yaml
+      end
+    end
+
+    private
+
+      def load_data_file
+        begin
+          if has_data_file?
+            data = YAML.load_file(data_file)
+            self.tvdb_id = data[:tvdb_id] if data.has_key?(:tvdb_id)
+            self.imdb_id = data[:imdb_id] if data.has_key?(:imdb_id)
+          end
+        rescue => e
+          ap ['e', e]
+        end
+      end
   end
 end

data/lib/apple_tv_converter/media_converter.rb

@@ -1,15 +1,10 @@
 module AppleTvConverter
   class MediaConverter
-    include AppleTvConverter
-
     @@timeout = 200
 
-    def is_windows? ; RUBY_PLATFORM =~/.*?mingw.*?/i ; end
-    def is_macosx? ; RUBY_PLATFORM =~/.*?darwin.*?/i ; end
-
     def initialize(options)
       @options = options
-      @adapter = is_windows? ? AppleTvConverter::MediaConverterWindowsAdapter.new : AppleTvConverter::MediaConverterMacAdapter.new
+      @adapter = (AppleTvConverter.is_windows? ? AppleTvConverter::MediaConverterWindowsAdapter : AppleTvConverter::MediaConverterMacAdapter).new(options)
 
       AppleTvConverter.logger.level = Logger::ERROR
       FFMPEG.logger.level = Logger::ERROR
@@ -18,31 +13,32 @@ module AppleTvConverter
 
     def process_media(media)
       # Load IMDB id from options
-      media.imdb_id = @options.imdb_id
+      media.imdb_id ||= @options.imdb_id
 
-      # Start searching subtitles if we either need to download them, or we need the IMDB id
-      if (@options.skip_subtitles != true && @options.download_subtitles && media.subtitle_streams.empty? && @adapter.list_files(media.original_filename.gsub(/.{4}$/, '.*srt')).empty?) ||
-          !(@options.skip_metadata || !@options.check_imdb)
-        @adapter.search_subtitles(media, @options.languages)
-      end
 
       if media.is_tv_show_episode?
         puts "* TV Show Episode information:"
         puts "* Name: #{media.show}"
         puts "* Season: #{media.season}"
-        puts "* Number: #{media.number}"
+        puts %Q[* Number: #{media.number}#{"-#{media.last_number}" if media.last_number}]
       else
         puts "* Movie information"
         puts "* Name: #{media.show}"
         puts "* Genre: #{media.genre}"
       end
-      puts "* IMDB ID: #{media.imdb_id}" if media.imdb_id
+      if !@options.skip_online_metadata
+        if media.imdb_id
+          puts "* IMDB ID: #{media.imdb_id}"
+        elsif !@options.skip_metadata
+          puts "* IMDB ID: Unknown yet"
+        end
+      end
 
       puts "* #{media.audio_streams.length} audio track(s)"
       if media.audio_streams.any?
         media.audio_streams.each do |audio|
           language_code = audio.language || 'und'
-          language_name = get_language_name(language_code)
+          language_name = AppleTvConverter.get_language_name(language_code)
           puts "  * #{language_code} - #{language_name.nil? ? 'Unknown (ignoring)' : language_name}"
         end
       end
@@ -51,7 +47,7 @@ module AppleTvConverter
       if media.subtitle_streams.any?
         media.subtitle_streams.each do |subtitle|
           language_code = subtitle.language || 'und'
-          language_name = get_language_name(language_code)
+          language_name = AppleTvConverter.get_language_name(language_code)
           puts "  * #{language_code} - #{language_name.nil? ? 'Unknown (ignoring)' : language_name}"
         end
       end
@@ -61,12 +57,13 @@ module AppleTvConverter
         @adapter.list_files(media.original_filename.gsub(/.{4}$/, '.*srt')).each do |subtitle|
           subtitle =~ /\.(.{3})\.srt/i
           language_code = $1 || 'und'
-          language_name = get_language_name(language_code)
+          language_name = AppleTvConverter.get_language_name(language_code)
           puts "  * #{language_code.blank? ? 'eng' : language_code} - #{language_name.nil? ? 'Unknown (ignoring)' : language_name}"
         end
       end
 
       if @options.skip_subtitles != true && @options.download_subtitles && media.subtitle_streams.empty? && @adapter.list_files(media.original_filename.gsub(/.{4}$/, '.*srt')).empty?
+        @adapter.search_subtitles(media, @options.languages)
         @adapter.download_subtitles(media, @options.languages)
       end
 
@@ -74,15 +71,19 @@ module AppleTvConverter
 
       if @options.skip_transcoding || @adapter.transcode(media, @options.languages)
         @adapter.add_subtitles(media) unless @options.skip_subtitles
-        unless @options.skip_metadata || !@options.check_imdb
+
+        unless @options.skip_metadata || @options.skip_online_metadata
           media.imdb_id ||= @options.imdb_id
-          @adapter.get_imdb_info(media)
+          @adapter.get_metadata(media)
         end
-        @adapter.tag(media) unless @options.skip_metadata
 
-        @adapter.add_to_itunes media if @options.add_to_itunes
-        @adapter.clean_up(media) unless @options.skip_cleanup
+        @adapter.tag media                   unless @options.skip_metadata
+        @adapter.clean_up media              unless @options.skip_cleanup
+        @adapter.rename_to_plex_format media if @options.plex_format
+        @adapter.add_to_itunes media         if @options.add_to_itunes
       end
+
+      media.update_data_file!
     end
   end
-end
+end