royw-dvdprofiler2xbmc 0.0.12 → 0.0.13

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 12
+:patch: 13
 :major: 0
 :minor: 0

data/lib/dvdprofiler2xbmc.rb

@@ -7,6 +7,7 @@ require 'xmlsimple'
 require 'ftools'
 require 'imdb'
 require 'tmdb'
+require 'dvdprofiler_collection'
 require 'mash'
 require 'log4r'
 require 'ruby-debug'
@@ -17,8 +18,6 @@ require 'dvdprofiler2xbmc/controllers/app'
 require 'dvdprofiler2xbmc/controllers/fanart_controller'
 require 'dvdprofiler2xbmc/controllers/nfo_controller'
 require 'dvdprofiler2xbmc/controllers/thumbnail_controller'
-require 'dvdprofiler2xbmc/models/collection'
-require 'dvdprofiler2xbmc/models/dvdprofiler_profile'
 require 'dvdprofiler2xbmc/models/media'
 require 'dvdprofiler2xbmc/models/media_files'
 require 'dvdprofiler2xbmc/models/xbmc_info'

data/lib/dvdprofiler2xbmc/controllers/app.rb

@@ -39,6 +39,8 @@ class DvdProfiler2Xbmc
   def execute
     AppConfig[:logger].info { "Media Directories:\n  #{AppConfig[:directories].join("\n  ")}" }
 
+    DvdprofilerProfile.collection_filespec = AppConfig[:collection_filespec]
+
     @media_files = MediaFiles.new(AppConfig[:directories])
     if AppConfig[:do_update]
       @media_files.titles.each do |title, medias|

data/spec/nfo_controller_spec.rb

@@ -12,10 +12,14 @@ describe "NfoController" do
     logger.outputters = Log4r::StdoutOutputter.new(:console)
     Log4r::Outputter[:console].formatter  = Log4r::PatternFormatter.new(:pattern => "%m")
     logger.level = Log4r::WARN
+
     AppConfig.default
     AppConfig[:logger] = logger
     AppConfig.load
+
+    DvdprofilerProfile.collection_filespec = AppConfig[:collection_filespec]
     File.mkdirs(TMPDIR)
+
     AppConfig[:logger].warn { "\nNfoController Specs" }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: royw-dvdprofiler2xbmc
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Roy Wright
@@ -115,8 +115,6 @@ files:
 - lib/dvdprofiler2xbmc/controllers/nfo_controller.rb
 - lib/dvdprofiler2xbmc/controllers/thumbnail_controller.rb
 - lib/dvdprofiler2xbmc/extensions.rb
-- lib/dvdprofiler2xbmc/models/collection.rb
-- lib/dvdprofiler2xbmc/models/dvdprofiler_profile.rb
 - lib/dvdprofiler2xbmc/models/media.rb
 - lib/dvdprofiler2xbmc/models/media_files.rb
 - lib/dvdprofiler2xbmc/models/xbmc_info.rb
@@ -127,7 +125,6 @@ files:
 - spec/cache_extensions.rb
 - spec/config_editor_spec.rb
 - spec/dvdprofiler2xbmc_spec.rb
-- spec/dvdprofiler_profile_spec.rb
 - spec/fanart_controller_spec.rb
 - spec/media_spec.rb
 - spec/nfo_controller_spec.rb
@@ -181,7 +178,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/app_spec.rb
 - spec/config_editor_spec.rb
-- spec/dvdprofiler_profile_spec.rb
 - spec/fanart_controller_spec.rb
 - spec/media_spec.rb
 - spec/nfo_controller_spec.rb

data/lib/dvdprofiler2xbmc/models/collection.rb

