royw-dvdprofiler2xbmc 0.1.0 → 0.1.2

data/Rakefile

@@ -18,10 +18,10 @@ begin
     gem.add_dependency('activesupport','>= 2.0.2')
     gem.add_dependency('xml-simple','>= 1.0.12')
     gem.add_dependency('royw-read_page_cache','>= 0.0.2')
-    gem.add_dependency('royw-roys_extensions','>= 0.0.2')
-    gem.add_dependency('royw-imdb','>= 0.1.3')
+    gem.add_dependency('royw-roys_extensions','>= 0.0.3')
+    gem.add_dependency('royw-imdb','>= 0.1.5')
     gem.add_dependency('royw-tmdb','>= 0.1.6')
-    gem.add_dependency('royw-dvdprofiler_collection','>= 0.1.3')
+    gem.add_dependency('royw-dvdprofiler_collection','>= 0.1.4')
     gem.add_dependency('log4r','>= 1.0.5')
     gem.add_dependency('commandline','>= 0.7.10')
     gem.add_dependency('mash','>= 0.0.3')

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
+:patch: 2
 :major: 0
 :minor: 1

data/lib/dvdprofiler2xbmc/app_config.rb

@@ -401,11 +401,11 @@ module AppConfig
       ].join("\n")
     @initial.media_parsers = [
       # "movie title - yyyy[res].partN.ext"
-      {:regex => /^\s*(.*\S)\s*\-\s*(\d{4})\s*\[(\S*)\]\s*\.(cd\d+|pt\d+|disk\d+|disc\d+)\.([^.]+)\s*$/,
+      {:regex => /^\s*(.*\S)\s*\-\s*(0|\d{4})\s*\[(\S*)\]\s*\.(cd\d+|pt\d+|disk\d+|disc\d+)\.([^.]+)\s*$/,
       :tokens => [:title, :year, :resolution, :part, :extension]
       },
       # "movie title (yyyy)[res].partN.ext"
-      {:regex => /^\s*(.*\S)\s*\(\s*(\d{4})\s*\)\s*\[(\S*)\]\s*\.(cd\d+|pt\d+|disk\d+|disc\d+)\.([^.]+)\s*$/,
+      {:regex => /^\s*(.*\S)\s*\(\s*(0|\d{4})\s*\)\s*\[(\S*)\]\s*\.(cd\d+|pt\d+|disk\d+|disc\d+)\.([^.]+)\s*$/,
       :tokens => [:title, :year, :resolution, :part, :extension]
       },
       # "movie title[res].partN.ext"
@@ -413,11 +413,11 @@ module AppConfig
       :tokens => [:title, :resolution, :part, :extension]
       },
       # "movie title - yyyy[res].ext"
-      {:regex => /^\s*(.*\S)\s*\-\s*(\d{4})\s*\[(\S*)\]\s*\.([^.]+)\s*$/,
+      {:regex => /^\s*(.*\S)\s*\-\s*(0|\d{4})\s*\[(\S*)\]\s*\.([^.]+)\s*$/,
       :tokens => [:title, :year, :resolution, :extension]
       },
       # "movie title (yyyy)[res].ext"
-      {:regex => /^\s*(.*\S)\s*\(\s*(\d{4})\s*\)\s*\[(\S*)\]\s*\.([^.]+)\s*$/,
+      {:regex => /^\s*(.*\S)\s*\(\s*(0|\d{4})\s*\)\s*\[(\S*)\]\s*\.([^.]+)\s*$/,
       :tokens => [:title, :year, :resolution, :extension]
       },
       # "movie title[res].ext"
@@ -425,11 +425,11 @@ module AppConfig
       :tokens => [:title, :resolution, :extension]
       },
       # "movie title - yyyy.partN.ext"
-      {:regex => /^\s*(.*\S)\s*\-\s*(\d{4})\s*\.(cd\d+|pt\d+|disk\d+|disc\d+)\.([^.]+)\s*$/,
+      {:regex => /^\s*(.*\S)\s*\-\s*(0|\d{4})\s*\.(cd\d+|pt\d+|disk\d+|disc\d+)\.([^.]+)\s*$/,
       :tokens => [:title, :year, :part, :extension]
       },
       # "movie title (yyyy).partN.ext"
-      {:regex => /^\s*(.*\S)\s*\(\s*(\d{4})\s*\)\s*\.(cd\d+|pt\d+|disk\d+|disc\d+)\.([^.]+)\s*$/,
+      {:regex => /^\s*(.*\S)\s*\(\s*(0|\d{4})\s*\)\s*\.(cd\d+|pt\d+|disk\d+|disc\d+)\.([^.]+)\s*$/,
       :tokens => [:title, :year, :part, :extension]
       },
       # "movie title.partN.ext"
@@ -437,11 +437,11 @@ module AppConfig
       :tokens => [:title, :part, :extension]
       },
       # "movie title - yyyy.ext"
-      {:regex => /^\s*(.*\S)\s*\-\s*(\d{4})\s*\.([^.]+)\s*$/,
+      {:regex => /^\s*(.*\S)\s*\-\s*(0|\d{4})\s*\.([^.]+)\s*$/,
       :tokens => [:title, :year, :extension]
       },
       # "movie title (yyyy).ext"
-      {:regex => /^\s*(.*\S)\s*\(\s*(\d{4})\s*\)\s*\.([^.]+)\s*$/,
+      {:regex => /^\s*(.*\S)\s*\(\s*(0|\d{4})\s*\)\s*\.([^.]+)\s*$/,
       :tokens => [:title, :year, :extension]
       },
       # "movie title.ext"

data/lib/dvdprofiler2xbmc/controllers/app.rb

@@ -14,25 +14,25 @@ class DvdProfiler2Xbmc
   # protected initializer because it is a Singleton class
   def initialize
     @media_files = nil
-    @multiple_profiles = []
   end
 
   public
 
-  # == Synopsis
-  # An Array of Strings that the external processing my write to to
-  # indicate that a given title has multiple ISBNs.
-  # HACK, this is a hack because I didn't see a way to cleanly pass
-  # the data up from the processing.
-  attr_accessor :multiple_profiles
-
   @interrupted = false
   @interrupt_message = "control-C detected, finishing current task"
+  @multiple_profiles = []
 
   class << self
     # == Synopsis
     # When ^C is pressed, this message is sent to stdout
     attr_accessor :interrupt_message
+
+    # == Synopsis
+    # An Array of Strings that the external processing my write to to
+    # indicate that a given title has multiple ISBNs.
+    # HACK, this is a hack because I didn't see a way to cleanly pass
+    # the data up from the processing.
+    attr_accessor :multiple_profiles
   end
 
   # == Synopsis

data/lib/dvdprofiler2xbmc/controllers/nfo_controller.rb

@@ -17,6 +17,8 @@
 #  NfoController.update(media)
 class NfoController
 
+  attr_reader :info
+
   # == Synopsis
   def self.update(media)
     NfoController.new(media).update
@@ -44,18 +46,22 @@ class NfoController
       self.isbn ||= load_isbn_id
       self.imdb_id ||= load_imdb_id
 
-      box_set_parent_titles = []
+      extra_titles = []
       production_years = []
       released_years = []
 
       dvdprofiler_info = load_dvdprofiler_info
       unless dvdprofiler_info.nil?
+        original_titles = dvdprofiler_info.original_titles
         box_set_parent_titles = dvdprofiler_info.box_set_parent_titles
+        extra_titles << dvdprofiler_info.title unless dvdprofiler_info.title.blank?
+        extra_titles += original_titles unless original_titles.blank?
+        extra_titles += box_set_parent_titles unless box_set_parent_titles.blank?
         production_years = dvdprofiler_info.production_years
         released_years = dvdprofiler_info.released_years
       end
 
-      imdb_info = load_imdb_info(box_set_parent_titles, production_years, released_years)
+      imdb_info = load_imdb_info(extra_titles, production_years, released_years)
       unless imdb_info.nil?
         self.imdb_id ||= imdb_info.imdb_id
       end
@@ -134,10 +140,10 @@ class NfoController
     dvdprofiler_info
   end
 
-  def load_imdb_info(box_set_parent_titles, production_years, released_years)
+  def load_imdb_info(extra_titles, production_years, released_years)
     imdb_info = nil
     unless File.exist?(@media.path_to(:no_imdb_lookup))
-      possible_imdb_titles = get_imdb_titles(box_set_parent_titles)
+      possible_imdb_titles = get_imdb_titles(extra_titles)
       imdb_info = ImdbInfo.find(:imdb_id => self.imdb_id,
                                 :titles => possible_imdb_titles,
                                 :media_years => [@media.year.to_i],
@@ -206,11 +212,11 @@ class NfoController
 
   # == Synopsis
   # get an Array of String titles
-  def get_imdb_titles(box_set_parent_titles)
+  def get_imdb_titles(extra_titles)
     titles = []
     titles << @info['title'] unless @info['title'].blank?
     titles << @media.title unless @media.title.blank?
-    titles += box_set_parent_titles
+    titles += extra_titles
     titles.uniq.compact
   end
 

data/lib/dvdprofiler2xbmc/models/dvdprofiler_info.rb

@@ -9,11 +9,13 @@ class DvdprofilerInfo
   # really should include at least:  :title, :year, :isbn, :filespec
   def self.find(options)
     dvdprofiler_info = nil
+    # replace options[:year] => 0 with nil
+    options[:year] = (options[:year].to_i > 0 ? options[:year] : nil) unless options[:year].blank?
     # find ISBN for each title and assign to the media
     profiles = DvdprofilerProfile.all(options)
     if profiles.length > 1
       media_title = "#{options[:title]}#{options[:year].blank? ? '' : ' (' + options[:year] + ')'}"
-      Dvdprofiler2Xbmc.multiple_profiles << "#{media_title} #{profiles.collect{|prof| prof.isbn}.join(", ")}"
+      DvdProfiler2Xbmc.multiple_profiles << "#{media_title} #{profiles.collect{|prof| prof.isbn}.join(", ")}"
       AppConfig[:logger].warn { "Multiple profiles found for #{media_title}" }
     else
       profile = profiles.first
@@ -105,4 +107,16 @@ class DvdprofilerInfo
   def released_years
     @profile.dvd_hash[:released] rescue []
   end
+
+  def original_titles
+    titles = []
+    originaltitle = @profile.dvd_hash[:originaltitle]
+    titles = [originaltitle].flatten.uniq.compact unless originaltitle.blank?
+    titles = titles.collect{|t| t.blank? ? nil : t}.compact
+    titles
+  end
+
+  def title
+    @profile.dvd_hash[:title] rescue nil
+  end
 end

data/lib/dvdprofiler2xbmc/models/media.rb

@@ -69,6 +69,7 @@ class Media
     components = Media.parse(@media_path)
     unless components.nil?
       @year = components[:year]
+      @year = (@year.to_i > 0 ? @year : nil) unless @year.blank?
       @title = components[:title]
       @part = components[:part]
       @extension = components[:extension]
@@ -140,7 +141,7 @@ class Media
   # return the media's title but with the (year) appended
   def find_title_with_year(title, year)
     name = title
-    name = "#{name} (#{year})" unless year.nil?
+    name = "#{name} (#{year})" unless year.blank?
     name
   end
 

data/spec/dvdprofiler2xbmc_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 
 require 'tempfile'
 
-FULL_REGRESSION = false
+FULL_REGRESSION = true
 
 # Time to add your specs!
 # http://rspec.info/
@@ -46,7 +46,7 @@ describe "Dvdprofiler2xbmc" do
           'Meltdown',
           'Oklahoma!',
           'The Man From Snowy River',
-          'Rooster Cogburn',
+          'Rooster Cogburn (...and the Lady)',
           'Call Me The Rise And Fall of Heidi Fleiss',
           'batteries not included',
           'Flyboys',
@@ -58,11 +58,13 @@ describe "Dvdprofiler2xbmc" do
   end
 
   if FULL_REGRESSION
-    it "should find all Collection titles (full regression)" do
-      profiles = Dvdprofiler.all
-      titles = profiles.collect{|profile| profile.title}
-      buf = regression(titles.sort)
-      buf.should be_empty
+    DvdprofilerProfile.collection_filespec = File.join(SAMPLES_DIR, 'Collection.xml')
+    profiles = DvdprofilerProfile.all
+    titles = profiles.collect{|profile| profile.title}
+    titles.sort.each do |title|
+      it "should find all Collection titles (full regression) title=>#{title}" do
+        regression([title]).should == []
+      end
     end
   end
 
@@ -82,7 +84,7 @@ describe "Dvdprofiler2xbmc" do
           dvd_hash = dvdprofiler_profile.dvd_hash
           unless dvd_hash[:genres].include?('Television')
             count += 1
-            imdb_profile = ImdbProfile.first(:titles => [dvd_hash[:title], title],
+            imdb_profile = ImdbProfile.first(:titles => [dvd_hash[:title], title, dvd_hash[:originaltitle]].uniq.compact,
                                      :production_years => dvd_hash[:productionyear],
                                      :released_years => dvd_hash[:released],
                                      :logger => AppConfig[:logger])

data/spec/nfo_controller_spec.rb

@@ -32,8 +32,12 @@ describe "NfoController" do
 #     AppConfig[:logger].info { "media path => " + @media.media_path }
   end
 
-  after(:all) do
+  after(:each) do
     Dir.glob(File.join(TMPDIR, "nfo_controller_spec*")).each { |filename| File.delete(filename) }
+    Dir.glob(File.join(TMPDIR, "*.m4v")).each { |filename| File.delete(filename) }
+    Dir.glob(File.join(TMPDIR, "*.nfo")).each { |filename| File.delete(filename) }
+    Dir.glob(File.join(TMPDIR, "*.xml")).each { |filename| File.delete(filename) }
+    Dir.glob(File.join(TMPDIR, "*.dummy")).each { |filename| File.delete(filename) }
     [:imdb_xml, :tmdb_xml, :nfo].each do |extension|
       filespec = File.join(File.dirname(__FILE__), "samples/The Egg and I.#{AppConfig[:extensions][extension]}")
       File.delete(filespec) if File.exist?(filespec)
@@ -77,9 +81,47 @@ describe "NfoController" do
     hash.should be_empty
   end
 
-#   it "should handle different movies with the same title" do
-#     media1 = Media.new('Sabrina - 1954')
-#     media2 = Media.new('Sabrina - 1995')
-#   end
+  it "should handle different movies with the same title" do
+    FileUtils.touch(File.join(TMPDIR, 'Sabrina - 1954.dummy'))
+    media1 = Media.new(TMPDIR, 'Sabrina - 1954.dummy')
+    controller1 = NfoController.new(media1)
+    controller1.update
+    FileUtils.touch(File.join(TMPDIR, 'Sabrina - 1995.dummy'))
+    media2 = Media.new(TMPDIR, 'Sabrina - 1995.dummy')
+    controller2 = NfoController.new(media2)
+    controller2.update
+    controller1.imdb_id.should_not == controller2.imdb_id
+  end
+
+  it "should handle all movies in Collection.xml" do
+    imdb_exceptions = [
+      'Pearl Harbor Payback Appointment in Tokyo',
+      'Rodeo Racketeers John Wayne Young Duke Series',
+      'The Adventures of Indiana Jones The Complete DVD Movie Collection',
+      'The Great American Western Volume 6',
+      'The Mummy Collector s Set',
+      'Mexico Whitetails'
+    ]
+    profiles = DvdprofilerProfile.all
+    titles = profiles.collect do |profile|
+      info = DvdprofilerInfo.new(profile)
+      "#{profile.title.remove_punctuation} - #{info.year}"
+    end
+    buf = []
+    titles.sort.each do |title|
+      filename = "#{title}.m4v"
+      FileUtils.touch(File.join(TMPDIR, filename))
+      media = Media.new(TMPDIR, filename)
+      controller = NfoController.new(media)
+#       debugger if title =~ /Mexico/
+      controller.update
+      buf << "Missing ISBN for #{title}" if controller.isbn.blank?
+      buf << "Missing IMDB ID for #{controller.info['title']}" if controller.imdb_id.blank? && !imdb_exceptions.include?(media.title)
+      buf << "Unexpected IMDB ID for #{controller.info['title']}" if !controller.imdb_id.blank? && imdb_exceptions.include?(media.title)
+    end
+    puts buf.join("\n") unless buf.empty?
+    buf.empty?.should be_true
+  end
+
+end
 
-end