bingwallpaper 0.5.4 → 0.5.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDY0Y2MwYTA0ZDlhNDNhMjg1NzA1MDA3Yzk5ZGY1NmFkZTFlYzM1NQ==
+    ZGJjZDcwY2Y1YzU5MjBjMTAzNTA0YzEwZWY4ZTY4MGYwZTc3NWMzZg==
   data.tar.gz: !binary |-
-    ODBiODFjMDI1NzkwNmI0NmQ4ODZiNjhkNzlkMDIyN2Y1ZmZhZmE1MQ==
+    OTQ0NmU5MzU3YTBiMTlmMjA5OThkMzMyYzE5NWE2NmE3NTkwMmMzMA==
 SHA512:
   metadata.gz: !binary |-
-    OGM2NGM5NmIwZTAzYTFlMjlhMWE5MzA4ZDY4ZDI2Y2NlOGYwODAxNzYzYmEy
-    YjJiOTAyOTcwNDNiMTUzYWEwMzQwMmVlYjY1YTg1Mzc2ZGYyMDdmNThiZWFi
-    MDk1ZGJiNGQ4MDIyNzFjOTJmMjcyYTcwMDBhOWRjYzk4MDgyN2E=
+    OTE2MjM1MDM0ZWQ5ZTRmODNkMmNiMzdkM2Q3ZTFmODc2NDM3ZTI0MjliYmZl
+    MjliYzYxNWM4MTk5MjE2MTk5OTNiZmJmNmQ1OTU5NDlhMWUxNWE0NWM3NTZj
+    MmU2NmJiMjQ3ZGMyYTVhZTVlM2I1OGY4ZDAyN2RkOWQ0ODMzZTM=
   data.tar.gz: !binary |-
-    YTAwNWEwZmFmNmJkZjA2NzZhMzRkMjY4NzU0ODJmODcwNTVmYTQwYjczYmZl
-    NWQyNzE2MTRmZTMxYmQ5NzAxNjQzNDk3YmRhMDVkN2Q1OTI5OWJkZGRkNGYx
-    OGZmMTUxMWNmYmRmZDFhMmM4ZDk4NWY3OWU4NjU1ODRmZTUzMTI=
+    ZWJkYjE5MDRiMzU2MWZiMjNiYjRiMzk5Yzc0NmZmZGVmOWEyY2MxOGNiYzU2
+    OGQwOTk0ZTRjMjgzOWQyNmJlMDE3YjQ5YjAwZWQwOWRlMThhMGVhOGVlYzA0
+    N2QwMTlmODUxY2ZlNjRlZWY3MjdhYWU5YjdmNTUwZGJkNzkxZWI=

data/bin/bingwallpaper

@@ -26,21 +26,41 @@ begin
   image_data = bingImage.parse_xml data_url
 
   # decide where we'll save today's image
-  image_path = bingImage.image_storage_path image_data[0]
+  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?
+  if !(image_path.exist? || fallback_image_path.exist?)
 
-    # download the image and set the wallpaper
-    bingImage.download_image image_data[0]
+    begin
+      # download the image and set the wallpaper
+      bingImage.download_image image_data[0]
+    rescue Exception => exception
+      logger.info "Sorry, couldn't download the 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
-  `feh --bg-fill #{image_path}`
+  if image_path.exist?
+
+    # set the wallpaper
+    logger.info "Wallpaper set to #{image_path}"
+    `feh --bg-fill #{image_path}`
+  else fallback_image_path.exist?
+
+    # set the wallpaper
+    logger.info "Sorry, only the low-resolution image was available today. :-("
+    logger.info "Wallpaper set to #{image_path}"
+    `feh --bg-fill #{fallback_image_path}`
+  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

@@ -82,10 +82,15 @@ module Bingwallpaper
         image_path = image.xpath('url').text.sub(image.xpath('url').text.rpartition("_").
                                                  last, '1920x1200.jpg')
 
+        # store the other path as fallback
+        image_fallback_path = image.xpath('url').text.to_s
+
         # build our hash of image data
         {:links => {:url => build_url(image_path),
+                    :fallback_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,
             :copyright => image.xpath('copyright').text}
       end
     end
@@ -93,9 +98,9 @@ module Bingwallpaper
     # Returns a Pathname with location where the image from the
     # provided Bing image hash will be stored.
     #
-    # image_data:: Hash of Bing image data
-    def image_storage_path(image_data)
-      Pathname.new @storage_path + "/" + image_data[:file_name]
+    # 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.
@@ -104,12 +109,22 @@ module Bingwallpaper
     def download_image(image_data)
 
       begin
-        open(image_storage_path(image_data), 'wb') do |file|
+        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))
-        raise 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
+        end
       end
     end
   end

data/lib/bingwallpaper/version.rb

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

metadata

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