bingwallpaper 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c7d463413b4ff8a8acb349f42da411983ae8d73
-  data.tar.gz: 29eb28625a0733fa4fca25f4d2bf071f34780bf9
+  metadata.gz: cbe0ff2f5121c0ed61a1409c03032217f3dcd9c1
+  data.tar.gz: 7e93502c56083636d162b1bbdf99150991edb065
 SHA512:
-  metadata.gz: 889e2ac347079fe55df1d2b1a5a0a5b158dec4a640b92fdb0c3cae7d00cb561b156784efe3d4abd0bc2d441ffaca5f6d51de7ea3fe936cdd245a98500992bd14
-  data.tar.gz: e542578c1fc8b3698c2d21e4af81812a13c4aac9cdd63d7e1b9fc27b8217a45bca560900a766f45e6bd73ca800094bcc0991714e19f18c3fa15bf67dec80c9cf
+  metadata.gz: c159dee737b17aa458bcb3106a95e5e8fb0c224ef62729abb59fb8a1a77e557901e40e748336b1e1c108278e74d66378633ba96f47c37631518a95c5150a4421
+  data.tar.gz: 84be0238face2db9f554d6c3f3dcd579b7b7f257e767859c8578b149d2ad1ec297deff4a41bcdfed6287b1c804fe315c6e3fe8abf8141614d92f844102057643

data/.ruby-version

@@ -0,0 +1 @@
+2.5.3

data/README.md

@@ -1,3 +1,4 @@
+
 [![Gem Version](https://badge.fury.io/rb/bingwallpaper.svg)](http://badge.fury.io/rb/bingwallpaper)
 
 # Bing Wallpaper
@@ -9,10 +10,10 @@ wallpaper.
 ## How It Works
 
 I wrote this script with my own environment in mind, so it's pretty
-simple-minded. It fetches the XML describing today's image, then fetches
-the 1920x1200 sized version. Lastly, it uses [Feh][1] or Gnome to set
-the wallpaper for your environment. I've tested it in [i3][2] and Gnome
-3.14.2 and nowhere else.
+simple-minded. It fetches the XML describing today's image, then fetches the
+1920x1200 sized version if it's available, the lower resolution version if not.
+Lastly, it uses [Feh][1] or Gnome to set the wallpaper for your environment.
+I've tested it in [i3][2] and Gnome 3.14.2 and nowhere else.
 
 ## Using the Script
 

data/bin/bingwallpaper

@@ -8,6 +8,7 @@
 require "bingwallpaper"
 require "logger"
 require "optparse"
+require "yaml"
 
 # setup a logger
 logger = Logger.new(STDOUT)
@@ -42,6 +43,18 @@ end.parse!
 # create an instance and set the wallpaper
 bingImage = Bingwallpaper::Image.new
 
+# bail out if we've already downloaded today's image
+downloaded_data_path = bingImage.image_storage_path ".bingwallpaper"
+if File.exist? downloaded_data_path
+
+  downloaded_data = YAML.load_file downloaded_data_path
+  if downloaded_data[:downloaded] == Date.today
+
+    logger.info "Image of the day already downloaded and set"
+    exit 0
+  end
+end
+
 begin
 
   # compute the URL for the image of the data data
@@ -54,12 +67,20 @@ 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]
 
+  # path of the downloaded file
+  downloaded_data = nil
+
   # try the hi-res image
   if !image_path.exist?
 
     begin
 
       bingImage.download_image image_path, image_data[0][:links][:url]
+      downloaded_data = {
+        :path => image_path,
+        :quality => :high,
+        :downloaded => Date.today
+      }
     rescue Exception => exception
       logger.info "I couldn't download the hi-resolution image of the day..."
       logger.info "I couldn't load " + image_data[0][:links][:url]
@@ -73,12 +94,24 @@ begin
     begin
 
       bingImage.download_image fallback_image_path, image_data[0][:links][:fallback_url]
+      downloaded_data = {
+        :path => fallback_image_path,
+        :quality => :low,
+        :downloaded => Date.today
+      }
     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]
     end
   end
 
+  # update our downloaded data
+  if downloaded_data
+    File.open(downloaded_data_path, "w+") do |file_out| 
+      file_out.write downloaded_data.to_yaml
+    end
+  end
+
   # set the wallpaper
   if image_path.exist?
 
@@ -124,3 +157,5 @@ rescue Exception => exception
   logger.error "The problems was: " + exception.message
   exit 1
 end
+
+exit 0

data/bingwallpaper.gemspec

@@ -22,4 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "OptionParser", "~> 0.5.1"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "pry", "~> 0.10.3"
+  spec.add_development_dependency "pry-doc", ">= 0.8.0"
+  spec.add_development_dependency "method_source", ">= 0.8.2"
 end

data/lib/bingwallpaper/image.rb

@@ -45,7 +45,8 @@ module Bingwallpaper
     # market:: The market to use when fetching
     # index:: Index of the image to fetch (0 = today)
     # storage_path:: Path to directory for storing images
-    def initialize(market = DEFAULT_MARKET, index = DEFAULT_INDEX, storage_path = DEFAULT_STORAGE_PATH)
+    def initialize(market = DEFAULT_MARKET, index = DEFAULT_INDEX,
+                   storage_path = DEFAULT_STORAGE_PATH)
 
       @market = market
       @index = index
@@ -66,7 +67,8 @@ module Bingwallpaper
     # Returns the data URL for the image of the day.
     def get_data_url
 
-      return build_url(PATH + '?format=' + FORMAT + '&idx=' + @index.to_s + '&n=1' + '&mkt=' + @market)
+      return build_url(PATH + '?format=' + FORMAT + '&idx=' + @index.to_s +
+                       '&n=1' + '&mkt=' + @market)
     end
 
     # Parses the XML data and returns a hash of image information.
@@ -79,8 +81,8 @@ module Bingwallpaper
       doc.xpath('//images/image').map do |image|
 
         # figure out the hi-res image path
-        image_path = image.xpath('url').text.sub(image.xpath('url').text.rpartition("_").
-                                                 last, '1920x1200.jpg')
+        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
@@ -89,12 +91,25 @@ module Bingwallpaper
         {:links => {:url => build_url(image_path),
                     :fallback_url => build_url(image_fallback_path),
                     :copyright_url => image.xpath('copyrightlink').text},
-            :file_name => Pathname.new(image_path).basename.to_s,
+            :file_name => cleanup_filename(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
 
+    # Parses out a nice filename from the icky URL.
+    #
+    # filename:: Filename from the URL
+    def cleanup_filename(filename)
+      matches = /[A-Za-z0-9_-]+\.jpg/.match(filename)
+
+      if matches.length > 0
+        return matches[0]
+      end
+
+      return filename
+    end
+
     # Returns a Pathname with location where the image from the
     # provided Bing image hash will be stored.
     #

data/lib/bingwallpaper/version.rb

@@ -1,3 +1,3 @@
 module Bingwallpaper
-  VERSION = "0.6.0"
+  VERSION ||= "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bingwallpaper
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - cmiles74
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-22 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -66,6 +66,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.3
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.2
 description: This script downloads the "Image of the Day" and then uses Feh or Gnome
   to set your desktop wallpaper. More information available at https://github.com/cmiles74/bingwallpaper/.
 email:
@@ -76,6 +118,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -105,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sets your wallpaper to Bing's "Image of the Day"