apple-tv-converter 0.5.9 → 0.6.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.6.0
+------
+* Added command line option to allow resizing the converted video
+* Enchanced the --os option to allow supplying an username:password combination
+* Other fixes
+
 v0.5.9
 ------
 * Fixed #5 Command line options now correctly override the data file (thanks @shir)

data/README.md

@@ -19,7 +19,7 @@ Usage: apple-tv-converter [options] [file]
     -l, --languages eng,por,...      Only keep audio and subtitles in the specified languages
     -d, --dir DIRECTORY              Process all files in DIRECTORY recursively
         --itunes                     Add processed file to iTunes library, if it isn't present yet
-        --os                         Download subtitles and infer IMDB ID from opensubtitles.org
+        --os [USERNAME:PASSWORD]     Download subtitles and infer IMDB ID from opensubtitles.org
         --plex                       Rename file(s) to Plex Media Server recommended format
 
         --no-transcoding             Don't transcode video or audio
@@ -35,6 +35,8 @@ Advanced options:
                                      Set the episode number padding length (ie, 3 for 001, 002, etc.)
     -s, --season NUMBER              Set the season number for TV Shows in case folder/file naming scheme doesn't contain right season
     -e, --episode NUMBER             Set the episode number for TV Shows in case folder/file naming scheme doesn't contain right episode number
+        --width NUMBER               Resize the video to the specified width. If used with --height, can result in a different aspect ratio
+        --height NUMBER              Resize the video to the specified height. If used with --width, can result in a different aspect ratio
 
 Other options:
     -f, --ffmpeg LOCATION            Set path to ffmpeg binary

data/gems/streamio-ffmpeg/lib/ffmpeg/movie.rb

@@ -49,14 +49,14 @@ module FFMPEG
       @audio_stream = $1
 
       if video_stream
-        @video_codec, @colorspace, resolution, video_bitrate = video_stream.split(/\s?,\s?/)
+        @video_codec, @colorspace, resolution, video_bitrate = video_stream.scan(/([^,()\[\]]+(?:\s*(?:\[|\().*?(?:\]|\)))*)\s?,?\s?/).flatten
         @video_bitrate = video_bitrate =~ %r(\A(\d+) kb/s\Z) ? $1.to_i : nil
         @resolution = resolution.split(" ").first rescue nil # get rid of [PAR 1:1 DAR 16:9]
         @dar = $1 if video_stream[/DAR (\d+:\d+)/]
       end
 
       if audio_stream
-        @audio_codec, audio_sample_rate, @audio_channels, unused, audio_bitrate = audio_stream.split(/\s?,\s?/)
+        @audio_codec, audio_sample_rate, @audio_channels, unused, audio_bitrate = audio_stream.scan(/([^,()\[\]]+(?:\s*(?:\[|\().*?(?:\]|\)))*)\s?,?\s?/).flatten
         @audio_bitrate = audio_bitrate =~ %r(\A(\d+) kb/s(?: \(default\))?\Z) ? $1.to_i : nil
         @audio_sample_rate = audio_sample_rate[/\d*/].to_i
       end

data/gems/streamio-ffmpeg/lib/ffmpeg/stream.rb

@@ -13,8 +13,12 @@ module FFMPEG
       attr_writer :subtitle_codec, :subtitle_format
 
       def audio_channels=(value)
-        if value.strip =~ /^(\d+)\.(\d+)$/
+        if value.strip =~ /^(\d+)\.(\d+)(?:\(.*?\))?$/
           @audio_channels = [$1.to_i + $2.to_i, 6].min
+        elsif value.strip =~ /stereo/i
+          @audio_channels = 2
+        elsif value.strip =~ /mono/i
+          @audio_channels = 1
         else
           @audio_channels = value
         end

data/lib/apple_tv_converter/command_line.rb

@@ -50,6 +50,8 @@ module AppleTvConverter
         options.media = []
         options.season = nil
         options.episode = nil
+        options.width = -1
+        options.height = -1
 
         opts = OptionParser.new do |opts|
           opts.banner = "Usage: apple-tv-converter [options] [file]\n" +
@@ -101,8 +103,15 @@ module AppleTvConverter
             options.add_to_itunes = true
           end
 
-          opts.on('--os', "Download subtitles and infer IMDB ID from opensubtitles.org") do |i|
+          opts.on('--os [USERNAME:PASSWORD]', "Download subtitles and infer IMDB ID from opensubtitles.org") do |username_password|
             options.download_subtitles = true
+            if username_password =~ /^(.*?)\:(.*?)/
+              options.download_subtitles_username = $1 if username_password =~ /^(.+?)\:.+$/
+              options.download_subtitles_password = $1 if username_password =~ /^.+?\:(.+)$/
+            end
+
+            options.download_subtitles_username = nil if options.download_subtitles_username == ''
+            options.download_subtitles_password = nil if options.download_subtitles_password == ''
           end
 
           opts.on('--plex', 'Rename file(s) to Plex Media Server recommended format') do
@@ -155,6 +164,16 @@ module AppleTvConverter
             options.episode = i.to_i
           end
 
+          opts.on('--width NUMBER', 'Resize the video to the specified width. If used with --height, can result in a different aspect ratio') do |i|
+            options.width = i.to_i
+            options.width -= options.width % 2 # Ensure it's always a even number
+          end
+
+          opts.on('--height NUMBER', 'Resize the video to the specified height. If used with --width, can result in a different aspect ratio') do |i|
+            options.height = i.to_i
+            options.height -= options.height % 2 # Ensure it's always a even number
+          end
+
           opts.separator ""
           opts.separator "Other options:"
 

data/lib/apple_tv_converter/filename_parser.rb

@@ -29,8 +29,8 @@ module AppleTvConverter
     end
 
     def format1_match
-      # /.*?S(\d+)E(\d+)(?:(?:[-E]+(\d+))*).*?/ -> S00E01, S00E01(E02)+, S00E01(-E02)+, S00E01(-02)+
-      @format1_match ||= basename.match(/.*?S(\d+)E(\d+)(?:(?:[-E]+(\d+))*).*?/i)
+      # /.*?S(\d+)E(\d+)(?:(?:[-E]+(\d+))*).*?/ -> S00E01, S00E01(E02)+, S00E01(-E02)+, S00E01(-02)+, S00 E01( E02)+
+      @format1_match ||= basename.match(/.*?S(\d+)\s*E(\d+)(?:(?:[-E]+(\d+)\s*)*).*?/i)
     end
 
     def format2_match

data/lib/apple_tv_converter/media.rb

@@ -14,19 +14,7 @@ module AppleTvConverter
     def original_filename=(value)
       @original_filename = value
 
-      if @original_filename =~ /.*?\.mp4$/
-        Dir[@original_filename.gsub(File.extname(@original_filename), '*')].each do |file|
-          if @original_filename != file && !(Media.subtitle_extensions + Media.ignored_extensions).include?(file.downcase.gsub(/.*\./, ''))
-            @original_filename = file
-            break
-          end
-        end
-      end
-
-      if converted_filename == original_filename && needs_transcoding?
-        @converted_filename = original_filename.gsub(File.extname(original_filename), "_2#{File.extname(original_filename)}")
-        @converted_filename_equals_original_filename = true
-      end
+      check_filename_clashing
 
       load_data_file
 
@@ -120,7 +108,21 @@ module AppleTvConverter
 
     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 || ffmpeg_data.video_stream =~ /h264.*?yuv420p10le/i ; end
+    def needs_video_conversion?
+      return [
+        ffmpeg_data.video_codec !~ /(?:.*?h264|^mpeg4).*/i,
+        ffmpeg_data.video_codec =~ /.*(?:xvid|divx).*/i,
+        ffmpeg_data.video_stream =~ /h264.*?yuv420p10le/i,
+        needs_video_resizing?
+      ].any?
+    end
+
+    def needs_video_resizing?
+      return [
+        movie_width > 0 && movie_width != ffmpeg_data.width,
+        movie_height > 0 && movie_height != ffmpeg_data.height
+      ].any?
+    end
 
     def needs_subtitles_conversion? ; return ffmpeg_data.subtitle_streams.any? ; end
 
@@ -132,6 +134,22 @@ module AppleTvConverter
 
     def movie_hash ; @movie_hash ||= AppleTvConverter::MovieHasher.compute_hash(original_filename) ; end
 
+    def movie_width ; @movie_width || 0 ; end
+    def movie_width=(value)
+      @movie_width = value
+      assert_movie_dimensions!
+      check_filename_clashing
+      @movie_width
+    end
+
+    def movie_height ; @movie_height || 0 ; end
+    def movie_height=(value)
+      @movie_height = value
+      assert_movie_dimensions!
+      check_filename_clashing
+      @movie_height
+    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
@@ -193,5 +211,33 @@ module AppleTvConverter
           ap ['e', e]
         end
       end
+
+      def assert_movie_dimensions!
+        if movie_width > 0 && movie_height <= 0
+          @movie_height = ffmpeg_data.height.to_f * (movie_width.to_f / ffmpeg_data.width.to_f)
+          @movie_height -= @movie_height % 2
+          @movie_height = @movie_height.to_i
+        elsif movie_width <= 0 && movie_height > 0
+          @movie_width = ffmpeg_data.width.to_f * (movie_height.to_f / ffmpeg_data.height.to_f)
+          @movie_width -= movie_width % 2
+          @movie_width = @movie_width.to_i
+        end
+      end
+
+      def check_filename_clashing
+        if @original_filename =~ /.*?\.mp4$/
+          Dir[@original_filename.gsub(File.extname(@original_filename), '*')].each do |file|
+            if @original_filename != file && !(Media.subtitle_extensions + Media.ignored_extensions).include?(file.downcase.gsub(/.*\./, ''))
+              @original_filename = file
+              break
+            end
+          end
+        end
+
+        if converted_filename == original_filename && needs_transcoding?
+          @converted_filename = original_filename.gsub(File.extname(original_filename), "_2#{File.extname(original_filename)}")
+          @converted_filename_equals_original_filename = true
+        end
+      end
   end
 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.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_s) }.empty? && @adapter.list_files(media.original_filename.gsub(/.{4}$/, '.*srt')).empty?
         @adapter.search_subtitles(media, @options.languages)
         @adapter.download_subtitles(media, @options.languages)
       end
@@ -104,6 +104,8 @@ module AppleTvConverter
         media.number = @options.episode if @options.episode
         media.use_absolute_episode_numbering = @options.use_absolute_numbering
         media.episode_number_padding = @options.episode_number_padding if @options.episode_number_padding
+        media.movie_width = @options.width if @options.width > 0
+        media.movie_height = @options.height if @options.height > 0
       end
   end
 end

data/lib/apple_tv_converter/media_converter_adapter.rb

@@ -10,7 +10,7 @@ module AppleTvConverter
 
     def search_subtitles(media, languages)
       # Load the subtitles into memory and get IMDB id from them
-      AppleTvConverter::SubtitlesFetcher::Opensubtitles.new(languages) do |fetcher|
+      AppleTvConverter::SubtitlesFetcher::Opensubtitles.new(languages, self.conversion_options.download_subtitles_username, self.conversion_options.download_subtitles_password) do |fetcher|
         fetcher.search_subtitles media do |subtitles|
           media.imdb_id = subtitles.first['IDMovieImdb'] if media.imdb_id.nil? || media.imdb_id.to_s.strip == ''
         end
@@ -18,17 +18,37 @@ module AppleTvConverter
     end
 
     def download_subtitles(media, languages)
-      AppleTvConverter::SubtitlesFetcher::Opensubtitles.new(languages) do |fetcher|
+      AppleTvConverter::SubtitlesFetcher::Opensubtitles.new(languages, self.conversion_options.download_subtitles_username, self.conversion_options.download_subtitles_password) do |fetcher|
         if fetcher.has_found_subtitles?(media)
-          printf "* Downloading subtitles"
-          fetcher.download_subtitles media do |step, subtitles|
+          printf "* Downloading subtitles#{%Q[ using user "#{self.conversion_options.download_subtitles_username}"] unless self.conversion_options.download_subtitles_username.nil?}"
+          status = {
+            :total => 0,
+            :ok => 0,
+            :error => 0
+          }
+
+          fetcher.download_subtitles media do |step, subtitles, message|
             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]"
+              when :search          then puts %Q[ (#{subtitles.map { |l, subs| "#{subs.count} #{AppleTvConverter.get_language_name(l)}" }.join(', ') })]
+              when :downloading
+                status[:total] += 1
+                printf "  * Downloading: \##{subtitles['IDSubtitleFile']} (#{AppleTvConverter.get_language_name(subtitles['SubLanguageID'])}) - #{subtitles['SubFileName']}"
+              when :downloaded      then
+                status[:ok] += 1
+                puts " [DONE]"
+              when :download_failed then
+                status[:error] += 1
+                puts " [ERROR - #{message}]"
             end
           end
-          puts "  * All subtitles downloaded"
+
+          if status[:total] == status[:ok]
+            puts "  * All subtitles downloaded"
+          elsif status[:total] == status[:error]
+            puts "  * Couldn't download any subtitle"
+          else
+            puts "  * Downloaded #{status[:ok]} of #{status[:total]} subtitles"
+          end
         else
           puts "* No subtitles found to download"
         end
@@ -71,7 +91,7 @@ module AppleTvConverter
     end
 
     def transcode(media, languages = nil)
-      if media.needs_transcoding?
+      if media.needs_transcoding? || needs_transformation?(media)
         puts "* Transcoding"
 
         options = {}
@@ -83,10 +103,7 @@ module AppleTvConverter
 
         # Better video and audio transcoding quality
         if media.needs_video_conversion?
-          # Ensure divisible by 2 width and height
-          dimensions = "-s #{(media.ffmpeg_data.width % 2 > 0) ? (media.ffmpeg_data.width + 1) : media.ffmpeg_data.width}x#{(media.ffmpeg_data.height % 2 > 0) ? (media.ffmpeg_data.height + 1) : media.ffmpeg_data.height}" if media.ffmpeg_data.width % 2 > 0 || media.ffmpeg_data.height % 2 > 0
-
-          options[:extra] << " #{dimensions} -mbd rd -flags +mv4+aic -trellis 2 -cmp 2 -subcmp 2 -g 300 -pass 1 -q:v 1 -r 23.98"
+          options[:extra] << " #{get_transcoded_dimensions_options(media)} -mbd rd -flags +mv4+aic -trellis 2 -cmp 2 -subcmp 2 -g 300 -pass 1 -q:v 1 -r 23.98 -pix_fmt yuv420p"
         end
 
         if media.needs_audio_conversion?
@@ -319,6 +336,10 @@ module AppleTvConverter
         list_files(File.join(File.dirname(media.original_filename), '*.srt')).any?
       end
 
+      def needs_transformation?(media)
+        media.needs_video_resizing?
+      end
+
       def get_transcode_options(media)
         options =  " -vcodec #{media.needs_video_conversion? ? 'libx264' : 'copy'}"
         options << " -acodec #{media.needs_audio_conversion? ? 'libfaac' : 'copy'}"
@@ -333,5 +354,9 @@ module AppleTvConverter
 
         audio_channels
       end
+
+      def get_transcoded_dimensions_options(media)
+        "-s #{(media.movie_width % 2 > 0) ? (media.movie_width + 1) : media.movie_width}x#{(media.movie_height % 2 > 0) ? (media.movie_height + 1) : media.movie_height}" if media.needs_video_resizing?
+      end
   end
 end

data/lib/apple_tv_converter/subtitles_fetcher/opensubtitles.rb

@@ -3,8 +3,10 @@ module AppleTvConverter
     class Opensubtitles
       attr_reader :languages, :token
 
-      def initialize(languages)
+      def initialize(languages, username = nil, password = nil)
         @languages = languages
+        @username = username
+        @password = password
         @server = XMLRPC::Client.new(SERVER, PATH, PORT)
         @token = nil
 
@@ -73,8 +75,12 @@ module AppleTvConverter
         media_subtitles.each do |language_code, subtitles|
           subtitles.each do |subtitle|
             block.call :downloading, subtitle
-            download_subtitle(media, subtitle)
-            block.call :downloaded, subtitle
+            result = download_subtitle(media, subtitle)
+            if result == true
+              block.call :downloaded, subtitle
+            else
+              block.call :download_failed, subtitle, result
+            end
           end
         end
       end
@@ -92,7 +98,7 @@ module AppleTvConverter
         def logged_in? ; return !@token.nil? ; end
 
         def login
-          response = make_call("LogIn", '', '', '', USER_AGENT)
+          response = make_call("LogIn", @username || '', @password || '', '', USER_AGENT)
           parse_response! response
 
           @token = response['token'] if response[:success]
@@ -180,6 +186,10 @@ module AppleTvConverter
                 File.open(media.get_new_subtitle_filename(subtitle['SubLanguageID'], subtitle_data['idsubtitlefile']), 'wb') { |file| file.write(unzipped_data) }
               end
             end
+
+            return true
+          else
+            return response['status']
           end
         end
 

data/lib/apple_tv_converter/version.rb

@@ -1,3 +1,3 @@
 module AppleTvConverter
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple-tv-converter
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec