royw-dvdprofiler2xbmc 0.0.6 → 0.0.8

data/lib/dvdprofiler2xbmc/controllers/app.rb

@@ -8,12 +8,19 @@
 class DvdProfiler2Xbmc
   include Singleton
 
+  attr_accessor :multiple_profiles
+
   @interrupted = false
+  @interrupt_message = "control-C detected, finishing current task"
+
+  class << self
+    attr_accessor :interrupt_message
+  end
 
   # A trap("INT") in the Runner calls this to indicate that a ^C has been detected.
   # Note, once set, it is never cleared
   def self.interrupt
-    AppConfig[:logger].error { "control-C detected, finishing current task" }
+    AppConfig[:logger].error { @interrupt_message }
     @interrupted = true
   end
 
@@ -25,6 +32,7 @@ class DvdProfiler2Xbmc
 
   def initialize
     @media_files = nil
+    @multiple_profiles = []
   end
 
   # the application's main execution loop
@@ -32,13 +40,15 @@ class DvdProfiler2Xbmc
     AppConfig[:logger].info { "Media Directories:\n  #{AppConfig[:directories].join("\n  ")}" }
 
     @media_files = MediaFiles.new(AppConfig[:directories])
-    @media_files.titles.each do |title, medias|
-      break if DvdProfiler2Xbmc.interrupted?
-      medias.each do |media|
-        # note, NfoController update must be first as it sets isbn and imdb_id for media
-        NfoController.update(media)
-        ThumbnailController.update(media)
-        FanartController.update(media)
+    if AppConfig[:do_update]
+      @media_files.titles.each do |title, medias|
+        break if DvdProfiler2Xbmc.interrupted?
+        medias.each do |media|
+          # note, NfoController update must be first as it sets isbn and imdb_id for media
+          NfoController.update(media)
+          ThumbnailController.update(media)
+          FanartController.update(media)
+        end
       end
     end
 
@@ -57,6 +67,7 @@ class DvdProfiler2Xbmc
         buf += gen_report('missing_isbns', 'Missing ISBNs')
         buf += gen_report('missing_imdb_ids', 'Missing IMDB IDs')
         buf += gen_report('missing_thumbnails', 'Missing Thumbnails')
+        buf += gen_report('multiple_profiles', 'Multiple Profiles Found For Single Titles')
       end
     end
     buf
@@ -77,6 +88,58 @@ class DvdProfiler2Xbmc
     buf
   end
 
+  def self.save_to_file(filespec, data)
+    new_filespec = filespec + AppConfig[:extensions][:new]
+    File.open(new_filespec, "w") do |file|
+      file.puts(data)
+    end
+    backup_filespec = filespec + AppConfig[:extensions][:backup]
+    File.delete(backup_filespec) if File.exist?(backup_filespec)
+    File.rename(filespec, backup_filespec) if File.exist?(filespec)
+    File.rename(new_filespec, filespec)
+    File.delete(new_filespec) if File.exist?(new_filespec)
+  end
+
+  # options hash may have the following:
+  #  :extension  - an extension to append to the generated filespec
+  #  :year       - the production year
+  #  :resolution - the video resolution
+  def self.generate_filespec(media_pathspec, type, options={})
+    filespec = nil
+    begin
+      basespec = File.basename(media_pathspec, ".*").gsub(AppConfig[:part_regex], '')
+      dirname = File.dirname(media_pathspec)
+      part = :no_part
+      if media_pathspec =~ AppConfig[:part_regex]
+        part = :part
+      end
+
+      extension = AppConfig[:extensions][type]
+      year = options[:year] || ''
+      resolution = options[:resolution] || ''
+
+      if AppConfig[:naming][type].nil?
+        filespec = File.join(dirname, basespec)
+        unless extension.blank?
+          filespec += extension
+        end
+      else
+        format_str = AppConfig[:naming][type][part]
+        unless format_str.blank?
+          unless extension.blank?
+            filespec = File.join(dirname, format_str.gsub(/%t/, basespec).gsub(/%e/, extension).gsub(/%r/, resolution).gsub(/%y/, year))
+          end
+        end
+      end
+      unless options[:extension].blank?
+        filespec += options[:extension]
+      end
+    rescue Exception => e
+      AppConfig[:logger].error { "Error in generate_filespec(#{media_pathspec}, #{type}, #{options.inspect}) - #{e.to_s}" }
+    end
+    filespec
+  end
+
   protected
 
   # set the directory and file permissions for all files and directories under
@@ -85,9 +148,9 @@ class DvdProfiler2Xbmc
     Dir.glob(File.join(dir, '**/*')).each do |f|
       begin
         if File.directory?(f)
-          File.chmod(AppConfig[:dir_permissions], f) unless AppConfig[:dir_permissions].nil?
+          File.chmod(AppConfig[:dir_permissions].to_i(8), f) unless AppConfig[:dir_permissions].nil?
         else
-          File.chmod(AppConfig[:file_permissions], f) unless AppConfig[:file_permissions].nil?
+          File.chmod(AppConfig[:file_permissions].to_i(8), f) unless AppConfig[:file_permissions].nil?
         end
       rescue Exception => e
         AppConfig[:logger].error {e.to_s}
@@ -120,7 +183,7 @@ class DvdProfiler2Xbmc
         if medias[0].isbn.nil?
           paths = []
           medias.each do |media|
-            unless File.exist? media.path_to(:no_isbn_extension)
+            unless File.exist? media.path_to(:no_isbn)
               paths << "  #{media.media_path}"
             end
           end
@@ -157,7 +220,7 @@ class DvdProfiler2Xbmc
         buf << "No media for #{title}"
       else
         medias.each do |media|
-          thumbnail = media.path_to(:thumbnail_extension)
+          thumbnail = media.path_to(:thumbnail)
           unless File.exist?(thumbnail)
             buf << "  #{thumbnail} #{media.imdb_id.nil? ? '' : media.imdb_id}"
           end
@@ -167,5 +230,9 @@ class DvdProfiler2Xbmc
     buf
   end
 
+  def multiple_profiles_report
+    @multiple_profiles
+  end
+
 end
 

data/lib/dvdprofiler2xbmc/controllers/fanart_controller.rb

@@ -23,41 +23,63 @@ class FanartController
     unless @media.imdb_id.blank?
       if @media.fanart_files.empty?
         fetch_fanart(@media.imdb_id)
+        link_fanart(@media.path_to(:fanart))
       end
     end
     result
   end
 
-  protected
+  def link_fanart(dest_filespec)
+    ['original', 'mid', 'cover', 'thumb'].each do |size|
+      files = Dir.glob("#{dest_filespec}.#{size}.*")
+      unless files.blank?
+        filespec = files.sort.first
+        extension = File.extname(filespec)
+        link_filespec = dest_filespec + extension
+        unless File.exist?(link_filespec)
+          File.link(filespec, link_filespec)
+        end
+        break
+      end
+    end
+  end
 
-  DISC_NUMBER_REGEX = /\.(cd|part|disk|disc)\d+/i
+  protected
 
-  # TODO this only fetches the first fanart.  Probably should fetch
-  # all fanart but will need a naming scheme.  Need to research what
-  # the other xbmc utilities are doing.
   def fetch_fanart(imdb_id)
-    profile = TmdbProfile.new(imdb_id, @media.path_to(:tmdb_xml_extension))
+    profile = TmdbProfile.new(imdb_id, @media.path_to(:tmdb_xml))
+    indexes = {}
     unless profile.nil? || profile.movie.blank?
       movie = profile.movie
       unless movie['fanarts'].blank?
-        fanart = movie['fanarts'].first
-        AppConfig[:logger].debug { "#{fanart.inspect}" }
-        src_url = fanart['content']
-        unless src_url.blank?
-          fanart_filename = File.basename(@media.media_path, ".*").gsub(DISC_NUMBER_REGEX, '')
-          fanart_filename += AppConfig[:fanart_extension]
-          fanart_filename += File.extname(src_url)
-          dest_filespec = File.join(File.dirname(@media.media_path), fanart_filename)
-          unless File.exist?(dest_filespec)
-            AppConfig[:logger].info { "src_url => #{src_url}" }
-            AppConfig[:logger].info { "dest_fanart_filespec => #{dest_filespec}" }
-            copy_fanart(src_url, dest_filespec)
+        fanarts = movie['fanarts']
+        fanarts.each do |fanart|
+          AppConfig[:logger].debug { "#{fanart.inspect}" }
+          src_url = fanart['content']
+          unless src_url.blank?
+            dest_filespec = FanartController.get_destination_filespec(@media.media_path, fanart, indexes)
+            unless File.exist?(dest_filespec)
+              AppConfig[:logger].info { "src_url => #{src_url}" }
+              AppConfig[:logger].info { "dest_fanart_filespec => #{dest_filespec}" }
+              copy_fanart(src_url, dest_filespec)
+            end
           end
         end
       end
     end
   end
 
+  def FanartController.get_destination_filespec(media_path, fanart, indexes)
+    extension = File.extname(fanart['content'])
+    size = fanart['size']
+    unless size.blank?
+      indexes[size] ||= -1
+      indexes[size] += 1
+      extension = ".#{size}.#{indexes[size]}#{extension}"
+    end
+    fanart_filename = DvdProfiler2Xbmc.generate_filespec(media_path, :fanart, :extension => extension)
+  end
+
   # download the fanart
   def copy_fanart(src_url, dest_filespec)
     begin

data/lib/dvdprofiler2xbmc/controllers/nfo_controller.rb

@@ -20,7 +20,7 @@ class NfoController
   def initialize(media)
     @media = media
     @info = Hash.new
-    @xbmc_info = XbmcInfo.new(@media.path_to(:nfo_extension))
+    @xbmc_info = XbmcInfo.new(@media.path_to(:nfo))
     self.isbn = @xbmc_info.movie['isbn']
     self.imdb_id = @xbmc_info.movie['id']
   end
@@ -41,10 +41,16 @@ class NfoController
       @info.merge!(imdb_hash_to_info(imdb_hash))
       @info.merge!(dvd_hash_to_info(dvd_hash))
 
+      genres = @info['genre']
+      genres ||= []
+      genres += @media.media_subdirs.split('/') if AppConfig[:subdirs_as_genres]
+      new_genres = map_genres(genres.uniq).uniq.compact
+      @info['genre'] = new_genres unless new_genres.blank?
+
       save
       result = true
     rescue Exception => e
-      AppConfig[:logger].error { "Error updating \"#{@media.path_to(:nfo_extension)}\" - " + e.to_s + "\n" + e.backtrace.join("\n") }
+      AppConfig[:logger].error { "Error updating \"#{@media.path_to(:nfo)}\" - " + e.to_s + "\n" + e.backtrace.join("\n") }
       raise e
     end
     result
@@ -108,12 +114,20 @@ class NfoController
   def load_dvdprofiler
     dvd_hash = Hash.new
     # find ISBN for each title and assign to the media
-    profile = DvdprofilerProfile.first(:isbn => self.isbn, :title => @media.title)
-    unless profile.nil?
-      self.isbn ||= profile.isbn
-      AppConfig[:logger].info { "ISBN => #{self.isbn}" } unless self.isbn.nil?
-      profile.save(@media.path_to(:dvdprofiler_xml_extension))
-      dvd_hash = profile.dvd_hash
+    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
@@ -122,13 +136,13 @@ class NfoController
   # return movie hash
   def load_imdb(dvd_hash)
     imdb_hash = Hash.new
-    unless File.exist?(@media.path_to(:no_imdb_extension))
+    unless File.exist?(@media.path_to(:no_imdb_lookup))
       profile = ImdbProfile.first(:imdb_id => self.imdb_id,
-                                  :titles => self.get_imdb_titles,
+                                  :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_extension)
+                                  :filespec => @media.path_to(:imdb_xml)
                                   )
       unless profile.nil?
         self.imdb_id ||= profile.imdb_id
@@ -143,9 +157,9 @@ class NfoController
   # return movie hash
   def load_tmdb
     tmdb_hash = Hash.new
-    unless File.exist?(@media.path_to(:no_tmdb_extension))
+    unless File.exist?(@media.path_to(:no_tmdb_lookup))
       profile = TmdbProfile.first(:imdb_id => self.imdb_id,
-                                  :filespec => @media.path_to(:tmdb_xml_extension))
+                                  :filespec => @media.path_to(:tmdb_xml))
       unless profile.nil?
         tmdb_hash = profile.movie
       end
@@ -153,13 +167,35 @@ class NfoController
     tmdb_hash
   end
 
-  def get_imdb_titles
+  def get_imdb_titles(dvd_hash)
     titles = []
     titles << @info['title'] unless @info['title'].blank?
     titles << @media.title unless @media.title.blank?
+    titles += get_parent_titles(dvd_hash)
     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].info { "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].info { "parent titles => #{titles.pretty_inspect}" } unless titles.empty?
+    titles
+  end
+
   DVD_HASH_TO_INFO_MAP =     {
       :rating         => 'mpaa',
       :plot           => 'outline',
@@ -183,8 +219,7 @@ class NfoController
     info = Hash.new
     unless dvd_hash.nil?
       dvd_hash[:genres] ||= []
-      genres = map_genres((dvd_hash[:genres] + @media.media_subdirs.split('/')).uniq)
-      info['genre'] = genres unless genres.blank?
+      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|

data/lib/dvdprofiler2xbmc/controllers/thumbnail_controller.rb

@@ -39,7 +39,7 @@ class ThumbnailController
   def fetch_imdb_thumbnail(imdb_id)
     imdb_movie = ImdbMovie.new(imdb_id.gsub(/^tt/, ''))
     source_uri = imdb_movie.poster.image
-    dest_image_filespec = @media.path_to(:thumbnail_extension)
+    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)}
@@ -52,7 +52,7 @@ class ThumbnailController
   def copy_thumbnail(isbn)
     src_image_filespec = File.join(AppConfig[:images_dir], "#{isbn}f.jpg")
     if File.exist?(src_image_filespec)
