apple-tv-converter 0.6.2 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.7.0
+------
+* Added support for fetching metadata from themoviedb.org
+* Performed some reengineering of the metadata services, in order to simplify adding more providers
+* Fixed some bugs
+
 v0.6.2
 ------
 * Added the missing VERSION file

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    apple-tv-converter (0.6.0)
+    apple-tv-converter (0.7.0)
       httparty (~> 0)
       imdb (~> 0.6, >= 0.6.8)
       language_list (~> 0.0, >= 0.0.3)
       libxml-ruby (~> 2.7, >= 2.7.0)
+      rest-client (~> 1.7.2, >= 1.7.2)
       rubyzip (~> 0.9, >= 0.9.9)
       streamio-ffmpeg (~> 0.9, >= 0.9.0)
 
@@ -13,27 +14,32 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    httparty (0.13.0)
+    httparty (0.13.1)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    imdb (0.8.1)
-      nokogiri (>= 1.6.0)
+    imdb (0.8.2)
+      nokogiri (= 1.6.2.1)
     json (1.8.1)
     language_list (0.1.0)
     libxml-ruby (2.7.0)
+    mime-types (2.3)
     mini_portile (0.6.0)
     multi_xml (0.5.5)
+    netrc (0.7.7)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
     rake (0.9.6)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
+    rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
+    rspec-mocks (2.14.6)
     rubyzip (0.9.9)
     streamio-ffmpeg (0.9.0)
 

data/README.md

@@ -66,7 +66,8 @@ Common options:
 
 ### Metadata
 
-Metadata can be obtained automatically from IMDB.com(http://www.imdb.com) (for movies) or from TheTVDB.com(http://www.thetvdb.com) (for TV show episodes). The latter also falls back to IMDB for necessary information. Most metadata will be filled, including the file's artwork, so it displays a nice image on iTunes library.
+Metadata can be obtained automatically from themoviedb.org(http://www.themoviedb.org) (for movies) or from TheTVDB.com(http://www.thetvdb.com) (for TV show episodes).
+Both fall back to IMDB.com(http://www.imdb.com) for necessary information. Most metadata will be filled, including the file's artwork, so it displays a nice image on iTunes library.
 
 #### Fallbacks
 

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.7.0

data/lib/apple_tv_converter.rb

@@ -15,6 +15,7 @@ require 'net/http'
 require 'uri'
 require 'base64'
 require 'zlib'
+require 'rest_client'
 
 module AppleTvConverter
 
@@ -113,6 +114,7 @@ module AppleTvConverter
     # ice - Icelandic -> isl
     # ita - Italian
     # jpn - Japanese
+    # jap - Japanese -> jpn
     # kor - Korean
     # lav - Latvian
     # lit - Lithuanian
@@ -139,6 +141,7 @@ module AppleTvConverter
       'gre' => 'ell',
       'ice' => 'isl',
       'rum' => 'ron',
+      'jap' => 'jpn',
       'may' => nil
     }
 
@@ -161,7 +164,10 @@ require 'apple_tv_converter/media_converter'
 require 'apple_tv_converter/media'
 require 'apple_tv_converter/movie_hasher'
 require 'apple_tv_converter/subtitles_fetcher/opensubtitles'
-require 'apple_tv_converter/tv_db_fetcher'
+require 'apple_tv_converter/metadata/info'
+require 'apple_tv_converter/metadata/imdb'
+require 'apple_tv_converter/metadata/tv_db'
+require 'apple_tv_converter/metadata/movie_db'
 require 'apple_tv_converter/media_converter_adapter'
 require 'apple_tv_converter/media_converter_windows_adapter' if RUBY_PLATFORM =~ /(win|w)(32|64)$/
 require 'apple_tv_converter/media_converter_mac_adapter' if RUBY_PLATFORM =~ /(darwin)/

data/lib/apple_tv_converter/command_line.rb

@@ -44,6 +44,7 @@ module AppleTvConverter
         options.interactive = true
         options.imdb_id = nil
         options.tvdb_id = nil
+        options.tmdb_id = nil
         options.use_absolute_numbering = false
         options.episode_number_padding = nil
         options.languages = []
@@ -58,31 +59,40 @@ module AppleTvConverter
                         "       [file] must be provided unless the -d (--dir) switch is present.\n"
 
           opts.on('-i', '--id id', "Set a specific id for fetching metadata from online services") do |id|
-            raise ArgumentError.new("Can't supply both --id and --imdb_id or --tvdb_id at the same time!") if id_switch > 0
+            raise ArgumentError.new("Can't supply both --id and --imdb_id, --tvdb_id, or --tmdb_id at the same time!") if id_switch > 0
 
-            id_switch = 3
+            id_switch = 7
             options.imdb_id = id
             options.tvdb_id = id
+            options.tmdb_id = id
           end
 
           opts.on('--imdb_id id', "Set a specific id for fetching metadata from IMDB") do |id|
-            raise ArgumentError.new("Can't supply both --id and --imdb_id or --tvdb_id at the same time!") if id_switch & 1 > 0
+            raise ArgumentError.new("Can't supply both --id and --imdb_id, --tvdb_id, or --tmdb_id at the same time!") if id_switch & 1 > 0
 
             id_switch |= 1
             options.imdb_id = id
           end
 
           opts.on('--tvdb_id id', "Set a specific id for fetching metadata from TheTVDB") do |id|
-            raise ArgumentError.new("Can't supply both --id and --imdb_id or --tvdb_id at the same time!") if id_switch & 2 > 0
+            raise ArgumentError.new("Can't supply both --id and --imdb_id, --tvdb_id, or --tmdb_id at the same time!") if id_switch & 2 > 0
 
             id_switch |= 2
             options.tvdb_id = id
           end
 
+          opts.on('--tmdb_id id', "Set a specific id for fetching metadata from TheTVDB") do |id|
+            raise ArgumentError.new("Can't supply both --id and --imdb_id, --tvdb_id, or --tmdb_id at the same time!") if id_switch & 4 > 0
+
+            id_switch |= 4
+            options.tmdb_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')
+            options.languages.map!(&:to_sym)
           end
 
           opts.on('-d', '--dir DIRECTORY', 'Process all files in DIRECTORY recursively') do |dir|

data/lib/apple_tv_converter/media.rb

@@ -5,6 +5,7 @@ module AppleTvConverter
     attr_accessor :tvdb_movie
     attr_accessor :network, :tvdb_id, :tvdb_season_id, :tvdb_episode_id, :first_air_date, :release_date, :episode_title
     attr_accessor :use_absolute_episode_numbering, :episode_number_padding
+    attr_accessor :tmdb_id
     attr_reader :original_filename
 
     def self.subtitle_extensions ; ['srt', 'sub', 'ssa', 'ass'] ; end
@@ -156,7 +157,7 @@ module AppleTvConverter
     end
 
     def tvdb_movie_poster
-      local_file = AppleTvConverter::TvDbFetcher.get_poster(self)
+      local_file = AppleTvConverter::Metadata::TvDb.get_poster(self)
 
       unless File.exists?(local_file)
         artwork_filename = imdb_movie.poster if imdb_movie && imdb_movie.poster
@@ -167,19 +168,41 @@ module AppleTvConverter
       local_file
     end
 
+    def metadata ; @metadata ||= Metadata::Info.new(self) ; end
+
     def get_new_subtitle_filename(language, subid = nil)
       dir_name = File.dirname(original_filename)
       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 get_metadata_id(service, type)
+      @metadata_id ||= {}
+      @metadata_id[type.to_sym] ||= {}
+      return @metadata_id[type.to_sym][service.to_sym] rescue nil
+    end
+
+    def set_metadata_id(service, type, id)
+      @metadata_id ||= {}
+      @metadata_id[type.to_sym] ||= {}
+      @metadata_id[type.to_sym].store service.to_sym, id.to_s.gsub(/\D+/, '')
+    end
+
+    def set_metadata_id_if_not_set(service, type, id)
+      @metadata_id ||= {}
+      @metadata_id[type.to_sym] ||= {}
+      @metadata_id[type.to_sym].store(service.to_sym, id.to_s.gsub(/\D+/, '')) unless @metadata_id[type.to_sym].has_key?(service.to_sym)
+    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
+      data.delete :tvdb_id
+      data.delete :imdb_id
+      data.delete :tmdb_id
       data[:episode_number_padding] = self.episode_number_padding if self.episode_number_padding
       data[:use_absolute_episode_numbering] = self.use_absolute_episode_numbering if self.use_absolute_episode_numbering
+      data[:metadata_id] = @metadata_id
 
       if self.is_tv_show_episode?
         episode_data = {}
@@ -202,11 +225,21 @@ module AppleTvConverter
         begin
           if has_data_file?
             data = YAML.load_file(data_file)
-            self.tvdb_id = data[:tvdb_id] if !self.tvdb_id && data.has_key?(:tvdb_id)
-            self.imdb_id = data[:imdb_id] if !self.imdb_id && data.has_key?(:imdb_id)
+            self.tvdb_id ||= data[:tvdb_id] if !self.tvdb_id && data.has_key?(:tvdb_id)
+            self.imdb_id ||= data[:imdb_id] if !self.imdb_id && data.has_key?(:imdb_id)
+            self.tmdb_id ||= data[:tmdb_id] if !self.tmdb_id && data.has_key?(:tmdb_id)
             @episode_number_padding = data[:episode_number_padding] if !@episode_number_padding && data.has_key?(:episode_number_padding)
             @use_absolute_episode_numbering = data[:use_absolute_episode_numbering] if !@use_absolute_episode_numbering && data.has_key?(:use_absolute_episode_numbering)
+
+            @metadata_id = data[:metadata_id] if data.has_key?(:metadata_id)
           end
+
+          @metadata_id ||= { :show => {} }
+          @metadata_id[:show][:imdb] ||= self.imdb_id
+          @metadata_id[:show][:tvdb] ||= self.tvdb_id
+          @metadata_id[:show][:tmdb] ||= self.tmdb_id
+
+          puts @metadata_id
         rescue => e
           ap ['e', e]
         end

data/lib/apple_tv_converter/media_converter.rb

@@ -68,7 +68,7 @@ module AppleTvConverter
         end
       end
 
-      if @options.skip_subtitles != true && @options.download_subtitles && media.subtitle_streams.select { |s| @options.languages.include?(s.language.to_s) }.empty? && @adapter.list_files(media.original_filename.gsub(/.{4}$/, '.*srt')).empty?
+      if @options.skip_subtitles != true && @options.download_subtitles && media.subtitle_streams.select { |s| @options.languages.include?(s.language.to_sym) }.empty? && @adapter.list_files(media.original_filename.gsub(/.{4}$/, '.*srt')).empty?
         @adapter.search_subtitles(media, @options.languages)
         @adapter.download_subtitles(media, @options.languages)
       end
@@ -96,9 +96,14 @@ module AppleTvConverter
     private
 
       def apply_options_to_media!(media)
-        # Load IMDB id from options
+        # Load metadata service id's from options
         media.imdb_id ||= @options.imdb_id
         media.tvdb_id ||= @options.tvdb_id
+        media.tmdb_id ||= @options.tmdb_id
+
+        media.set_metadata_id :imdb, :show, @options.imdb_id if @options.imdb_id
+        media.set_metadata_id :tvdb, :show, @options.tvdb_id if @options.tvdb_id
+        media.set_metadata_id :tmdb, :show, @options.tmdb_id if @options.tmdb_id
 
         media.season = @options.season if @options.season
         media.number = @options.episode if @options.episode

data/lib/apple_tv_converter/media_converter_adapter.rb

@@ -190,102 +190,9 @@ module AppleTvConverter
     end
 
     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
-
-        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})"
-              if item.also_known_as.any?
-                akas = item.also_known_as[0...5].each do |aka|
-                  puts "  | #{' '.rjust(search.movies.length.to_s.length)}   AKA: #{(aka.is_a?(Hash) ? aka[:title] : aka).strip}"
-                end
-              end
-            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
-
-      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
+      has_metadata = Metadata::TvDb.search(media, conversion_options.interactive) if media.is_tv_show_episode?
+      has_metadata = Metadata::MovieDb.get_metadata(media, conversion_options.interactive) unless media.is_tv_show_episode?
+      has_metadata ||= Metadata::Imdb.get_metadata(media, conversion_options.interactive)
     end
 
     def tag(media)

