flickpaper 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9deac4e1943d13926359e4889df91d14a7276c1
-  data.tar.gz: 6e05ee5e5a2d17e8914bc807bd2954be819f2726
+  metadata.gz: 0b82140cd93717729460dbd662f37d9c26014e19
+  data.tar.gz: 2ad72a3424f3c4957cbddc4f6400d1706ff25210
 SHA512:
-  metadata.gz: 66baa9e9f1ded8e026a0ac4b2a0afd443cd5a6aab5d85851ea727d09da5c6210fc55cf90340fc108376625c219eec313f8c3f4cb1a65c515e89cae6143cb21b4
-  data.tar.gz: faa29407851cd513bd0a45e6a0e4e4d7097618296c6fbe1bb394d9809a8b3bd4f8919db0d7dd851487503d04a9a6ee3eb767fcfd60494c3c99a85370191b74f1
+  metadata.gz: 2347aa154ab92ceea8eac4b4ef1d206ed8a087d87a5f44d549a9259b2055a1fe3681b9b555c9056ab68d1f7bb45fece6f6a2409bd25e87090e5f725618f32f07
+  data.tar.gz: e5d00b9323457841f0c9a0926b648089ece01c2796cc198cf395664d063653e38dee48b6a4daaa8f2bf9138266067735c9fa6731172862b91b8bb4b85e89e417

data/lib/flickpaper.rb

@@ -1,8 +1,10 @@
-require "flickpaper/version"
+require 'flickpaper/version'
 
 require 'flickraw'
 require 'optparse'
 require 'open-uri'
+require 'rbconfig'
+require 'logger'
 
 module Flickpaper
   API_KEY = '23005d9cf8cc185c1c2d17152d03d98b'
@@ -16,7 +18,8 @@ module Flickpaper
   def self.parse_opts(opts)
     options = {
       dump: File.join(ENV['HOME'], '.flickpaper.dump'),
-      image: File.join(ENV['HOME'], '.flickpaper.jpg')
+      image: File.join(ENV['HOME'], '.flickpaper.jpg'),
+      log: nil
     }
     opt_parser = OptionParser.new do |opts|
       opts.banner = "Usage: $ #{File.basename($0)} [options]"
@@ -26,12 +29,15 @@ module Flickpaper
       opts.on('-i', '--image [PATH]', "Where to store the downloaded image. Default: #{options[:image]}") do |image|
         options[:image] = image
       end
+      opts.on('-l', '--log [PATH]', "Path to log file. Default: STDOUT") do |log|
+        options[:log] = log
+      end
       opts.on('-v', '--verbose', 'Verbose') do |verbose|
         options[:verbose] = verbose
       end
       opts.on_tail("--version", "Show version") do
-        puts Flickpaper::VERSION.map(&:to_s).join('.')
-        exit
+        puts Flickpaper::VERSION
+        exit 0
       end
     end
     opt_parser.parse!(opts)
@@ -62,17 +68,6 @@ module Flickpaper
     end
   end
 
-  def self.sort_infos(infos)
-    sort_vals = infos.inject({}) do |sort_vals, info|
-      sort_vals[info['id']] = (info['views'].to_f ** 0.5) * (info['comments'].to_f ** 0.5)
-      sort_vals
-    end
-
-    infos.sort do |x,y|
-      sort_vals[y['id']] <=> sort_vals[x['id']]
-    end
-  end
-
   def self.save_file(url, dst)
     File.open(dst, 'wb') do |saved_file|
       open(url, 'rb') do |read_file|
@@ -81,19 +76,60 @@ module Flickpaper
     end
   end
 
+  def self.os
+    host_os = RbConfig::CONFIG['host_os']
+    case host_os
+    when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+      :windows
+    when /darwin|mac os/
+      :macosx
+    when /linux/
+      :linux
+    when /solaris|bsd/
+      :unix
+    end
+  end
+
   def self.set_wallpaper(path)
-    bash = <<-EOBASH
-      sessionfile=`find "${HOME}/.dbus/session-bus/" -type f`
-      eval `cat ${sessionfile}`
-      export DBUS_SESSION_BUS_ADDRESS \
-             DBUS_SESSION_BUS_PID \
-             DBUS_SESSION_BUS_WINDOWID
+    case os
+    when :windows
+      false
+    when :macosx
+      set_wallpaper_macosx(path)
+    when :linux, :unix
+      set_wallpaper_linux(path)
+    else
+      false
+    end
+  end
 
-      gsettings set org.gnome.desktop.background picture-uri "file://#{path}"
+  def self.set_wallpaper_macosx(path)
+    bash = <<-EOBASH
+      tell application "Finder"
+        set desktop picture to POSIX file "#{path}"
+      end tell
     EOBASH
     system(bash)
   end
 
+  def self.set_wallpaper_linux(path)
+    dbus_launch = %w{ which dbus-launch }.to_s.strip
+    if dbus_launch != ""
+      # http://dbus.freedesktop.org/doc/dbus-launch.1.html
+      bash = <<-EOBASH
+        if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+          # if not found, launch a new one
+          eval `dbus-launch --sh-syntax`
+        fi
+
+        gsettings set org.gnome.desktop.background picture-uri "file://#{path}"
+      EOBASH
+      system(bash)
+    else
+      false
+    end
+  end
+
   def self.get_ids(file)
     File.file?(file) ? Marshal.load(File.read(file)) : []
   end
@@ -105,22 +141,23 @@ module Flickpaper
 
   def self.run!
     arguments, options = Flickpaper.parse_opts(ARGV.dup)
+    log = Logger.new(options[:log] ? options[:log] : STDOUT)
+    log.level = options[:verbose] ? Logger::INFO : Logger::ERROR
+
     Flickpaper.init
 
-    list = Flickpaper.interesting
+    log.info("Getting interesting list")
+    list = Flickpaper.interesting(per_page: 25)
     ids = Flickpaper.get_ids(options[:dump])
     list = list.select { |l| !ids.include?(l['id']) }
-    infos = Flickpaper.sort_infos(Flickpaper.infos(list))
-    sorted_list = infos.map do |info|
-      list.detect { |photo| photo['id'] == info['id'] }
-    end
-    sizes = Flickpaper.sizes(sorted_list)
 
     idx = nil
     url = nil
 
-    (0...(sizes.length)).each do |i|
-      if my_size = sizes[i].detect { |s| s['label'] == "Large 2048" }
+    log.info("Selecting large photo")
+    (0...(list.length)).each do |i|
+      size = flickr.photos.getSizes(photo_id: list[i]['id'])
+      if my_size = size.detect { |s| s['label'] == "Large 2048" }
         idx = i
         url = my_size['source']
         break
@@ -128,12 +165,18 @@ module Flickpaper
     end
 
     if idx
-      my_photo = sorted_list[idx]
-      my_info = infos[idx]
+      my_photo = list[idx]
 
       Flickpaper.save_file(url, options[:image])
-      Flickpaper.set_wallpaper(options[:image])
-      Flickpaper.put_ids(options[:dump], ids<<my_photo['id'])
+      result = Flickpaper.set_wallpaper(options[:image])
+      if result
+        log.info("Set photo #{my_photo['id']} as wallpaper")
+        Flickpaper.put_ids(options[:dump], ids<<my_photo['id'])
+      else
+        log.error("Unable to set photo #{my_photo['id']} as wallpaper")
+      end
+    else
+      log.error("Unable to find photo for wallpaper")
     end
   end
 end

data/version

@@ -1 +1 @@
-0.0.1
+0.0.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flickpaper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Tongen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler