royw-tmdb 0.1.2 → 0.1.3

data/VERSION.yml

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

data/lib/tmdb/tmdb_image.rb

@@ -4,10 +4,11 @@ class TmdbImage
   # imdb_id => String IMDB ID either with or without the 'tt' prefix
   # api_key => String containing the themovieDb.com API key
   # logger => nil or logger instance
-  def initialize(ident, api_key, logger)
+  def initialize(ident, api_key, logger, filespec=nil)
     @imdb_id = 'tt' + ident.gsub(/^tt/, '') unless ident.blank?
     @api_key = api_key
     @logger = OptionalLogger.new(logger)
+    @filespec = filespec
   end
 
   # return an Array of fanart sizes as Strings
@@ -26,7 +27,7 @@ class TmdbImage
     src_url = nil
     if fanart_sizes.include?(size)
       src_url = image_url(@imdb_id, 'fanarts', size)
-      copy_image(src_url, dest_filespec) unless dest_filespec.nil?
+      copy_image(src_url, dest_filespec)
     end
     src_url
   end
@@ -37,7 +38,7 @@ class TmdbImage
     src_url = nil
     if poster_sizes.include?(size)
       src_url = image_url(@imdb_id, 'posters', size)
-      copy_image(src_url, dest_filespec) unless dest_filespec.nil?
+      copy_image(src_url, dest_filespec)
     end
     src_url
   end
@@ -92,7 +93,7 @@ class TmdbImage
   # size => member of either fanart_sizes or poster_sizes
   def image_url(imdb_id, type, size)
     src_url = nil
-    profile = TmdbProfile.first(:imdb_id => imdb_id, :api_key => @api_key, :filespec => nil, :logger => @logger)
+    profile = TmdbProfile.first(:imdb_id => imdb_id, :api_key => @api_key, :filespec => @filespec, :logger => @logger)
     indexes = {}
     unless profile.nil? || profile.movie.blank?
       movie = profile.movie
@@ -110,19 +111,29 @@ class TmdbImage
   end
 
   # download the fanart
+  # returns nil if no attempt to copy was made, 0 on error, or the image size in bytes on success
   def copy_image(src_url, dest_filespec)
-    begin
-      extension = File.extname(src_url)
-      unless extension.blank?
-        dest_filespec += extension
-      end
-      data = fetch(src_url.escape_unicode)
-      File.open(dest_filespec, 'w') do |file|
-        file.print(data)
+    image_size = nil
+    unless src_url.blank? || dest_filespec.blank?
+      begin
+        image_size = 0
+        extension = File.extname(src_url)
+        unless extension.blank?
+          dest_filespec += extension
+        end
+        unless File.exist?(dest_filespec) && (File.size(dest_filespec) > 0)
+          @logger.info { "Downloading: #{src_url}" }
+          data = fetch(src_url.escape_unicode)
+          File.open(dest_filespec, 'w') do |file|
+            file.print(data)
+          end
+        end
+        image_size = File.size(dest_filespec)
+      rescue Exception => e
+        @logger.error { "Error fetching image.\n  src_url => #{src_url},\n  dest_filespec => #{dest_filespec}\n  #{e.to_s}" }
       end
-    rescue Exception => e
-      @logger.error { "Error fetching image.\n  src_url => #{src_url},\n  dest_filespec => #{dest_filespec}\n  #{e.to_s}" }
     end
+    image_size
   end
 
   MAX_ATTEMPTS = 3

data/lib/tmdb/tmdb_profile.rb

@@ -62,7 +62,7 @@ class TmdbProfile
 
   # return the TmdbImage for this profile
   def image
-    TmdbImage.new(@imdb_id.gsub(/^tt/, ''), @api_key, @logger) rescue nil
+    TmdbImage.new(@imdb_id.gsub(/^tt/, ''), @api_key, @logger, @filespec) rescue nil
   end
 
   protected

data/spec/tmdb_image_spec.rb

@@ -107,6 +107,19 @@ describe "TmdbImage" do
     (File.exist?(filespec).should be_true) && (File.size(filespec).should > 0)
   end
 
+  # these are a couple of white box tests to show a bug where
+  # src_url was nil but copy_image was trying to copy from it anyway.
+
+  it "should not attempt to copy if src_url is blank" do
+    dest_filespec = get_temp_filename
+    @image.send('copy_image', nil, dest_filespec).should be_nil
+  end
+
+  it "should not attempt to copy if dest_filespec is blank" do
+    src_url = @image.send('image_url', 'tt0465234', 'fanarts', 'original')
+    @image.send('copy_image', src_url, nil).should be_nil
+  end
+
   def get_temp_filename
     outfile = Tempfile.new('tmdb_image_spec', TMPDIR)
     filespec = outfile.path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: royw-tmdb
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Roy Wright