-      dest_image_filespec = @media.path_to(:thumbnail_extension)
+      dest_image_filespec = @media.path_to(:thumbnail)
       do_copy = true
       if File.exist?(dest_image_filespec)
         if File.mtime(src_image_filespec) <= File.mtime(dest_image_filespec)

data/lib/dvdprofiler2xbmc/models/collection.rb

@@ -118,6 +118,9 @@ class Collection
           dvd_hash[:lastedited] = dvd[:lastedited][0] unless dvd[:lastedited].blank?
           directors = find_directors(dvd[:credits])
           dvd_hash[:directors] = directors unless directors.blank?
+          dvd_hash[:boxset] = dvd[:boxset] unless dvd[:boxset].blank?
+          dvd_hash[:mediatypes] = dvd[:mediatypes] unless dvd[:mediatypes].blank?
+          dvd_hash[:format] = dvd[:format] unless dvd[:format].blank?
           @isbn_dvd_hash[isbn] = dvd_hash
         end
       end

data/lib/dvdprofiler2xbmc/models/dvdprofiler_profile.rb

@@ -13,7 +13,7 @@
 # puts profile.to_xml
 # puts profile.isbn
 # puts profile.title
-# profile.save(media.path_to(:dvdprofiler_xml_extension))
+# profile.save(media.path_to(:dvdprofiler_xml))
 #
 class DvdprofilerProfile
 
@@ -40,7 +40,13 @@ class DvdprofilerProfile
         isbns.each do |isbn|
           dvd_hash = collection.isbn_dvd_hash[isbn]
           unless dvd_hash.blank?
-            result << DvdprofilerProfile.new(dvd_hash, isbn, options[:title])
+            unless options[:year].blank?
+              if dvd_hash[:productionyear].include? options[:year]
+                result << DvdprofilerProfile.new(dvd_hash, isbn, options[:title])
+              end
+            else
+              result << DvdprofilerProfile.new(dvd_hash, isbn, options[:title])
+            end
           end
         end
       end
@@ -103,25 +109,11 @@ class DvdprofilerProfile
       xml = self.to_xml
       unless xml.blank?
         AppConfig[:logger].debug { "saving #{filespec}" }
-        save_to_file(filespec, xml)
+        DvdProfiler2Xbmc.save_to_file(filespec, xml)
       end
     rescue Exception => e
       AppConfig[:logger].error { "Unable to save dvdprofiler profile to #{filespec} - #{e.to_s}" }
     end
   end
 
-  protected
-
-  def save_to_file(filespec, data)
-    new_filespec = filespec + AppConfig[:new_extension]
-    File.open(new_filespec, "w") do |file|
-      file.puts(data)
-    end
-    backup_filespec = filespec + AppConfig[:backup_extension]
-    File.delete(backup_filespec) if File.exist?(backup_filespec)
-    File.rename(filespec, backup_filespec) if File.exist?(filespec)
-    File.rename(new_filespec, filespec)
-    File.delete(new_filespec) if File.exist?(new_filespec)
-  end
-
 end

data/lib/dvdprofiler2xbmc/models/imdb_profile.rb

@@ -12,7 +12,7 @@
 #                             :media_years => ['2000'],
 #                             :production_years => ['1999'],
 #                             :released_years => ['2002', '2008']
-#                             :filespec => media.path_to(:imdb_xml_extension))
+#                             :filespec => media.path_to(:imdb_xml))
 # puts profile.movie['key'].first
 # puts profile.to_xml
 # puts profile.imdb_id
@@ -117,25 +117,13 @@ class ImdbProfile
       xml = self.to_xml
       unless xml.blank?
         AppConfig[:logger].debug { "saving #{filespec}" }
-        save_to_file(filespec, xml)
+        DvdProfiler2Xbmc.save_to_file(filespec, xml)
       end
     rescue Exception => e
       AppConfig[:logger].error "Unable to save imdb profile to #{filespec} - #{e.to_s}"
     end
   end
 
-  def save_to_file(filespec, data)
-    new_filespec = filespec + AppConfig[:new_extension]
-    File.open(new_filespec, "w") do |file|
-      file.puts(data)
-    end
-    backup_filespec = filespec + AppConfig[:backup_extension]
-    File.delete(backup_filespec) if File.exist?(backup_filespec)
-    File.rename(filespec, backup_filespec) if File.exist?(filespec)
-    File.rename(new_filespec, filespec)
-    File.delete(new_filespec) if File.exist?(new_filespec)
-  end
-
   # lookup IMDB title using years as the secondary search key
   # the titles should behave as an Array, the intent here is to be
   # able to try to find the exact title from DVD Profiler and if that