apple-tv-converter 0.4.4 → 0.5.1

data/lib/apple_tv_converter/media_converter_adapter.rb

@@ -2,26 +2,37 @@ module AppleTvConverter
   class MediaConverterAdapter
     include AppleTvConverter
 
+    attr_accessor :conversion_options
+
+    def initialize(options)
+      self.conversion_options = options
+    end
+
     def search_subtitles(media, languages)
       # Load the subtitles into memory and get IMDB id from them
       AppleTvConverter::SubtitlesFetcher::Opensubtitles.new(languages) do |fetcher|
         fetcher.search_subtitles media do |subtitles|
-          media.imdb_id ||= subtitles.first['IDMovieImdb']
+          media.imdb_id = subtitles.first['IDMovieImdb'] if media.imdb_id.nil? || media.imdb_id.to_s.strip == ''
         end
       end
     end
 
     def download_subtitles(media, languages)
-      puts "* Downloading subtitles"
       AppleTvConverter::SubtitlesFetcher::Opensubtitles.new(languages) do |fetcher|
-        fetcher.download_subtitles media do |step, subtitles|
-          case step
-            when :downloading   then printf "  * Downloading: \##{subtitles['IDSubtitleFile']} (#{get_language_name(subtitles['SubLanguageID'])}) - #{subtitles['SubFileName']}"
-            when :downloaded    then puts " [DONE]"
+        if fetcher.has_found_subtitles?(media)
+          printf "* Downloading subtitles"
+          fetcher.download_subtitles media do |step, subtitles|
+            case step
+              when :search        then puts %Q[ (#{subtitles.map { |l, subs| "#{subs.count} #{AppleTvConverter.get_language_name(l)}" }.join(', ') })]
+              when :downloading   then printf "  * Downloading: \##{subtitles['IDSubtitleFile']} (#{AppleTvConverter.get_language_name(subtitles['SubLanguageID'])}) - #{subtitles['SubFileName']}"
+              when :downloaded    then puts " [DONE]"
+            end
           end
+          puts "  * All subtitles downloaded"
+        else
+          puts "* No subtitles found to download"
         end
       end
-      puts "  * All subtitles downloaded"
     end
 
     def extract_subtitles(media, languages)
@@ -97,10 +108,17 @@ module AppleTvConverter
           options[:extra] << " -ab #{[audio_bitrate, (media.ffmpeg_data.audio_bitrate || 1000000)].min}k"
         end
 
+        # Ensure the languages are 'stored' as symbols, for comparison
+        languages = (languages || []).map(&:to_sym)
+
+        # If we're filtering by language, ensure that unknown and undetermined language
+        # streams are also mapped
+        languages += [nil, :und, :unk] if languages.any?
+
         # If the file has more than one audio track, map all tracks but subtitles when transcoding
         if media.audio_streams.length > 0
           media.streams.each do |stream|
-            options[:map] << " -map #{stream.input_number}:#{stream.stream_number}" if stream.type == :video || (stream.type == :audio && (languages.nil? || languages.empty? || ([nil, 'und', 'unk'] + languages).include?(stream.language)))
+            options[:map] << " -map #{stream.input_number}:#{stream.stream_number}" if stream.type == :video || (stream.type == :audio && (languages.empty? || languages.include?(stream.language ? stream.language.to_sym : stream.language)))
           end
         end
 
@@ -142,19 +160,99 @@ module AppleTvConverter
       raise NotImplementedYetException
     end
 
-    def get_imdb_info(media)
-      printf "* Getting info from IMDB"
+    def get_metadata(media)
+      if media.is_tv_show_episode?
+        get_tv_show_db_info media
+      else
+        get_imdb_info media
+      end
+    end
+
+    def get_tv_show_db_info(media)
+      printf "* Getting info from TheTVDB"
+
+      media.tvdb_movie = TvDbFetcher.search(media, conversion_options.interactive)
+      if media.tvdb_movie
+        media.imdb_id = media.tvdb_movie[:show][:series]['IMDB_ID'] if media.tvdb_movie.has_key?(:show) && media.tvdb_movie[:show].has_key?(:series)
+        media.imdb_id = media.imdb_id.gsub(/\D+/, '') if media.imdb_id
+
+        # Update the episode name, if available
+        media.episode_title = media.tvdb_movie_data('EpisodeName')
+        media.tvdb_id = media.tvdb_movie_data('seriesid')
+        media.tvdb_season_id = media.tvdb_movie_data('seasonid')
+        media.tvdb_episode_id = media.tvdb_movie_data('id')
+        media.imdb_episode_id = media.tvdb_movie_data('IMDB_ID')
+        media.imdb_episode_id = media.imdb_episode_id.gsub(/\D+/, '') if media.imdb_episode_id
+
+        unless media.imdb_id.nil? || media.imdb_id.blank?
+          puts "" # Line break just for output layout
+          get_imdb_info(media, false)
+        end
+
+        puts " [DONE]"
+      else
+        puts " [NOT FOUND]"
+      end
+    end
+
+    def get_imdb_info(media, feedback = true)
+      printf "* Getting info from IMDB" if feedback
 
       if media.imdb_id
         media.imdb_movie = Imdb::Movie.new(media.imdb_id)
       elsif Dir[File.join(File.dirname(media.original_filename), '*.imdb')].any?
         media.imdb_movie = Imdb::Movie.new(File.basename(Dir[File.join(File.dirname(media.original_filename), '*.imdb')].first).gsub(/\.imdb$/i, ''))
       else
-        puts " [SKIPPING - COULDN'T FIND IMDB ID]"
-        return
+
+        search = Imdb::Search.new(media.show)
+
+        search.movies.delete_if do |item|
+          item.title.strip =~ /(?:(?:\(TV\s*(?:Movie|(?:Mini.?)?Series|Episode))|(?:Video(?:\s*Game)?))/i
+        end
+
+        media.imdb_id = if search.movies.length > 1 && conversion_options.interactive
+          choice = 0
+          puts "\n  *"
+          while true
+            puts %Q[  | Several movies found, choose the intended one#{" (showing only the first 20 of #{search.movies.length} results)" if search.movies.length > 20}:]
+
+            search.movies[0...20].each_with_index do |item, index|
+              puts "  | #{(index + 1).to_s.rjust(search.movies.length.to_s.length)} - #{item.title.strip} (id: #{item.id})"
+              puts "  | #{' '.rjust(search.movies.length.to_s.length)}   AKA: #{item.also_known_as.join(', ').strip}" if item.also_known_as.any?
+            end
+
+            printf "  |\n  *- What's your choice (1..#{[search.movies.length, 20].min})? "
+            choice = STDIN.gets.chomp.to_i
+
+            break if choice.between?(1, [search.movies.length, 20].min)
+
+            puts "  | Invalid choice!"
+            puts "  |"
+          end
+
+          printf "  * Getting info from IMDB"
+          search.movies[choice - 1].id
+        else
+          search.movies.first.id rescue nil
+        end
+
+        media.imdb_movie = Imdb::Movie.new(media.imdb_id) if media.imdb_id
       end
 
-      puts " [DONE]"
+      begin
+        media.imdb_movie.year
+        puts " [DONE]" if feedback
+      rescue OpenURI::HTTPError => e
+        media.imdb_id = nil
+        media.imdb_movie = nil
+        puts (e.message =~ /404/ ? " [NOT FOUND]" : " [ERROR]") if feedback
+      rescue
+        if media.imdb_id.nil?
+          puts " [NOT FOUND]" if feedback
+        else
+          raise e
+        end
+      end
     end
 
     def tag(media)
@@ -181,13 +279,24 @@ module AppleTvConverter
         FileUtils.rm_r list_files(media.original_filename.gsub(File.extname(media.original_filename), '*.srt'))
         FileUtils.rm(media.backup_filename) if File.exists?(media.backup_filename)
 
-
         puts " [DONE]"
       rescue
         puts " [ERROR]"
       end
     end
 
+    def rename_to_plex_format(media)
+      printf "* Renaming to PLEX format"
+      begin
+        plex_format_filename = media.plex_format_filename
+        FileUtils.mv(media.converted_filename_equals_original_filename? ? media.original_filename : media.converted_filename, plex_format_filename) unless media.converted_filename == plex_format_filename
+
+        puts " [DONE]"
+      rescue => e
+        puts " [ERROR]"
+      end
+    end
+
     protected
 
       def list_files(ls)
@@ -204,16 +313,5 @@ module AppleTvConverter
 
         options
       end
-
-      def load_movie_from_imdb(media)
-        begin
-          search = Imdb::Search.new(media.show)
-
-          return search.movies.first if search.movies.count == 1
-        rescue
-        end
-
-        return nil
-      end
   end
 end

data/lib/apple_tv_converter/media_converter_mac_adapter.rb

@@ -8,7 +8,7 @@ module AppleTvConverter
           subtitle_filename =~ /\.(\w{3})\.srt$/i
           language_code = $1 || 'und'
 
-          language_name = get_language_name(language_code)
+          language_name = AppleTvConverter.get_language_name(language_code)
 
           command_line = [
             Shellwords.escape(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'SublerCLI'))),
@@ -24,10 +24,15 @@ module AppleTvConverter
 
           if RUBY_VERSION =~ /^1\.8/
             output, error = Open3.popen3(command_line) { |stdin, stdout, stderr| [ stdout.read, stderr.read ] }
-            puts error.strip == '' ? " [DONE]" : " [ERROR]"
+            puts error.strip == '' || error =~ /guessed encoding/i ? " [DONE]" : " [ERROR] #{error}"
           else
             output, error, exit_status = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| [ stdout.read, stderr.read, wait_thr.value ] }
-            puts exit_status.exitstatus == 0 ? " [DONE]" : " [ERROR]"
+            if exit_status.exitstatus == 0
+              puts" [DONE]"
+            else
+              puts " [ERROR]"
+              puts command_line
+            end
           end
         end
       else
@@ -36,45 +41,74 @@ module AppleTvConverter
     end
 
     def tag(media)
-      metadata = ''
-      if media.imdb_movie
-        metadata << %Q[{Name: #{media.imdb_movie.title.gsub(/"/, '\\"')}}]
-        metadata << %Q[{Genre: #{media.imdb_movie.genres.first.gsub(/"/, '\\"')}}]
-        metadata << %Q[{Description: #{media.imdb_movie.plot.gsub(/"/, '\\"')}}] if media.imdb_movie.plot
-        metadata << %Q[{Release Date: #{media.imdb_movie.year}}]
-        metadata << %Q[{Director: #{(media.imdb_movie.director.first || '').gsub(/"/, '\\"')}}]
-        metadata << %Q[{Codirector: #{media.imdb_movie.director[1].gsub(/"/, '\\"')}}] if media.imdb_movie.director.length > 1
-
-        if media.imdb_movie.poster
-          open(media.imdb_movie.poster) do |f|
-            File.open(media.artwork_filename,"wb") do |file|
-              file.puts f.read
-            end
-          end
-
-          metadata << %Q[{Artwork: #{media.artwork_filename}}]
+      metadata = {}
+
+      if media.is_tv_show_episode? && media.tvdb_movie
+        # ap [media.tvdb_movie[:show][:series], media.tvdb_movie[:episode]]
+        metadata['Name'] = media.tvdb_movie_data('EpisodeName')
+        metadata['Name'] ||= "#{media.show} S#{media.season.to_s.rjust(2, '0')}E#{media.number.to_s.rjust(2, '0')}"
+        metadata['Genre'] = media.tvdb_movie[:show][:series]['Genre'].gsub(/(?:^\|)|(?:\|$)/, '').split('|').first rescue nil
+        metadata['Description'] = media.tvdb_movie_data('Overview')
+        metadata['Release Date'] = media.tvdb_movie_data('FirstAired')
+        metadata['Director'] = media.tvdb_movie_data('Director')
+        metadata['TV Show'] = media.tvdb_movie[:show][:series]['SeriesName']
+        metadata['TV Show'] ||= media.show
+        metadata['TV Season'] = media.tvdb_movie_data('SeasonNumber')
+        metadata['TV Season'] ||= media.season
+        metadata['TV Episode #'] = media.tvdb_movie_data('EpisodeNumber')
+        metadata['TV Episode #'] ||= media.number
+        metadata['TV Network'] ||= media.tvdb_movie[:show][:series]['Network']
+        metadata['Screenwriters'] = media.tvdb_movie_data('Writer').gsub(/(?:^\|)|(?:\|$)/, '').split('|').join(', ') if media.tvdb_movie_data('Writer')
+
+        if media.imdb_movie
+          # Fallback to IMDB data if present
+          metadata['Genre'] ||= media.imdb_movie.genres.first if media.imdb_movie.genres && media.imdb_movie.genres.any?
+          metadata['Description'] ||= media.imdb_movie.plot if media.imdb_movie.plot
+          metadata['Release Date'] ||= media.imdb_movie.year if media.imdb_movie.year > 0
+          metadata['Director'] ||= media.imdb_movie.director.first
         end
-      end
-
-      if media.is_tv_show_episode?
-        metadata << %Q[{TV Show: #{media.show}}]
-        metadata << %Q[{TV Season: #{media.season}}]
-        metadata << %Q[{TV Episode #: #{media.number}}]
-      end
 
-      metadata << %Q[{HD Video: true}] if media.hd?
+        if File.exists?(media.tvdb_movie_poster)
+          AppleTvConverter.copy media.tvdb_movie_poster, media.artwork_filename
+          metadata['Artwork'] = media.artwork_filename
+        end
+      else
+        if media.imdb_movie
+          unless media.is_tv_show_episode?
+            metadata['Name'] = media.imdb_movie.title.gsub(/"/, '"')
+          end
+          metadata['Genre'] = media.imdb_movie.genres.first.gsub(/"/, '"')
+          metadata['Description'] = media.imdb_movie.plot.gsub(/"/, '"') if media.imdb_movie.plot
+          metadata['Release Date'] = media.imdb_movie.year if media.imdb_movie.year
+          metadata['Director'] = (media.imdb_movie.director.first || '').gsub(/"/, '"') if media.imdb_movie.director.any?
+          metadata['Codirector'] = media.imdb_movie.director[1].gsub(/"/, '"') if media.imdb_movie.director.length > 1
+
+          if media.imdb_movie.poster
+            AppleTvConverter.copy media.imdb_movie.poster, media.artwork_filename
+            metadata['Artwork'] = media.artwork_filename
+          end
+        end
 
-      if !media.imdb_movie
+        # Overwrite the name and genre to group the episode correctly
         if media.is_tv_show_episode?
-          metadata << %Q[{Name: #{media.show} S#{media.season.to_s.rjust(2, '0')}E#{media.number.to_s.rjust(2, '0')}}]
-          metadata << %Q[{Genre: #{media.genre}}]
-        else
-          metadata << %Q[{Name: #{media.show}}]
-          metadata << %Q[{Genre: #{media.genre}}]
+          metadata['Name'] = "#{media.show} S#{media.season.to_s.rjust(2, '0')}E#{media.number.to_s.rjust(2, '0')}"
+          # metadata['Genre'] = media.genre
+          metadata['TV Show'] = media.show
+          metadata['TV Season'] = media.season
+          metadata['TV Episode #'] = media.number
+        elsif !media.imdb_movie
+          metadata['Name'] = media.show
+          metadata['Genre'] = media.genre
         end
-
       end
 
+      metadata['HD Video'] = true if media.hd?
+      metadata['Media Kind'] = media.is_tv_show_episode? ? 'TV Show' : 'Movie'
+
+      metadata = metadata.map do |key, value|
+        value.nil? ? nil : %Q[{#{key}: #{value.to_s.gsub(/"/, '\\"')}}]
+      end.compact.join
+
       command_line = [
         Shellwords.escape(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'SublerCLI'))),
         %Q[-metadata "#{metadata}"],
@@ -115,7 +149,7 @@ module AppleTvConverter
         command_line = [
           'osascript <<EOF',
           'tell application "iTunes"',
-          %Q[add POSIX file "#{media.converted_filename.gsub(/"/, '\\"')}"],
+          %Q[add POSIX file "#{media.resulting_filename.gsub(/"/, '\\"')}"],
           'end tell',
           'EOF'
         ].join("\n")

data/lib/apple_tv_converter/media_converter_windows_adapter.rb

@@ -2,68 +2,18 @@ module AppleTvConverter
   class MediaConverterWindowsAdapter < MediaConverterAdapter
     require 'win32ole'
 
-    def add_subtitles(media)
-      puts "* Adding subtitles"
-
-      printf "  * Removing any previous subtitles"
-
-      command_line = %Q[./SublerCLI -remove -dest "#{media.converted_filename}"]
-
-      AppleTvConverter.logger.debug "Executing:"
-      AppleTvConverter.logger.debug command_line
-
-      output = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| stdout.read }
-
-      puts output.strip.empty? ? " [DONE]" : (output.strip == 'Error: (null)' ? " [NONE FOUND]" : " [ERROR]")
-
-      if has_subtitles?(media)
-        list_files(File.join(File.dirname(media.original_filename), '*.srt')).map do |subtitle_filename|
-          subtitle_filename =~ /(\w{3})\.srt$/
-          language_code = $1 || 'eng'
-
-          language = ::LanguageList::LanguageInfo.find_by_iso_639_3(language_code)
-          language ||= ::LanguageList::LanguageInfo.find_by_iso_639_3('eng')
-
-
-          command_line = "./SublerCLI "
-          command_line << %Q[-source "#{subtitle_filename}" ]
-          command_line << %Q[-language "#{language.name}" ]
-          command_line << %Q[-dest "#{media.converted_filename}"]
-
-          AppleTvConverter.logger.debug "Executing:"
-          AppleTvConverter.logger.debug command_line
-
-          printf "  * Adding #{language.name} subtitles"
-          output = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| stdout.read }
-
-          puts output.strip.empty? ? " [DONE]" : " [ERROR]"
-        end
-      else
-        puts "  * No new subtitles found"
-      end
+    def handbrake_location
+      return File.expand_path("./HandBrakeCLI#{'_x64' if is_windows_64bit?}.exe")
     end
 
-    def tag(media)
-      metadata = ''
-      metadata << %Q[{Name: #{media.show} S#{media.season.to_s.rjust(2, '0')}E#{media.number.to_s.rjust(2, '0')}}] if media.is_tv_show_episode?     
-      metadata << %Q[{Name: #{media.show}}] if media.is_movie?
-      metadata << %Q[{Genre: #{media.show}}{TV Show: #{media.show}}{TV Season: #{media.season}}{TV Episode #: #{media.number}}] if media.is_tv_show_episode?
-      metadata << %Q[{Genre: #{media.quality} Movie}] if media.is_movie?
-
-      command_line = %Q[./SublerCLI -metadata "#{metadata}" -dest "#{media.converted_filename}"]
-
-      AppleTvConverter.logger.debug "Executing:"
-      AppleTvConverter.logger.debug command_line
-
-      printf "* Tagging"
-
-      output = Open3.popen3(command_line) { |stdin, stdout, stderr, wait_thr| stdout.read }
-
-      puts output.strip.empty? ? " [DONE]" : " [ERROR]"
-
-      return output.strip.empty?
+    def atomic_parsley_location
+      return File.expand_path('./AtomicParsley.exe')
     end
 
+    def clean_up_command_line(command_line)
+      return command_line.gsub(/\//, '\\')
+    end
+    
     def add_to_itunes(episode)
       printf "* Adding to iTunes"
       @itunes ||= WIN32OLE.new("iTunes.Application")
@@ -73,23 +23,6 @@ module AppleTvConverter
       puts " [DONE]"
     end
 
-    def list_files(ls)
-      `ls -1 #{ls.gsub(/\s/, '\ ').gsub(/\[/, '\[').gsub(/\]/, '\]')} 2>/dev/null`.split("\n")
-    end
-
-
-    def handbrake_location
-      return File.expand_path("./HandBrakeCLI#{'_x64' if is_windows_64bit?}.exe")
-    end
-
-    def atomic_parsley_location
-      return File.expand_path('./AtomicParsley.exe')
-    end
-
-    def clean_up_command_line(command_line)
-      return command_line.gsub(/\//, '\\')
-    end
-    
     def line_ending
     end