picasaweb-backup 0.3.1 → 0.4.0

data/README.md

@@ -23,8 +23,8 @@ Options
         --dir DIR                    optional directory in which the download should be executed
     -h, --help                       print this help section
 ```
-Create an empty folder an place a file called `account.yml` with the following
-content:
+Create an empty folder and place a file called `account.yml` with the following
+content (make sure you leave a space after the colon):
 
 ```yaml
 username: YOUR_USERNAME

data/bin/picasaweb-backup

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#! /usr/bin/env ruby
 require 'rubygems'
 require 'optparse'
 require 'picasaweb-backup'
@@ -6,7 +6,6 @@ require 'artii'
 require 'colored'
 
 opts = {}
-usage =
 
 opt_parser = OptionParser.new('Backing up your Picasaweb photos') do |opt|
   artii = Artii::Base.new :font => "small"
@@ -34,58 +33,8 @@ cli = Picasaweb::CLI.new opts
 
 begin
 
-  account = File.open("account.yml", 'r') { |f| YAML.load f }
-  verify_account account
-  client = picasa_client account["username"], account["password"]
-  albums = picasa_albums client
-  dir_name = "Albums"
+  cli.start_backup
 
-  if !File.directory? dir_name
-    Dir.mkdir dir_name
-  end
-
-  Dir.chdir dir_name
-
-  albums.each do |album|
-
-    if !File.directory? album[:title]
-      Dir.mkdir album[:title]
-      cli.print "Creating directory for album '#{album[:title]}'"
-    end
-
-    Dir.chdir album[:title] do
-      cli.print "Checking for new files in '#{album[:title]}'"
-      photos = nil
-      until photos
-        begin
-          photos = picasa_photos client, album
-        rescue GData::Client::ServerError
-          "Server error, retrying\n"
-        end
-      end
-
-      downloaded_photos = 0
-      photos.each do |photo|
-        if !File.exists? photo[:title]
-          cli.print " ==> #{photo[:title]}"
-          response = nil
-          until response
-            begin
-              response = client.get photo[:url]
-            rescue GData::Client::ServerError
-              "Server error, retrying\n"
-            end
-          end
-
-          File.open(photo[:title], 'w') { |f| f.write response.body }
-          downloaded_photos += 1
-        end
-      end
-      if downloaded_photos == 0
-        cli.print "==> no new photos found"
-      end
-    end
-  end
 rescue => e
   cli.print "ERROR: #{e.message}".red
   cli.print ""

data/lib/picasaweb-backup.rb

@@ -12,9 +12,16 @@ require "rubygems"
 require "gdata"
 require "logger"
 
+#monkey-patch logger formatting
+class Logger
+  def format_message(level, time, progname, msg)
+    "#{time.strftime("%Y-%m-%d %H:%M:%S")} #{msg}\n"
+  end
+end
+
 module Picasaweb
   class CLI
-
+    ALBUM_DIR = "Albums"
     def initialize opts
       @opts = opts
 
@@ -24,13 +31,13 @@ module Picasaweb
 
       if @opts[:log]
         @logger = Logger.new "picasaweb-backup.log", shift_age = "monthly"
-        @logger.datetime_format = "%Y-%m-%d %H:%M"
       end
 
       if opts[:dir]
         self.print "Changing working directory to #{opts[:dir]}"
       end
 
+      @account = File.open("account.yml", 'r') { |f| YAML.load f }
     end
 
     def print msg
@@ -41,58 +48,111 @@ module Picasaweb
       end
     end
 
-  end
-end
+    def verify_account account
+      if account["username"].nil?
+        raise "Please add your username to account.yml"
+      elsif account["password"].nil?
+        raise "Please add your password to account.yml"
+      end
+    end
 
-def verify_account account
-  if account["username"].nil?
-    raise "Please add your username to account.yml"
-  elsif account["password"].nil?
-    raise "Please add your password to account.yml"
-  end
-end
+    def picasa_client(username, password)
+      client = GData::Client::Photos.new
+      client.clientlogin(username, password)
+      client
+    end
 
-# config_path should point to a yaml file that looks like this:
-#     username: costan
-#     password: "secret"
-def picasa_client(username, password)
-  client = GData::Client::Photos.new
-  client.clientlogin(username, password)
-  client
-end
+    def ensure_exists dir
+      if !File.directory? dir
+        Dir.mkdir dir
+        self.print "Creating directory '#{dir}'"
+      end
+    end
 
-# Retrieves all albums for a user.
-def picasa_albums(client, user = nil)
-  uri = "http://picasaweb.google.com/data/feed/api/user/#{user || 'default'}"
-  feed = client.get(uri).to_xml
-  albums = []
-  feed.elements.each('entry') do |entry|
-    next unless entry.elements['gphoto:id']
-    albums << { :id => entry.elements['gphoto:id'].text,
-                :user => entry.elements['gphoto:user'].text,
-                :title => entry.elements['title'].text }
-  end
-  albums
-end
+    # Retrieves all albums for a user.
+    def get_albums(client, user = nil)
+      uri = "http://picasaweb.google.com/data/feed/api/user/#{user || 'default'}"
+      feed = client.get(uri).to_xml
+      albums = []
+      feed.elements.each('entry') do |entry|
+        next unless entry.elements['gphoto:id']
+        albums << { :id => entry.elements['gphoto:id'].text,
+                    :user => entry.elements['gphoto:user'].text,
+                    :title => entry.elements['title'].text }
+      end
+      albums
+    end
+
+    def download_album client, album
+      Dir.chdir album[:title] do
+        self.print "Checking for new photos in '#{album[:title]}'"
+        photos = nil
+        until photos
+          begin
+            photos = get_photos client, album
+          rescue GData::Client::ServerError
+            "Server error, retrying\n"
+          end
+        end
+
+        downloaded_photos = 0
+        photos.each do |photo|
+          if !File.exists? photo[:title]
+            self.print " ==> #{photo[:title]}"
+            response = nil
+            until response
+              begin
+                response = client.get photo[:url]
+              rescue GData::Client::ServerError
+                "Server error, retrying\n"
+              end
+            end
+
+            File.open(photo[:title], 'w') { |f| f.write response.body }
+            downloaded_photos += 1
+          end
+        end
+        if downloaded_photos == 0
+          self.print "==> no new photos found"
+        end
+      end
+    end
 
-# Retrieves all photos from an album.
-def picasa_photos(client, album)
-  uri = "http://picasaweb.google.com/data/feed/api/user/" +
+    # Retrieves all photos from an album.
+    def get_photos(client, album)
+      uri = "http://picasaweb.google.com/data/feed/api/user/" +
         "#{album[:user] || 'default'}/albumid/#{album[:id]}?kind=photo&imgmax=d"
 
-  feed = client.get(uri).to_xml
-  photos = []
-  feed.elements.each('entry') do |entry|
-    next unless entry.elements['gphoto:id']
-    next unless entry.elements['media:group']
-    photo = { :id => entry.elements['gphoto:id'].text,
-              :album_id => entry.elements['gphoto:albumid'].text,
-              :title => entry.elements['title'].text }
-    entry.elements['media:group'].elements.each('media:content') do |content|
-      photo[:url] = content.attribute('url').value
+      feed = client.get(uri).to_xml
+      photos = []
+      feed.elements.each('entry') do |entry|
+        next unless entry.elements['gphoto:id']
+        next unless entry.elements['media:group']
+        photo = { :id => entry.elements['gphoto:id'].text,
+          :album_id => entry.elements['gphoto:albumid'].text,
+          :title => entry.elements['title'].text }
+        entry.elements['media:group'].elements.each('media:content') do |content|
+          photo[:url] = content.attribute('url').value
+        end
+        photos << photo
+      end
+      photos
+    end
+
+    def start_backup
+      verify_account @account
+      client = picasa_client @account["username"], @account["password"]
+      albums = get_albums client
+
+      ensure_exists ALBUM_DIR
+      Dir.chdir ALBUM_DIR
+
+      albums.each do |album|
+        ensure_exists album[:title]
+        download_album client, album
+      end
+
     end
-    photos << photo
   end
-  photos
 end
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Picasaweb
   module Backup
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picasaweb-backup
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gdata_19