apple-tv-converter 0.5.6 → 0.5.7

data/CHANGELOG

@@ -1,6 +1,15 @@
+v0.5.7
+------
+* Added "--season" option (thanks @shir)
+* Added "--episode" option
+* Added "--imdb_id" option
+* Added "--tvdb_id" option
+* Updated "--id" option to set both IMDB and TheTVDB ids
+* Fixed #1 Couldn't parse filename
+
 v0.5.6
 ------
-* Fixed "[libfaac @ 0x7ff7bc0e6e00] Specified channel layout '2.1' is not supported" error
+* Fixed "libfaac: Specified channel layout '2.1' is not supported" error
 
 v0.5.5
 ------

data/README.md

@@ -14,6 +14,8 @@ Now, it also supports automatically downloading subtitles from [opensubtitles.or
 Usage: apple-tv-converter [options] [file]
        [file] must be provided unless the -d (--dir) switch is present.
     -i, --id id                      Set a specific id for fetching metadata from online services
+        --imdb_id id                 Set a specific id for fetching metadata from IMDB
+        --tvdb_id id                 Set a specific id for fetching metadata from TheTVDB
     -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
@@ -31,6 +33,8 @@ Advanced options:
         --use-absolute-numbering     Use absolute numbering for TV Show episodes (specially useful for cartoons)
         --episode-number-padding NUMBER
                                      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
 
 Other options:
     -f, --ffmpeg LOCATION            Set path to ffmpeg binary
@@ -77,7 +81,7 @@ For Plex Media Server users, you can pass the command-line option `--plex` to au
 
 ### Other remarks
 
-After conversion, `apple-tv-converter` will create a file named `.apple-tv-converter.data` on the base directory of the file containing some information (IMDB id, TheTVDB id, etc.) that can be useful for subsequent processing).
+After conversion, `apple-tv-converter` will create a file named `.apple-tv-converter.data` on the base directory of the file containing some information (IMDB id, TheTVDB id, etc.) that can be useful for subsequent processing.
 
 ## Thanks
 

data/lib/apple_tv_converter/command_line.rb

@@ -31,6 +31,8 @@ module AppleTvConverter
         require 'optparse/time'
         require 'ostruct'
 
+        id_switch = 0
+
         options = OpenStruct.new
         options.skip_transcoding = false
         options.skip_subtitles = false
@@ -41,17 +43,38 @@ module AppleTvConverter
         options.plex_format = false
         options.interactive = true
         options.imdb_id = nil
+        options.tvdb_id = nil
         options.use_absolute_numbering = false
         options.episode_number_padding = nil
         options.languages = []
         options.media = []
+        options.season = nil
+        options.episode = nil
 
         opts = OptionParser.new do |opts|
           opts.banner = "Usage: apple-tv-converter [options] [file]\n" +
                         "       [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
+
+            id_switch = 3
             options.imdb_id = id
+            options.tvdb_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
+
+            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
+
+            id_switch |= 2
+            options.tvdb_id = id
           end
 
           opts.on('-l', '--languages eng,por,...', Array, "Only keep audio and subtitles in the specified languages") do |languages|
@@ -124,6 +147,14 @@ module AppleTvConverter
             options.episode_number_padding = i.to_i
           end
 
+          opts.on('-s', '--season NUMBER', 'Set the season number for TV Shows in case folder/file naming scheme doesn\'t contain right season') do |i|
+            options.season = i.to_i
+          end
+
+          opts.on('-e', '--episode NUMBER', 'Set the episode number for TV Shows in case folder/file naming scheme doesn\'t contain right episode number') do |i|
+            options.episode = i.to_i
+          end
+
           opts.separator ""
           opts.separator "Other options:"
 
@@ -175,7 +206,7 @@ module AppleTvConverter
             e = AppleTvConverter::Media.new
 
             # 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)
+            test_path = File.expand_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)
 
@@ -204,8 +235,10 @@ module AppleTvConverter
 
             return e
           rescue => exc
+            puts "File.expand_path(file): #{File.expand_path(file)}"
             puts "Couldn't parse filename, skipping: #{File.basename(file)}"
-            puts exc.respond_to? :message ? exc.message : exc
+            puts "Reason: #{exc.respond_to?(:message) ? exc.message : exc}"
+            puts "In: #{exc.backtrace.join("\n    ")}"
 
             return nil
           end

data/lib/apple_tv_converter/media_converter.rb

@@ -24,12 +24,20 @@ module AppleTvConverter
         puts "* Name: #{media.show}"
         puts "* Genre: #{media.genre}"
       end
+
       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
+        if media.is_tv_show_episode?
+          if media.tvdb_id
+            puts "* TheTVDB ID: #{media.tvdb_id}"
+          elsif !@options.skip_metadata
+            puts "* TheTVDB ID: Unknown yet"
+          end
+        end
       end
 
       puts "* #{media.audio_streams.length} audio track(s)"
@@ -72,6 +80,7 @@ module AppleTvConverter
 
         unless @options.skip_metadata || @options.skip_online_metadata
           media.imdb_id ||= @options.imdb_id
+          media.tvdb_id ||= @options.tvdb_id
           @adapter.get_metadata(media)
         end
 
@@ -89,7 +98,10 @@ module AppleTvConverter
       def apply_options_to_media!(media)
         # Load IMDB id from options
         media.imdb_id ||= @options.imdb_id
+        media.tvdb_id ||= @options.tvdb_id
 
+        media.season = @options.season if @options.season
+        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
       end

data/lib/apple_tv_converter/version.rb

@@ -1,3 +1,3 @@
 module AppleTvConverter
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple-tv-converter
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec