bingwallpaper 0.5.5 → 0.5.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGJjZDcwY2Y1YzU5MjBjMTAzNTA0YzEwZWY4ZTY4MGYwZTc3NWMzZg==
+    YmI3M2ZmNDY2ZmUwMWE1NGI1MjA4MzE4MGYyMjQzYWFhZjczMzNhOA==
   data.tar.gz: !binary |-
-    OTQ0NmU5MzU3YTBiMTlmMjA5OThkMzMyYzE5NWE2NmE3NTkwMmMzMA==
+    NjIyZTBlODIyODcyMzY2OTgyMWRkMjM2YjQ0MjQwZmEzYjEyOGI5MQ==
 SHA512:
   metadata.gz: !binary |-
-    OTE2MjM1MDM0ZWQ5ZTRmODNkMmNiMzdkM2Q3ZTFmODc2NDM3ZTI0MjliYmZl
-    MjliYzYxNWM4MTk5MjE2MTk5OTNiZmJmNmQ1OTU5NDlhMWUxNWE0NWM3NTZj
-    MmU2NmJiMjQ3ZGMyYTVhZTVlM2I1OGY4ZDAyN2RkOWQ0ODMzZTM=
+    Yjk4OGZjNTBkZmFlMDU5YmJmMWIzMGM5OWY0MThhM2YwOWU3ZGFiYmQwMGJj
+    YWI1NDAzZmM5MjNiNTE1ZDE1ZjhlYmNlODU2OGY0ZTVlYWU0ZTdmN2RmYzc4
+    NjRiYmVkMzhmOGI0YmI5MjliZmI2ZDE1NWI5ZjA5YTNjYTlmNmM=
   data.tar.gz: !binary |-
-    ZWJkYjE5MDRiMzU2MWZiMjNiYjRiMzk5Yzc0NmZmZGVmOWEyY2MxOGNiYzU2
-    OGQwOTk0ZTRjMjgzOWQyNmJlMDE3YjQ5YjAwZWQwOWRlMThhMGVhOGVlYzA0
-    N2QwMTlmODUxY2ZlNjRlZWY3MjdhYWU5YjdmNTUwZGJkNzkxZWI=
+    ODBhMDAxZjZiMTRmNDRhOTMwNTgzNTU4NjgzMjM5MTk4NThjYzRhYzEyMmE4
+    ZjdmNDMzZDFiNTliY2U1NmE3ZjM4YmFkZjM4ZDM3YTgzYTA3NTJmM2FmOTk2
+    MDJmYzgxYTRjMzZhZjZkOWQwODUxNDlhZTY4ODU0MzkwNWFhNDg=

data/bin/bingwallpaper

@@ -29,20 +29,29 @@ begin
   image_path = bingImage.image_storage_path image_data[0][:file_name]
   fallback_image_path = bingImage.image_storage_path image_data[0][:fallback_file_name]
 
-  # only download the wallpaper once
-  if !(image_path.exist? || fallback_image_path.exist?)
+  # try the hi-res image
+  if !image_path.exist?
 
     begin
-      # download the image and set the wallpaper
-      bingImage.download_image image_data[0]
+
+      bingImage.download_image image_path, image_data[0][:links][:url]
     rescue Exception => exception
-      logger.info "Sorry, couldn't download the image of the day. :'("
+      logger.info "I couldn't download the hi-resolution image of the day..."
+      logger.info "I couldn't load " + image_data[0][:links][:url]
+    end
+  end
+
+
+  # fallback to the low-res image
+  if !image_path.exist? && !fallback_image_path.exist?
+
+    begin
+
+      bingImage.download_image fallback_image_path, image_data[0][:links][:fallback_url]
+    rescue Exception => exception
+      logger.info "I couldn't download the low-resolution image of the day..."
       logger.info "I couldn't load " + image_data[0][:links][:url]
-      logger.info image_data[0]
-      logger.error "The problem was: " + exception.message
     end
-  else
-    logger.info "Today's wallpaper already downloaded. ;-)"
   end
 
   # set the wallpaper
@@ -51,16 +60,18 @@ begin
     # set the wallpaper
     logger.info "Wallpaper set to #{image_path}"
     `feh --bg-fill #{image_path}`
-  else fallback_image_path.exist?
+  elsif fallback_image_path.exist?
 
     # set the wallpaper
-    logger.info "Sorry, only the low-resolution image was available today. :-("
+    logger.info "Only the low-resolution image was available today."
     logger.info "Wallpaper set to #{image_path}"
     `feh --bg-fill #{fallback_image_path}`
+  else
+
+    logger.info "Sorry, I couldn't download the Bing Image of the Day. :'("
   end
 rescue Exception => exception
   logger.info "Sorry, I couldn't set today's Bing Image of the Day Wallpaper. :'("
   logger.error "The problems was: " + exception.message
-  logger.error exception.backtrace
   exit 1
 end

data/lib/bingwallpaper/image.rb

@@ -87,7 +87,7 @@ module Bingwallpaper
 
         # build our hash of image data
         {:links => {:url => build_url(image_path),
-                    :fallback_url => image_fallback_path,
+                    :fallback_url => build_url(image_fallback_path),
                     :copyright_url => image.xpath('copyrightlink').text},
             :file_name => Pathname.new(image_path).basename.to_s,
             :fallback_file_name => Pathname.new(image_fallback_path).basename.to_s,
@@ -98,33 +98,27 @@ module Bingwallpaper
     # Returns a Pathname with location where the image from the
     # provided Bing image hash will be stored.
     #
-    # file_name:: Path to the file storage location
+    # file_name:: Path to the file storage location'
     def image_storage_path(file_name)
       Pathname.new @storage_path + "/" + file_name
     end
 
-    # Downloads the Bing image from the provided image hash.
+    # Downloads the image at the supplied URL and saves it to the
+    # specified file.
     #
-    # image_date:: Hash of Bing image data
-    def download_image(image_data)
+    # file_path:: Path for the storing image
+    # url:: URL to the image to download
+    def download_image(file_path, url)
 
       begin
-        open(image_storage_path(image_data[:file_name]), 'wb') do |file|
-          file << open(image_data[:links][:url]).read
-        end
-      rescue Exception => exception
-
-        FileUtils.rm(image_storage_path(image_data[:file_name]))
 
-        begin
-          open(image_storage_path(image_data[:fallback_file_name]), 'wb') do |file|
-            file << open(image_data[:links][:fallback_url]).read
-          end
-        rescue
-
-          FileUtils.rm(image_storage_path(image_data[:fallback_file_name]))
-          raise exception
+        # download the hi-res image
+        open(file_path, 'wb') do |file|
+          file << open(url).read
         end
+      rescue Exception => exception
+        file_path.delete
+        raise exception
       end
     end
   end

data/lib/bingwallpaper/version.rb

@@ -1,3 +1,3 @@
 module Bingwallpaper
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bingwallpaper
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - cmiles74
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri