royw-dvdprofiler2xbmc 0.0.18 → 0.0.19

data/Rakefile

@@ -17,9 +17,9 @@ begin
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.add_dependency('activesupport','>= 2.0.2')
     gem.add_dependency('xml-simple','>= 1.0.12')
-    gem.add_dependency('royw-imdb','>= 0.1.1')
-    gem.add_dependency('royw-tmdb','>= 0.1.1')
-    gem.add_dependency('royw-dvdprofiler_collection','>= 0.1.1')
+    gem.add_dependency('royw-imdb','>= 0.1.2')
+    gem.add_dependency('royw-tmdb','>= 0.1.5')
+    gem.add_dependency('royw-dvdprofiler_collection','>= 0.1.2')
     gem.add_dependency('log4r','>= 1.0.5')
     gem.add_dependency('commandline','>= 0.7.10')
     gem.add_dependency('mash','>= 0.0.3')
@@ -64,4 +64,10 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+desc "stalk github until gem is published"
+task :stalk do
+  `gemstalk royw dvdprofiler2xbmc`
+end
+
+
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 18
+:patch: 19
 :major: 0
 :minor: 0

data/lib/dvdprofiler2xbmc.rb

@@ -22,6 +22,9 @@ require 'dvdprofiler2xbmc/controllers/app'
 require 'dvdprofiler2xbmc/controllers/fanart_controller'
 require 'dvdprofiler2xbmc/controllers/nfo_controller'
 require 'dvdprofiler2xbmc/controllers/thumbnail_controller'
+require 'dvdprofiler2xbmc/models/dvdprofiler_info'
+require 'dvdprofiler2xbmc/models/imdb_info'
+require 'dvdprofiler2xbmc/models/tmdb_info'
 require 'dvdprofiler2xbmc/models/media'
 require 'dvdprofiler2xbmc/models/media_files'
 require 'dvdprofiler2xbmc/models/xbmc_info'

data/lib/dvdprofiler2xbmc/controllers/fanart_controller.rb

@@ -7,16 +7,20 @@
 # or
 #  FanartController.update(media)
 class FanartController
-  attr_reader :media_path, :image_files, :year, :media_subdirs, :title, :title_with_year
 
+  # == Synopsis
+  # class access method
   def self.update(media)
     FanartController.new(media).update
   end
 
+  # == Synopsis
+  # media => Media instance
   def initialize(media)
     @media = media
   end
 
+  # == Synopsis
   # update the meta-data and thumbnails
   def update
     result = true
@@ -31,6 +35,7 @@ class FanartController
 
   protected
 
+  # == Synopsis
   # link the largest fanart to moviename-fanart.jpg
   def link_fanart(dest_filespec)
     %w(original mid thumb).each do |size|
@@ -47,6 +52,7 @@ class FanartController
     end
   end
 
+  # == Synopsis
   # fetch all of the fanart for the movie
   # save to files using format: moviename-fanart.size.N.jpg
   # where size is the fanart size ['original', 'mid', 'thumb']
@@ -63,6 +69,7 @@ class FanartController
     end
   end
 
+  # == Synopsis
   # generate a filespec using format: moviename-fanart.size.N
   # where size is the fanart size ['original', 'mid', 'thumb']
   # and N is a sequential integer starting at 0

data/lib/dvdprofiler2xbmc/controllers/nfo_controller.rb

@@ -1,6 +1,10 @@
 
 # == Synopsis
-# NFO (info) files
+# This is the heart and soul of the application.  This is
+# where the different media meta data are merged into the
+# info (.nfo) format needed by XBMC.
+#
+# TODO: This class is rather large and should be refactored.
 #
 # the @info hash has keys that map directly to the .nfo file
 #
@@ -13,10 +17,12 @@
 #  NfoController.update(media)
 class NfoController
 
+  # == Synopsis
   def self.update(media)
     NfoController.new(media).update
   end
 
+  # == Synopsis
   def initialize(media)
     @media = media
     @info = Hash.new
@@ -25,6 +31,7 @@ class NfoController
     self.imdb_id = @xbmc_info.movie['id']
   end
 
+  # == Synopsis
   # merge meta-data from the DVD Profiler collection.xml and from IMDB
   # into the @movie hash
   def update
@@ -37,15 +44,25 @@ class NfoController
       self.isbn ||= load_isbn_id
       self.imdb_id ||= load_imdb_id
 
-      # load the profiles
-      dvd_hash = load_dvdprofiler
-      imdb_hash = load_imdb(dvd_hash)
-      tmdb_hash = load_tmdb
+      box_set_parent_titles = []
+      production_years = []
+      released_years = []
+
+      dvdprofiler_info = load_dvdprofiler_info
+      unless dvdprofiler_info.nil?
+        box_set_parent_titles = dvdprofiler_info.box_set_parent_titles
+        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)
+      unless imdb_info.nil?
+        self.imdb_id ||= imdb_info.imdb_id
+      end
 
-      # merge the profiles into the @info hash
-      @info.merge!(tmdb_hash_to_info(tmdb_hash))
-      @info.merge!(imdb_hash_to_info(imdb_hash))
-      @info.merge!(dvd_hash_to_info(dvd_hash))
+      tmdb_info = load_tmdb_info
+
+      @info = merge(@info, dvdprofiler_info, imdb_info, tmdb_info)
 
       # map any genres
       @info['genre'] = remap_genres(@info['genre'])
@@ -59,14 +76,7 @@ class NfoController
     result
   end
 
-  def remap_genres(genres)
-    genres ||= []
-    genres += @media.media_subdirs.split('/') if AppConfig[:subdirs_as_genres]
-    new_genres = map_genres(genres.uniq).uniq.compact
-    new_genres = nil if new_genres.blank?
-    new_genres
-  end
-
+  # == Synopsis
   # return the ISBN or nil
   def isbn
     unless @info['isbn'].blank?
@@ -75,12 +85,14 @@ class NfoController
     @media.isbn
   end
 
+  # == Synopsis
   # set the ISBN
   def isbn=(n)
     @media.isbn = n.to_s unless n.blank?
     @media.isbn
   end
 
+  # == Synopsis
   # return the IMDB ID or nil
   def imdb_id
     unless @info['id'].blank?
@@ -93,6 +105,7 @@ class NfoController
     @media.imdb_id
   end
 
+  # == Synopsis
   # set the IMDB ID
   def imdb_id=(ident)
     if ident.blank?
@@ -107,6 +120,55 @@ class NfoController
 
   protected
 
+  def load_dvdprofiler_info
+    dvdprofiler_info = nil
+    # load the profile infos
+    dvdprofiler_info = DvdprofilerInfo.find(:isbn     => self.isbn,
+                                            :title    => @media.title,
+                                            :year     => @media.year,
+                                            :filespec => @media.path_to(:dvdprofiler_xml))
+    unless dvdprofiler_info.nil?
+      self.isbn ||= dvdprofiler_info.isbn
+      @media.year = dvdprofiler_info.year if(@media.year.blank? && !dvdprofiler_info.year.blank?)
+    end
+    dvdprofiler_info
+  end
+
+  def load_imdb_info(box_set_parent_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)
+      imdb_info = ImdbInfo.find(:imdb_id => self.imdb_id,
+                                :titles => possible_imdb_titles,
+                                :media_years => [@media.year.to_i],
+                                :production_years => production_years,
+                                :released_years => released_years,
+                                :filespec => @media.path_to(:imdb_xml),
+                                :logger => AppConfig[:logger])
+    end
+    imdb_info
+  end
+
+  def load_tmdb_info
+    tmdb_info = nil
+    unless File.exist?(@media.path_to(:no_tmdb_lookup))
+      tmdb_info = TmdbInfo.find(:imdb_id => self.imdb_id,
+                                :api_key => TMDB_API_KEY,
+                                :filespec => @media.path_to(:tmdb_xml))
+    end
+    tmdb_info
+  end
+
+  def merge(info, dvdprofiler_info, imdb_info, tmdb_info)
+    # merge the profiles into the @info hash
+    # Note, order is important as each overwrites what is previously in @info
+    info.merge!(tmdb_info.to_xbmc_info) unless tmdb_info.nil?
+    info.merge!(imdb_info.to_xbmc_info) unless imdb_info.nil?
+    info.merge!(dvdprofiler_info.to_xbmc_info) unless dvdprofiler_info.nil?
+    info
+  end
+
+  # == Synopsis
   # save as a .nfo file, creating a backup if the .nfo already exists
   def save
     begin
@@ -120,6 +182,8 @@ class NfoController
     end
   end
 
+  # == Synopsis
+  # load the ISBN from a manually created .isbn file
   def load_isbn_id
     ident = nil
     filespec = @media.path_to(:isbn)
@@ -129,6 +193,8 @@ class NfoController
     ident
   end
 
+  # == Synopsis
+  # load the IMDB ID from a manually created .imdb file
   def load_imdb_id
     ident = nil
     filespec = @media.path_to(:imdb)
@@ -138,199 +204,29 @@ class NfoController
     ident
   end
 
-  # load from the collection
-  # return movie hash
-  def load_dvdprofiler
-    dvd_hash = Hash.new
-    # find ISBN for each title and assign to the media
-    profiles = DvdprofilerProfile.all(:isbn => self.isbn, :title => @media.title, :year => @media.year)
-    if profiles.length > 1
-      title = "#{@media.title}#{@media.year.blank? ? '' : ' (' + @media.year + ')'}"
-      Dvdprofiler2Xbmc.multiple_profiles << "#{title} #{profiles.collect{|prof| prof.isbn}.join(", ")}"
-      AppConfig[:logger].warn { "Multiple profiles found for #{title}" }
-    else
-      profile = profiles.first
-      unless profile.nil?
-        self.isbn ||= profile.isbn
-        AppConfig[:logger].info { "ISBN => #{self.isbn}" } unless self.isbn.nil?
-        profile.save(@media.path_to(:dvdprofiler_xml))
-        dvd_hash = profile.dvd_hash
-        @media.year = [dvd_hash[:productionyear]].flatten.sort.first if @media.year.blank? && !dvd_hash[:productionyear].blank?
-      end
-    end
-    dvd_hash
-  end
-
-  # load data from IMDB.com
-  # return movie hash
-  def load_imdb(dvd_hash)
-    imdb_hash = Hash.new
-    unless File.exist?(@media.path_to(:no_imdb_lookup))
-      profile = ImdbProfile.first(:imdb_id => self.imdb_id,
-                                  :titles => self.get_imdb_titles(dvd_hash),
-                                  :media_years => [@media.year.to_i],
-                                  :production_years => dvd_hash[:productionyear],
-                                  :released_years => dvd_hash[:released],
-                                  :filespec => @media.path_to(:imdb_xml),
-                                  :logger => AppConfig[:logger]
-                                  )
-      unless profile.nil?
-        self.imdb_id ||= profile.imdb_id
-        AppConfig[:logger].info { "IMDB ID => #{self.imdb_id}" } unless self.imdb_id.nil?
-        imdb_hash = profile.movie
-      end
-    end
-    imdb_hash
-  end
-
-  # load data form themovieDb.com
-  # return movie hash
-  def load_tmdb
-    tmdb_hash = Hash.new
-    unless File.exist?(@media.path_to(:no_tmdb_lookup))
-      profile = TmdbProfile.first(:imdb_id => self.imdb_id,
-                                  :api_key => TMDB_API_KEY,
-                                  :filespec => @media.path_to(:tmdb_xml))
-      unless profile.nil?
-        tmdb_hash = profile.movie
-      end
-    end
-    tmdb_hash
-  end
-
-  def get_imdb_titles(dvd_hash)
+  # == Synopsis
+  # get an Array of String titles
+  def get_imdb_titles(box_set_parent_titles)
     titles = []
     titles << @info['title'] unless @info['title'].blank?
     titles << @media.title unless @media.title.blank?
-    titles += get_parent_titles(dvd_hash)
+    titles += box_set_parent_titles
     titles.uniq.compact
   end
 
-  # try to find box set parent's title
-  def get_parent_titles(dvd_hash)
-    titles = []
-    unless dvd_hash[:boxset].blank?
-      begin
-        AppConfig[:logger].debug { "Need to find box set parent's title" }
-        parent_isbn = dvd_hash[:boxset].first['parent'].first
-        unless parent_isbn.blank?
-          parent_profile = DvdprofilerProfile.first(:isbn => parent_isbn)
-          unless parent_profile.blank?
-            titles << parent_profile.title
-            titles += get_parent_titles(parent_profile.dvd_hash)
-          end
-        end
-      rescue
-      end
-    end
-    AppConfig[:logger].debug { "parent titles => #{titles.pretty_inspect}" } unless titles.empty?
-    titles
-  end
-
-  DVD_HASH_TO_INFO_MAP =     {
-      :rating         => 'mpaa',
-      :plot           => 'outline',
-      :overview       => 'plot',
-      :runningtime    => 'runtime',
-      :actors         => 'actor',
-      :isbn           => 'isbn',
-      :imdb_id        => 'id',
-      :directors      => 'director'
-      # Unused => :ProfileTimestamp, :ID, :MediaTypes, :UPC, :CollectionNumber
-      # :CollectionType, :DistTrait, :OriginalTitle, :CountryOfOrigin
-      # :ProductionYear, :RunningTime, :RatingSystem, :RatingAge, :RatingVariant
-      # :CaseType, :Genres, :Regions, :Format, :Features, :Studios, :MediaCompanies
-      # :Audio, :Subtitles, :'SRP DenominationType', :Actors, :Credits, :Overview
-      # :EasterEggs, :Disks, :SortTitle, :LastEdited, :WishPriority, :PurchaseInfo
-      # :Review, :Events, :BoxSet, :LoanInfo, :Notes, :Tags, :Locks
-    }
-
-  # map the given dvd_hash into a @movie hash
-  def dvd_hash_to_info(dvd_hash)
-    info = Hash.new
-    unless dvd_hash.nil?
-      dvd_hash[:genres] ||= []
-      info['genre'] = dvd_hash[:genres] unless dvd_hash[:genres].blank?
-      info['title'] = dvd_hash[:title]
-      info['year']  = [dvd_hash[:productionyear], dvd_hash[:released]].flatten.uniq.collect{|s| ((s =~ /(\d{4})/) ? $1 : nil)}.uniq.compact.first
-      DVD_HASH_TO_INFO_MAP.each do |key, value|
-        info[value] = dvd_hash[key] unless dvd_hash[key].blank?
-      end
-    end
-    info
-  end
-
-  def to_first_year(value)
-    [value]
-  end
-
-  IMDB_HASH_TO_INFO_MAP = {
-      'title'           => 'title',
-      'mpaa'            => 'mpaa',
-      'rating'          => 'rating',
-      'plot'            => 'plot',
-      'tagline'         => 'tagline',
-      'year'            => 'year',
-      'directors'       => 'director',
-      'length'          => 'runtime',
-      'genres'          => 'genre',
-      'id'              => 'id',
-      # Unused: 'company', 'countries', 'poster_url', 'writers', 'photos'
-      # 'poster', 'color', 'aspect_ratio', 'languages', 'release_date'
-      # 'tiny_poster_url', 'also_known_as'
-    }
-  def imdb_hash_to_info(imdb_hash)
-    info = Hash.new
-    unless imdb_hash.blank?
-      IMDB_HASH_TO_INFO_MAP.each do |key, value|
-        info[value] = imdb_hash[key] unless imdb_hash[key].blank?
-      end
-      info['id'] = self.imdb_id if info['id'].blank?
-      # special cases:
-      if info['mpaa'].blank? && !imdb_hash['certifications'].blank?
-        imdb_hash['certifications'].each do |certs|
-          if certs['country'] == 'USA'
-            AppConfig[:logger].info { "Using alternative USA certification instead of mpaa rating" }
-            info['mpaa'] = certs['rating'] unless certs['rating'].blank?
-            break
-          end
-        end
-      end
-      unless imdb_hash['cast_members'].blank?
-        imdb_hash['cast_members'].each do |anon|
-          # anon[2] => {name,role}
-          info['actor'] ||= []
-          info['actor'] << {'name' => anon[0], 'role' => anon[1]}
-        end
-      end
-      info['year'] ||= imdb_hash['release_year']
-    end
-    info
-  end
-
-  TMDB_HASH_TO_INFO_MAP = {
-      # urls
-      # scores
-      # idents
-      # titles
-      # imdb_ids
-      # alternative_titles
-      # posters
-      # types
-      # fanarts
-      'short_overviews' => 'plot',
-      'releases' => 'year'
-    }
-  def tmdb_hash_to_info(tmdb_hash)
-    info = Hash.new
-    unless tmdb_hash.blank?
-      TMDB_HASH_TO_INFO_MAP.each do |key, value|
-        info[value] = tmdb_hash[key].first unless tmdb_hash[key].blank?
-      end
-    end
-    info
+  # == Synopsis
+  # remap genres
+  # genres => Array of String genres
+  # returns Array of String genres
+  def remap_genres(genres)
+    genres ||= []
+    genres += @media.media_subdirs.split('/') if AppConfig[:subdirs_as_genres]
+    new_genres = map_genres(genres.uniq).uniq.compact
+    new_genres = nil if new_genres.blank?
+    new_genres
   end
 
+  # == Synopsis
   # map the given genres using the AppConfig[:genre_maps].
   # given an Array of String genres
   # returns an Array of String genres that have been mapped, are unique, and do not include any nils

data/lib/dvdprofiler2xbmc/controllers/thumbnail_controller.rb

@@ -1,5 +1,5 @@
 # == Synopsis
-# Media encapsulates information about a single media file
+# Used to fetch thumbnail images from
 #
 # Usage:
 #  controller = ThumbnailController.new(media)
@@ -42,7 +42,9 @@ class ThumbnailController
     dest_image_filespec = @media.path_to(:thumbnail)
     puts "fetch_imdb_thumbnail(#{imdb_id}) => #{source_uri}"
     begin
-      File.open(dest_image_filespec, "wb") {|f| f.write(open(source_uri).read)}
+      File.open(dest_image_filespec, "wb") do |f|
+        f.write(read_page(source_uri.escape_unicode))
+      end
     rescue Exception => e
       AppConfig[:logger].error { "Error downloading image from \"#{source_uri}\" to \"#{dest_image_filespec}\" - #{e.to_s}" }
     end
@@ -67,4 +69,8 @@ class ThumbnailController
     end
   end
 
+  def read_page(page)
+    open(page).read
+  end
+
 end

data/lib/dvdprofiler2xbmc/models/dvdprofiler_info.rb

@@ -0,0 +1,108 @@
+class DvdprofilerInfo
+
+  def initialize(profile)
+    @profile = profile
+  end
+
+  # == Synopsis
+  # see DvdprofilerProfile.all for options
+  # really should include at least:  :title, :year, :isbn, :filespec
+  def self.find(options)
+    dvdprofiler_info = nil
+    # 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(", ")}"
+      AppConfig[:logger].warn { "Multiple profiles found for #{media_title}" }
+    else
+      profile = profiles.first
+      unless profile.nil?
+        AppConfig[:logger].info { "ISBN => #{options[:isbn]}" } unless options[:isbn].nil?
+        profile.save(options[:filespec])
+        dvdprofiler_info = DvdprofilerInfo.new(profile)
+      end
+    end
+    dvdprofiler_info
+  end
+
+  private
+
+  # == Synopsis
+  # maps the Dvdprofiler.dvd_hash to the info hash
+  DVD_HASH_TO_INFO_MAP =     {
+      :rating         => 'mpaa',
+      :plot           => 'outline',
+      :overview       => 'plot',
+      :runningtime    => 'runtime',
+      :actors         => 'actor',
+      :isbn           => 'isbn',
+      :imdb_id        => 'id',
+      :directors      => 'director'
+      # Unused => :ProfileTimestamp, :ID, :MediaTypes, :UPC, :CollectionNumber
+      # :CollectionType, :DistTrait, :OriginalTitle, :CountryOfOrigin
+      # :ProductionYear, :RunningTime, :RatingSystem, :RatingAge, :RatingVariant
+      # :CaseType, :Genres, :Regions, :Format, :Features, :Studios, :MediaCompanies
+      # :Audio, :Subtitles, :'SRP DenominationType', :Actors, :Credits, :Overview
+      # :EasterEggs, :Disks, :SortTitle, :LastEdited, :WishPriority, :PurchaseInfo
+      # :Review, :Events, :BoxSet, :LoanInfo, :Notes, :Tags, :Locks
+    }
+
+  public
+
+  # == Synopsis
+  # map the given dvd_hash into a @movie hash
+  def to_xbmc_info
+    info = Hash.new
+    unless @profile.dvd_hash.nil?
+      @profile.dvd_hash[:genres] ||= []
+      info['genre'] = @profile.dvd_hash[:genres] unless @profile.dvd_hash[:genres].blank?
+      info['title'] = @profile.dvd_hash[:title]
+      info['year']  = [@profile.dvd_hash[:productionyear], @profile.dvd_hash[:released]].flatten.uniq.collect{|s| ((s =~ /(\d{4})/) ? $1 : nil)}.uniq.compact.first
+      DVD_HASH_TO_INFO_MAP.each do |key, value|
+        info[value] = @profile.dvd_hash[key] unless @profile.dvd_hash[key].blank?
+      end
+    end
+    info
+  end
+
+  def isbn
+    @profile.isbn rescue nil
+  end
+
+  # == Synopsis
+  # return the lowest production year as the year
+  def year
+    [@profile.dvd_hash[:productionyear]].flatten.uniq.compact.sort.first rescue nil
+  end
+
+  # == Synopsis
+  # try to find box set parent's title
+  def box_set_parent_titles
+    titles = []
+    unless @profile.dvd_hash[:boxset].blank?
+      begin
+        AppConfig[:logger].debug { "Need to find box set parent's title" }
+        parent_isbn = @profile.dvd_hash[:boxset].first['parent'].first
+        unless parent_isbn.blank?
+          parent_profile = DvdprofilerProfile.first(:isbn => parent_isbn)
+          unless parent_profile.blank?
+            titles << parent_profile.title
+            titles += get_parent_titles(parent_profile.dvd_hash)
+          end
+        end
+      rescue
+      end
+    end
+    AppConfig[:logger].debug { "parent titles => #{titles.pretty_inspect}" } unless titles.empty?
+    titles
+  end
+
+  def production_years
+    @profile.dvd_hash[:productionyear] rescue []
+  end
+
+  def released_years
+    @profile.dvd_hash[:released] rescue []
+  end
+end

data/lib/dvdprofiler2xbmc/models/imdb_info.rb

@@ -0,0 +1,70 @@
+class ImdbInfo
+
+  def initialize(profile)
+    @profile = profile
+  end
+
+  # == Synopsis
+  # See ImdbProfile.all for options
+  def self.find(options)
+    imdb_info = nil
+    profile = ImdbProfile.first(options)
+    unless profile.nil?
+      imdb_info = ImdbInfo.new(profile)
+    end
+    imdb_info
+  end
+
+  # == Synopsis
+  # maps the imdb.movie hash to the info hash
+  IMDB_HASH_TO_INFO_MAP = {
+      'title'           => 'title',
+      'mpaa'            => 'mpaa',
+      'rating'          => 'rating',
+      'plot'            => 'plot',
+      'tagline'         => 'tagline',
+      'year'            => 'year',
+      'directors'       => 'director',
+      'length'          => 'runtime',
+      'genres'          => 'genre',
+      'id'              => 'id',
+      # Unused: 'company', 'countries', 'poster_url', 'writers', 'photos'
+      # 'poster', 'color', 'aspect_ratio', 'languages', 'release_date'
+      # 'tiny_poster_url', 'also_known_as'
+    }
+
+  # == Synopsis
+  # maps the imdb.movie hash to the info hash
+  def to_xbmc_info
+    info = Hash.new
+    unless @profile.movie.blank?
+      IMDB_HASH_TO_INFO_MAP.each do |key, value|
+        info[value] = @profile.movie[key] unless @profile.movie[key].blank?
+      end
+      info['id'] = self.imdb_id if info['id'].blank?
+      # special cases:
+      if info['mpaa'].blank? && !@profile.movie['certifications'].blank?
+        @profile.movie['certifications'].each do |certs|
+          if certs['country'] == 'USA'
+            AppConfig[:logger].info { "Using alternative USA certification instead of mpaa rating" }
+            info['mpaa'] = certs['rating'] unless certs['rating'].blank?
+            break
+          end
+        end
+      end
+      unless @profile.movie['cast_members'].blank?
+        @profile.movie['cast_members'].each do |anon|
+          # anon[2] => {name,role}
+          info['actor'] ||= []
+          info['actor'] << {'name' => anon[0], 'role' => anon[1]}
+        end
+      end
+      info['year'] ||= @profile.movie['release_year']
+    end
+    info
+  end
+
+  def imdb_id
+    @profile.imdb_id rescue nil
+  end
+end

data/lib/dvdprofiler2xbmc/models/tmdb_info.rb

@@ -0,0 +1,51 @@
+class TmdbInfo
+
+  def initialize(profile)
+    @profile = profile
+  end
+
+  # == Synopsis
+  # load data from themovieDb.com
+  # see TmdbProfile.all for options
+  def self.find(options)
+    tmdb_info = nil
+    profile = TmdbProfile.first(options)
+    unless profile.nil?
+      tmdb_info = TmdbInfo.new(profile)
+    end
+    tmdb_info
+  end
+
+  private
+
+  # == Synopsis
+  # map the tmdb.movie hash into the info hash
+  TMDB_HASH_TO_INFO_MAP = {
+      # urls
+      # scores
+      # idents
+      # titles
+      # imdb_ids
+      # alternative_titles
+      # posters
+      # types
+      # fanarts
+      'short_overviews' => 'plot',
+      'releases' => 'year'
+    }
+
+  public
+
+  # == Synopsis
+  # map the tmdb.movie hash into the info hash
+  def to_xbmc_info
+    info = Hash.new
+    unless @profile.movie.blank?
+      TMDB_HASH_TO_INFO_MAP.each do |key, value|
+        info[value] = @profile.movie[key].first unless @profile.movie[key].blank?
+      end
+    end
+    info
+  end
+
+end

data/spec/cache_extensions.rb

@@ -1,178 +1,53 @@
-# NOTE extremely ugly and non-DRY.  Probably good candidate for meta programming.
 
 # override the classes' read_page method and replace with one
 # that will cache pages in spec/samples/{url}
 
-class FanartController
-  private
-  def read_page(page)
-    html = nil
-    filespec = page.gsub(/^http:\//, 'spec/samples')
-    if File.exist?(filespec)
-      html = open(filespec).read
-    else
-      html = open(page).read
-      cache_html_files(page, html)
-    end
-    html
-  end
-
-  # this is used to save imdb pages so they may be used by rspec
-  def cache_html_files(page, html)
-    begin
-      filespec = page.gsub(/^http:\//, 'spec/samples')
-      unless File.exist?(filespec)
-        puts "caching #{filespec}"
-        File.mkdirs(File.dirname(filespec))
-        File.open(filespec, 'w') { |f| f.puts html }
+module CacheExtensions
+  # == Synopsis
+  # Attach the read_page and cache_file methods to the given
+  # class (cls) and use the given directory for the cache files
+  def self.attach_to(cls, directory='/tmp')
+
+    # define the read_page(page) method on the given class: cls
+    cls.send('define_method', "read_page") do |page|
+      data = nil
+      filespec = page.gsub(/^http:\//, directory).gsub(/\/$/, '.html')
+      if File.exist?(filespec)
+        data = open(filespec).read
+      else
+        data = open(page).read
+        cache_file(page, data)
       end
-    rescue Exception => eMsg
-      puts eMsg.to_s
-    end
-  end
-end
-
-class TmdbMovie
-  private
-  def read_page(page)
-    html = nil
-    filespec = page.gsub(/^http:\//, 'spec/samples').gsub(/\/$/, '.html')
-    if File.exist?(filespec)
-      html = open(filespec).read
-    else
-      html = open(page).read
-      cache_html_files(page, html)
-    end
-    html
-  end
-
-  # this is used to save imdb pages so they may be used by rspec
-  def cache_html_files(page, html)
-    begin
-      filespec = page.gsub(/^http:\//, 'spec/samples').gsub(/\/$/, '.html')
-      unless File.exist?(filespec)
-        puts "caching #{filespec}"
-        File.mkdirs(File.dirname(filespec))
-        File.open(filespec, 'w') { |f| f.puts html }
+      data
+    end
+
+    # define the cache_file(page, data) method on the given class: cls
+    cls.send('define_method', "cache_file") do |page, data|
+      begin
+        filespec = page.gsub(/^http:\//, directory).gsub(/\/$/, '.html')
+        unless File.exist?(filespec)
+          puts "caching #{filespec}"
+          File.mkdirs(File.dirname(filespec))
+          File.open(filespec, 'w') { |f| f.puts data }
+        end
+      rescue Exception => eMsg
+        puts eMsg.to_s
       end
-    rescue Exception => eMsg
-      puts eMsg.to_s
     end
   end
-end
 
-class TmdbImage
-  private
-  def read_page(page)
-    html = nil
-    filespec = page.gsub(/^http:\//, 'spec/samples')
-    if File.exist?(filespec)
-      html = open(filespec).read
-    else
-      html = open(page).read
-      cache_html_files(page, html)
-    end
-    html
-  end
-
-  # this is used to save imdb pages so they may be used by rspec
-  def cache_html_files(page, html)
-    begin
-      filespec = page.gsub(/^http:\//, 'spec/samples')
-      unless File.exist?(filespec)
-        puts "caching #{filespec}"
-        File.mkdirs(File.dirname(filespec))
-        File.open(filespec, 'w') { |f| f.puts html }
+  # == Synopsis
+  # Find all classes that have a read_page instance method and
+  # then overwrite that read_page method with one that handles
+  # the caching.  Use the given directory for the cache files.
+  def self.attach_to_read_page_classes(directory='/tmp')
+    ObjectSpace.each_object(Class) do |cls|
+      if(cls.public_instance_methods(false).include?("read_page") ||
+        cls.protected_instance_methods(false).include?("read_page") ||
+        cls.private_instance_methods(false).include?("read_page"))
+        CacheExtensions.attach_to(cls, directory)
       end
-    rescue Exception => eMsg
-      puts eMsg.to_s
     end
   end
 end
 
-class ImdbMovie
-  private
-  def read_page(page)
-    html = nil
-    filespec = page.gsub(/^http:\//, 'spec/samples').gsub(/\/$/, '.html')
-    if File.exist?(filespec)
-      html = open(filespec).read
-    else
-      html = open(page).read
-      cache_html_files(page, html)
-    end
-    html
-  end
-
-  # this is used to save imdb pages so they may be used by rspec
-  def cache_html_files(page, html)
-    begin
-      filespec = page.gsub(/^http:\//, 'spec/samples').gsub(/\/$/, '.html')
-      unless File.exist?(filespec)
-        puts "caching #{filespec}"
-        File.mkdirs(File.dirname(filespec))
-        File.open(filespec, 'w') { |f| f.puts html }
-      end
-    rescue Exception => eMsg
-      puts eMsg.to_s
-    end
-  end
-end
-
-class ImdbSearch
-  private
-  def read_page(page)
-    html = nil
-    filespec = page.gsub(/^http:\//, 'spec/samples').gsub(/\/$/, '.html')
-    if File.exist?(filespec)
-      html = open(filespec).read
-    else
-      html = open(page).read
-      cache_html_files(page, html)
-    end
-    html
-  end
-
-  # this is used to save imdb pages so they may be used by rspec
-  def cache_html_files(page, html)
-    begin
-      filespec = page.gsub(/^http:\//, 'spec/samples').gsub(/\/$/, '.html')
-      unless File.exist?(filespec)
-        puts "caching #{filespec}"
-        File.mkdirs(File.dirname(filespec))
-        File.open(filespec, 'w') { |f| f.puts html }
-      end
-    rescue Exception => eMsg
-      puts eMsg.to_s
-    end
-  end
-end
-
-class ImdbImage
-  private
-  def read_page(page)
-    html = nil
-    filespec = page.gsub(/^http:\//, 'spec/samples').gsub(/\/$/, '.html')
-    if File.exist?(filespec)
-      html = open(filespec).read
-    else
-      html = open(page).read
-      cache_html_files(page, html)
-    end
-    html
-  end
-
-  # this is used to save imdb pages so they may be used by rspec
-  def cache_html_files(page, html)
-    begin
-      filespec = page.gsub(/^http:\//, 'spec/samples').gsub(/\/$/, '.html')
-      unless File.exist?(filespec)
-        puts "caching #{filespec}"
-        File.mkdirs(File.dirname(filespec))
-        File.open(filespec, 'w') { |f| f.puts html }
-      end
-    rescue Exception => eMsg
-      puts eMsg.to_s
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -6,13 +6,20 @@ rescue LoadError
   require 'spec'
 end
 
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'dvdprofiler2xbmc'
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require File.dirname(__FILE__) + '/cache_extensions'
+require 'dvdprofiler2xbmc'
 
 TMPDIR = File.join(File.dirname(__FILE__), '../tmp')
-
 SAMPLES_DIR = File.join(File.dirname(__FILE__), 'samples')
 
+require 'cache_extensions'
+CacheExtensions.attach_to_read_page_classes(SAMPLES_DIR)
+
 Signal.trap("INT") { exit(-1) }
+
+Spec::Runner.configure do |config|
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: royw-dvdprofiler2xbmc
 version: !ruby/object:Gem::Version 
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors: 
 - Roy Wright
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-19 00:00:00 -07:00
+date: 2009-04-20 00:00:00 -07:00
 default_executable: dvdprofiler2xbmc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: royw-tmdb
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.1.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: royw-dvdprofiler_collection
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: log4r
@@ -124,8 +124,11 @@ files:
 - lib/dvdprofiler2xbmc/controllers/fanart_controller.rb
 - lib/dvdprofiler2xbmc/controllers/nfo_controller.rb
 - lib/dvdprofiler2xbmc/controllers/thumbnail_controller.rb
+- lib/dvdprofiler2xbmc/models/dvdprofiler_info.rb
+- lib/dvdprofiler2xbmc/models/imdb_info.rb
 - lib/dvdprofiler2xbmc/models/media.rb
 - lib/dvdprofiler2xbmc/models/media_files.rb
+- lib/dvdprofiler2xbmc/models/tmdb_info.rb
 - lib/dvdprofiler2xbmc/models/xbmc_info.rb
 - lib/dvdprofiler2xbmc/open_cache_extension.rb
 - lib/dvdprofiler2xbmc/views/cli.rb