bingwallpaper 0.6.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8c7d463413b4ff8a8acb349f42da411983ae8d73
-  data.tar.gz: 29eb28625a0733fa4fca25f4d2bf071f34780bf9
+SHA256:
+  metadata.gz: 7e6a6a1630ffd35d35e5b1b2c68fcaea45fc24727c43bacd4f457f1e4badfc71
+  data.tar.gz: cefaa7ceea9c8b20cbaed88fb60339a47dc18b72623eb2dc2de40f12488d69e3
 SHA512:
-  metadata.gz: 889e2ac347079fe55df1d2b1a5a0a5b158dec4a640b92fdb0c3cae7d00cb561b156784efe3d4abd0bc2d441ffaca5f6d51de7ea3fe936cdd245a98500992bd14
-  data.tar.gz: e542578c1fc8b3698c2d21e4af81812a13c4aac9cdd63d7e1b9fc27b8217a45bca560900a766f45e6bd73ca800094bcc0991714e19f18c3fa15bf67dec80c9cf
+  metadata.gz: c0a91dbe4c37cfae2ce6b29b591e709f68bbef97a56c604f99dfd2fc99daa0b91cf621ad0933945eddac9284b962b1cac7c3269063ba85269b0a0a1ccf6d0e79
+  data.tar.gz: 20b41d3655b17b0e9d0f8c9f0c82af8d6c27f523b06f914c4339af1fb14e23e4d88ea01efa8cf7b44e90ef3e8a11136d91138450a23c4948f58527aa709717bc

data/.ruby-version

@@ -0,0 +1 @@
+3.0.2

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'irb', require: false
+
 # Specify your gem's dependencies in bingwallpaper.gemspec
 gemspec

data/README.md

@@ -1,3 +1,4 @@
+
 [![Gem Version](https://badge.fury.io/rb/bingwallpaper.svg)](http://badge.fury.io/rb/bingwallpaper)
 
 # Bing Wallpaper
@@ -6,13 +7,18 @@ This project provides a simple Ruby script that will download the
 "Image of the Day" from [Bing][0] and then sets it as your current
 wallpaper.
 
+If you find this code useful in any way, please feel free to...
+
+<a href="https://www.buymeacoffee.com/cmiles74" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
+
+
 ## 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)
@@ -33,6 +34,10 @@ OptionParser.new do |opts|
     options[:feh] = f
   end
 
+  opts.on("-s", "--sway", "Use swaymsg to set the background, overwrite ~/.config/sway/config.d/wallpaper") do |s|
+    options[:sway] = s
+  end
+
   opts.on("-h", "--help", "Prints this help") do
     puts opts
     exit
@@ -42,6 +47,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 +71,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 +98,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?
 
@@ -88,6 +125,10 @@ begin
     if options[:gnome]
       logger.info "Setting background with Gnome"
       `gsettings set org.gnome.desktop.background picture-uri "file:///#{image_path}"`
+    elsif options[:sway]
+      logger.info "Setting background with swaymsg"
+      `swaymsg output "*" background #{image_path} fill`
+      `echo 'exec swaymsg output "*" background #{image_path} fill' > ~/.config/sway/config.d/wallpaper`
     else
       logger.info "Setting background with feh"
       `feh --bg-fill #{image_path}`
@@ -106,6 +147,10 @@ begin
     if options[:gnome]
       logger.info "Setting background with Gnome"
       `gsettings set org.gnome.desktop.background picture-uri "file:///#{fallback_image_path}"`
+    elsif options[:sway]
+      logger.info "Setting background with swaymsg"
+      `swaymsg output "*" background #{fallback_image_path} fill`
+      `echo 'exec swaymsg output "*" background #{fallback_image_path} fill' > ~/.config/sway/config.d/wallpaper`
     else
       logger.info "Setting background with feh"
       `feh --bg-fill #{fallback_image_path}`
@@ -124,3 +169,5 @@ rescue Exception => exception
   logger.error "The problems was: " + exception.message
   exit 1
 end
+
+exit 0

data/bingwallpaper.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["twitch@nervestaple.com"]
   spec.summary       = %q{Sets your wallpaper to Bing's "Image of the Day"}
   spec.description   = %q{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/.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/cmiles74/bingwallpaper"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -18,8 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "nokogiri", "~> 1.8.2"
+  spec.required_ruby_version = '~> 3.0.2'
+  spec.add_dependency "nokogiri", "~> 1.12.4"
   spec.add_dependency "OptionParser", "~> 0.5.1"
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "bundler", "~> 2.2.27"
+  spec.add_development_dependency "irb", "~> 1.3.7"
+  spec.add_development_dependency "rake", "~> 13.0.6"
+  spec.add_development_dependency "pry", ">= 0.10"
+  spec.add_development_dependency "pry-doc", ">= 0.6.0"
+  spec.add_development_dependency "method_source", "~> 1.0"
+  spec.add_development_dependency "webrick", ">= 1.5.0"
 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.
@@ -74,13 +76,13 @@ module Bingwallpaper
     # url:: complete path to the Bing image of the day
     def parse_xml(url)
 
-      doc = Nokogiri::HTML(open(url))
+      doc = Nokogiri::HTML(URI.open(url))
 
       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.
     #
@@ -114,7 +129,7 @@ module Bingwallpaper
 
         # download the hi-res image
         open(file_path, 'wb') do |file|
-          file << open(url).read
+          file << URI.open(url).read
         end
       rescue Exception => exception
         file_path.delete

data/lib/bingwallpaper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bingwallpaper
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.4
 platform: ruby
 authors:
 - cmiles74
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-22 00:00:00.000000000 Z
+date: 2021-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.12.4
 - !ruby/object:Gem::Dependency
   name: OptionParser
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.2.27
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 2.2.27
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.0.6
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: method_source
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 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 +146,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -85,28 +156,27 @@ files:
 - lib/bingwallpaper.rb
 - lib/bingwallpaper/image.rb
 - lib/bingwallpaper/version.rb
-homepage: ''
+homepage: https://github.com/cmiles74/bingwallpaper
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.2.21
+signing_key:
 specification_version: 4
 summary: Sets your wallpaper to Bing's "Image of the Day"
 test_files: []