apple-tv-converter 0.5.8 → 0.5.9

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.5.9
+------
+* Fixed #5 Command line options now correctly override the data file (thanks @shir)
+
 v0.5.8
 ------
 * Refactored the filename parsing into a separate file and added parsing of "X_of_Y" and "X of Y" filenames (thanks @shir for pull request #4)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apple-tv-converter (0.5.7)
+    apple-tv-converter (0.5.9)
       httparty (~> 0)
       imdb (~> 0.6, >= 0.6.8)
       language_list (~> 0.0, >= 0.0.3)
@@ -21,7 +21,7 @@ GEM
     json (1.8.1)
     language_list (0.1.0)
     libxml-ruby (2.7.0)
-    mini_portile (0.5.2)
+    mini_portile (0.5.3)
     multi_xml (0.5.5)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)

data/lib/apple_tv_converter/media.rb

@@ -184,10 +184,10 @@ module AppleTvConverter
         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)
-            @episode_number_padding = data[:episode_number_padding] if data.has_key?(:episode_number_padding)
-            @use_absolute_episode_numbering = data[:use_absolute_episode_numbering] if data.has_key?(:use_absolute_episode_numbering)
+            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)
+            @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)
           end
         rescue => e
           ap ['e', e]

data/lib/apple_tv_converter/version.rb

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

metadata

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