@@ -1,186 +0,0 @@
-# == Synopsis
-# This model encapsulates the DVDProfiler Collection.xml
-class Collection
-  # various regexes used to clean up a title for matching purposes.
-  # used in TITLE_REPLACEMENTS hash below
-  PUNCTUATION = /[\?\:\!\"\'\,\.\-\/\*]/
-  HTML_ESCAPES = /\&[a-zA-Z]+\;/
-  SQUARE_BRACKET_ENCLOSURES = /\[.*?\]/
-  PARENTHESIS_ENCLOSURES = /\(.*?\)/
-  MULTIPLE_WHITESPACES= /\s+/
-  STANDALONE_AMPERSAND = /\s\&\s/
-  WIDESCREEN = /widescreen/i
-  SPECIAL_EDITION = /special edition/i
-
-  # array of hashes is intentional as the order is critical
-  # the enclosures [...] & (...) must be removed first,
-  # then " & " must be replaced by " and ",
-  # then html escapes &...; must be replaced by a space,
-  # then remaining punctuation is replacesed by a space,
-  # finally multiple whitespaces are reduced to single whitespace
-  TITLE_REPLACEMENTS = [
-    { SQUARE_BRACKET_ENCLOSURES => ''      },
-    { PARENTHESIS_ENCLOSURES    => ''      },
-    { STANDALONE_AMPERSAND      => ' and ' },
-    { HTML_ESCAPES              => ' '     },
-    { WIDESCREEN                => ' '     },
-    { SPECIAL_EDITION           => ' '     },
-    { PUNCTUATION               => ' '     },
-    { MULTIPLE_WHITESPACES      => ' '     },
-  ]
-
-  attr_reader :isbn_dvd_hash, :title_isbn_hash, :isbn_title_hash
-
-  @filespec = nil
-
-  def initialize(filename = 'Collection.xml')
-    @title_isbn_hash = Hash.new
-    @isbn_dvd_hash = Hash.new
-    @isbn_title_hash = Hash.new
-    @filespec = filename
-    reload
-    save
-  end
-
-  # save as a collection.yaml file unless the existing
-  # collection.yaml is newer than the collection.xml
-  def save
-    unless @filespec.nil?
-      yaml_filespec = @filespec.ext('.yaml')
-      if !File.exist?(yaml_filespec) || (File.mtime(@filespec) > File.mtime(yaml_filespec))
-        AppConfig[:logger].info { "saving: #{yaml_filespec}" }
-        File.open(yaml_filespec, "w") do |f|
-          YAML.dump(
-            {
-              :title_isbn_hash => @title_isbn_hash,
-              :isbn_title_hash => @isbn_title_hash,
-              :isbn_dvd_hash => @isbn_dvd_hash,
-            }, f)
-        end
-      else
-        AppConfig[:logger].info { "not saving, yaml file is newer than xml file" }
-      end
-    else
-      AppConfig[:logger].error { "can not save, the filespec is nil" }
-    end
-  end
-
-  # load the collection from the collection.yaml if it exists,
-  # otherwise from the collection.xml
-  def reload
-    @title_isbn_hash.clear
-    @isbn_dvd_hash.clear
-    @isbn_title_hash.clear
-    collection = Hash.new
-    yaml_filespec = @filespec.ext('.yaml')
-    if File.exist?(yaml_filespec) && (File.mtime(yaml_filespec) > File.mtime(@filespec))
-      AppConfig[:logger].info { "Loading #{yaml_filespec}" }
-      data = YAML.load_file(yaml_filespec)
-      @title_isbn_hash = data[:title_isbn_hash]
-      @isbn_dvd_hash = data[:isbn_dvd_hash]
-      @isbn_title_hash = data[:isbn_title_hash]
-    else
-      elapsed_time = timer do
-        AppConfig[:logger].info { "Loading #{@filespec}" }
-        collection = XmlSimple.xml_in(@filespec, { 'KeyToSymbol' => true})
-      end
-      AppConfig[:logger].info { "XmlSimple.xml_in elapse time: #{elapsed_time.elapsed_time_s}" }
-      collection[:dvd].each do |dvd|
-        isbn = dvd[:id][0]
-        original_title = dvd[:title][0]
-        title = Collection.title_pattern(dvd[:title][0])
-        unless isbn.blank? || title.blank?
-          @title_isbn_hash[title] ||= []
-          @title_isbn_hash[title] << isbn
-          @isbn_title_hash[isbn] = original_title
-          dvd_hash = Hash.new
-          dvd_hash[:isbn] = isbn
-          dvd_hash[:title] = original_title
-          unless dvd[:actors].blank?
-            dvd_hash[:actors] = dvd[:actors].compact.collect {|a| a[:actor]}.flatten.compact.collect do |a|
-              name = []
-              name << a['FirstName'] unless a['FirstName'].blank?
-              name << a['MiddleName'] unless a['MiddleName'].blank?
-              name << a['LastName'] unless a['LastName'].blank?
-              info = Hash.new
-              info['name'] = name.join(' ')
-              info['role'] = a['Role']
-              info
-            end
-          end
-          dvd_hash[:genres] = dvd[:genres].collect{|a| a[:genre]}.flatten unless dvd[:genres].blank?
-          dvd_hash[:studios] = dvd[:studios].collect{|a| a[:studio]}.flatten unless dvd[:studios].blank?
-          dvd_hash[:productionyear] = [dvd[:productionyear].join(',')] unless dvd[:productionyear].blank?
-          dvd_hash[:rating] = [dvd[:rating].join(',')] unless dvd[:rating].blank?
-          dvd_hash[:runningtime] = [dvd[:runningtime].join(',')] unless dvd[:runningtime].blank?
-          dvd_hash[:released] = [dvd[:released].join(',')] unless dvd[:released].blank?
-          dvd_hash[:overview] = [dvd[:overview].join(',')] unless dvd[:overview].blank?
-          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
-    end
-  end
-
-  def find_directors(dvd_credits)
-    directors = nil
-    begin
-      dvd[:credits].each do |credits_hash|
-        credits_hash[:credit].each do |credit_hash|
-          if((credit_hash['CreditType'] == 'Direction') || (credit_hash['CreditSubtype'] == 'Director'))
-            name = []
-            name << credit_hash['FirstName']  unless credit_hash['FirstName'].blank?
-            name << credit_hash['MiddleName'] unless credit_hash['MiddleName'].blank?
-            name << credit_hash['LastName']   unless credit_hash['LastName'].blank?
-            directors ||= []
-            directors << name.join(' ')
-          end
-        end
-      end
-    rescue
-    end
-    directors
-  end
-
-  # == Synopsis
-  # The titles found between LMCE's Amazon lookup and DVDProfiler sometimes differ in
-  # whether or not a prefix of "The", "A", or "An" is included in the title.  Here we
-  # create an Array of possible titles with and without these prefix words.
-  def Collection.title_permutations(base_title)
-    titles = []
-    unless base_title.nil? || base_title.empty?
-      titles << base_title
-      ['the', 'a', 'an'].each do |prefix|
-        titles << "#{prefix} " + base_title unless base_title =~ /^#{prefix}\s/
-        titles << $1 if base_title =~ /^#{prefix}\s(.*)$/
-      end
-    end
-    titles
-  end
-
-  # == Synopsis
-  # the titles found between LMCE's Amazon lookup and DVDProfiler quite often differ in the
-  # inclusion of punctuation and capitalization.  So we create a pattern of lower case words
-  # without punctuation and with single spaces between words.
-  def Collection.title_pattern(src_title)
-    title = nil
-    unless src_title.nil?
-      title = src_title.dup
-      title.downcase!
-      TITLE_REPLACEMENTS.each do |replacement|
-        replacement.each do |regex, value|
-          title.gsub!(regex, value)
-        end
-      end
-      title.strip!
-    end
-    title
-  end
-
-end
-

data/lib/dvdprofiler2xbmc/models/dvdprofiler_profile.rb

@@ -1,119 +0,0 @@
-# This is the model for the DVD Profiler profile which is used
-# to find meta data from DVD Profiler's exported Collection.xml
-#
-# Usage:
-#
-# profiles = DvdprofilerProfile.all(:titles => ['The Alamo'])
-#
-# profile = DvdprofilerProfile.first(:isbn => '012345678901')
-# or
-# profile = DvdprofilerProfile.first(:title => 'movie title')
-#
-# puts profile.dvd_hash[:key]
-# puts profile.to_xml
-# puts profile.isbn
-# puts profile.title
-# profile.save(media.path_to(:dvdprofiler_xml))
-#
-class DvdprofilerProfile
-
-  # options:
-  #  :isbn => String
-  #  :title => String
-  # returns:  Array of DvdprofilerProfile instances
-  def self.all(options={})
-    # :isbn_dvd_hash, :title_isbn_hash, :isbn_title_hash
-    result = []
-
-    # try finding by isbn first
-    if options.has_key?(:isbn) && !options[:isbn].blank?
-      dvd_hash = collection.isbn_dvd_hash[options[:isbn]]
-      unless dvd_hash.blank?
-        result << DvdprofilerProfile.new(dvd_hash, options[:isbn])
-      end
-    end
-
-    # if unable to find by isbn, then try finding by title
-    if result.empty? && options.has_key?(:title)
-      isbns = self.find_isbns(options)
-      unless isbns.blank?
-        isbns.each do |isbn|
-          dvd_hash = collection.isbn_dvd_hash[isbn]
-          unless dvd_hash.blank?
-            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
-    end
-
-    # return all profiles if neither :isbn nor :title are given
-    if result.empty? && !options.has_key?(:isbn) && !options.has_key?(:title)
-      collection.isbn_dvd_hash.each do |isbn, dvd_hash|
-        result << DvdprofilerProfile.new(dvd_hash, isbn)
-      end
-    end
-
-    result
-  end
-
-  # options:
-  #  :isbn => String
-  #  :title => String
-  # returns:  DvdprofilerProfile instance or nil
-  def self.first(options={})
-    all(options).first
-  end
-
-  # look up ISBN by title
-  # expects a :title option
-  # returns Array of ISBN Strings
-  def self.find_isbns(options={})
-    result = []
-    if options.has_key?(:title)
-      result = [collection.title_isbn_hash[Collection.title_pattern(options[:title])]].flatten.uniq.compact
-    end
-    result
-  end
-
-  protected
-
-  def self.collection
-    @collection ||= Collection.new(File.expand_path(AppConfig[:collection_filespec]))
-  end
-
-  def initialize(dvd_hash, isbn, title=nil)
-    @dvd_hash = dvd_hash
-    @isbn = isbn
-    @title = title
-    @title ||= @dvd_hash[:title]
-  end
-
-  public
-
-  attr_reader :isbn, :title, :dvd_hash
-
-  def to_xml
-    data = @dvd_hash.stringify_keys
-    data.delete_if { |key, value| value.nil? }
-    xml = XmlSimple.xml_out(data, 'NoAttr' => true, 'RootName' => 'movie')
-  end
-
-  def save(filespec)
-    begin
-      xml = self.to_xml
-      unless xml.blank?
-        AppConfig[:logger].debug { "saving #{filespec}" }
-        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
-
-end

data/spec/dvdprofiler_profile_spec.rb

@@ -1,66 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
-require 'tempfile'
-
-# Time to add your specs!
-# http://rspec.info/
-
-describe "DvdprofilerProfile" do
-
-  before(:all) do
-    logger = Log4r::Logger.new('dvdprofiler2xbmc')
-    logger.outputters = Log4r::StdoutOutputter.new(:console)
-    Log4r::Outputter[:console].formatter  = Log4r::PatternFormatter.new(:pattern => "%m")
-    logger.level = Log4r::WARN
-    AppConfig.default
-    AppConfig[:logger] = logger
-    AppConfig.load
-    AppConfig[:collection_filespec] = 'spec/samples/Collection.xml'
-    File.mkdirs(TMPDIR)
-    AppConfig[:logger].warn { "\nDvdprofilerProfile Specs" }
-  end
-
-  before(:each) do
-    @profile = DvdprofilerProfile.first(:isbn => '786936735390')
-  end
-
-  after(:all) do
-    Dir.glob(File.join(TMPDIR, "dvdprofiler_profile_spec*")).each { |filename| File.delete(filename) }
-  end
-
-  it "should find by imdb_id" do
-    @profile.should_not == nil
-  end
-
-  it "should find by title" do
-    profile = DvdprofilerProfile.first(:title => 'National Treasure 2: Book of Secrets')
-    profile.should_not == nil
-  end
-
-  it "should be able to convert to xml and then from xml" do
-    hash = nil
-    begin
-      xml = @profile.to_xml
-      hash = XmlSimple.xml_in(xml)
-    rescue
-      hash = nil
-    end
-    hash.should_not be_nil
-  end
-
-  it "should find multiple movies with the same title" do
-    profiles = DvdprofilerProfile.all(:title => 'Sabrina')
-    profiles.length.should == 2
-  end
-
-  it "should find a single movie using the year when multiple movies have the same title" do
-    profiles = DvdprofilerProfile.all(:title => 'Sabrina', :year => '1995')
-    (profiles.length.should == 1) && (profiles.first.isbn.should == '097363304340')
-  end
-
-  it "should find the other single movie using the year when multiple movies have the same title" do
-    profiles = DvdprofilerProfile.all(:title => 'Sabrina', :year => '1954')
-    (profiles.length.should == 1) && (profiles.first.isbn.should == '097360540246')
-  end
-
-end