data/lib/apple_tv_converter/media_converter_mac_adapter.rb

@@ -43,72 +43,29 @@ module AppleTvConverter
     def tag(media)
       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_season_number || media.season
-        metadata['TV Episode #'] = media.tvdb_episode_number || 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')
-
-        # Set Sort metadata fields for iOS 5
-        metadata['Sort Name'] = media.name
-        metadata['Sort Album'] = media.show
-        metadata['Sort Album Artist'] = media.show
-        metadata['Sort Composer'] = media.show
-        metadata['Sort Show'] = "#{media.show} Season #{(media.tvdb_season_number || media.season).to_s.rjust(2, '0')}"
-
-        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
+      metadata['Name'] = media.metadata.name
+      metadata['Genre'] = media.metadata.genre
+      metadata['Description'] = media.metadata.description
+      metadata['Release Date'] = media.metadata.release_date
+      metadata['Director'] = media.metadata.director
+      metadata['Screenwriters'] = media.metadata.screenwriters
+      metadata['Artwork'] = media.metadata.artwork
+      metadata['Sort Name'] = media.metadata.sort_name
+      metadata['HD Video'] = true if media.hd?
+      metadata['Media Kind'] = media.is_tv_show_episode? ? 'TV Show' : 'Movie'
 
-        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(/"/, '"') if media.imdb_movie.genres.any?
-          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.is_tv_show_episode?
+        metadata['TV Show'] = media.metadata.tv_show
+        metadata['TV Season'] = media.metadata.tv_show_season
+        metadata['TV Episode #'] = media.metadata.tv_show_episode
+        metadata['TV Network'] = media.metadata.tv_network
 
-        # Overwrite the name and genre to group the episode correctly
-        if media.is_tv_show_episode?
-          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
+        metadata['Sort Album'] = media.metadata.sort_album
+        metadata['Sort Album Artist'] = media.metadata.sort_album_artist
+        metadata['Sort Composer'] = media.metadata.sort_composer
+        metadata['Sort TV Show'] = media.metadata.sort_show
       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(/"/, '\\"')}}]