picasaweb-backup 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 65b528a9faea826628aa1501f2eb4fecd1a4859b
+  data.tar.gz: 5cdbe52dd1e524d088415b036ad20e38886f47ba
+SHA512:
+  metadata.gz: 7b8acd1ddb8fe26302564dfdb8ff1fd269bc693ba238e9caf366e593498587e30b8f50e9d4fe90f39db79a807c75f412ec1f8018c78a4d2616d02c62ee37f5c5
+  data.tar.gz: 15365bbb6f58c8c2b98cb5416e0df10d01ac69f014a4c4057846724018da538b3ed7cafe5733d1f6da93e22afdbd6f53c5febf1fe6072bbae5a74e12bbd4cb84

data/.gitignore

@@ -15,3 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+tokens.yaml
+client_id.json
+Albums

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
-gem "gdata_19", "~> 1.1.5"
-gem "artii",    "~> 2.0.1"
-gem "colored",  "~> 1.2"
+gem 'artii',              '~> 2.1', '>= 2.1.1'
+gem 'colored',            '~> 1.2'
+gem 'googleauth',         '~> 0.5.1'
+gem 'http'

data/bin/picasaweb-backup

@@ -29,15 +29,23 @@ opt_parser = OptionParser.new('Backing up your Picasaweb photos') do |opt|
 end
 
 opt_parser.parse!(ARGV)
-cli = Picasaweb::CLI.new opts
 
-begin
+if !File.exists?("client_id.json")
+  puts("No file client_id.json found. \n" \
+       "Please go to https://console.developers.google.com/apis/credentials "\
+       "to generate an OAuth CLI app and download, client_id.json file and "\
+       "place it in the directory where you run picasaweb-backup.")
 
-  cli.start_backup
+else
 
-rescue => e
-  cli.print "ERROR: #{e.message}".red
-  cli.print ""
-  cli.print opt_parser
-end
+  begin
+
+    cli = Picasaweb::CLI.new opts
+    cli.start_backup
 
+  rescue => e
+    puts "ERROR: #{e.message}".red
+    puts e.backtrace
+  end
+
+end

data/lib/picasaweb-backup.rb

@@ -8,9 +8,11 @@
 
 require "version"
 require "yaml"
-require "rubygems"
-require "gdata"
 require "logger"
+require 'googleauth'
+require 'googleauth/stores/file_token_store'
+require 'http'
+require 'nokogiri'
 
 #monkey-patch logger formatting
 class Logger
@@ -20,24 +22,93 @@ class Logger
 end
 
 module Picasaweb
+  class Client
+
+    OOB_URI = 'urn:ietf:wg:oauth:2.0:oob'
+
+    def initialize
+      scope = 'https://picasaweb.google.com/data/'
+      client_id = Google::Auth::ClientId.from_file('client_id.json')
+      token_store = Google::Auth::Stores::FileTokenStore.new(:file => 'tokens.yaml')
+      authorizer = Google::Auth::UserAuthorizer.new(client_id, scope, token_store)
+
+      user_id = "picasaweb-backup"
+
+      credentials = authorizer.get_credentials(user_id)
+
+      if credentials.nil?
+        url = authorizer.get_authorization_url(base_url: OOB_URI )
+        puts "Open #{url} in your browser and enter the resulting code:"
+        code = gets
+        @credentials = authorizer.get_and_store_credentials_from_code(
+          user_id: user_id, code: code, base_url: OOB_URI)
+      else
+        puts "Found token #{credentials.access_token}. Refreshing..."
+        credentials.fetch_access_token!
+        @credentials = credentials
+      end
+    end
+
+    # Retrieves all albums for a user.
+    def get_albums
+      uri = "https://picasaweb.google.com/data/feed/api/user/default"
+      feed = get(uri)
+      entries = feed.css("entry")
+
+      entries.map do |entry|
+        { :id => entry.css('gphoto|id').text,
+          :user => entry.css('gphoto|user').text,
+          :title => entry.css('title').text }
+      end
+    end
+
+    # Retrieves all photos from an album.
+    def get_photos(album)
+      uri = "https://picasaweb.google.com/data/feed/api/user/" +
+        "default/albumid/#{album[:id]}?kind=photo&imgmax=d"
+
+      entries = get(uri).css("entry")
+
+      entries.map do |entry|
+        url = entry.css('media|group > media|content[url]').first.attribute("url").value
+        photo = { :id       => entry.css('gphoto|id').text,
+                  :album_id => entry.css('gphoto|albumid').text,
+                  :title    => entry.css('title').text,
+                  :url      => url
+                }
+      end
+    end
+
+
+    def get(url)
+      res = HTTP[:authorization => "Bearer #{@credentials.access_token}"].get(url)
+      Nokogiri::XML(res.body)
+    end
+
+    def download(photo)
+      response = HTTP.get(photo[:url])
+      File.open(photo[:title], 'w') { |f| f.write response.body }
+    end
+
+  end
+
   class CLI
+
     ALBUM_DIR = "Albums"
+
     def initialize opts
       @opts = opts
+      @client = Client.new
 
       if opts[:dir]
         Dir.chdir opts[:dir]
+        self.print "Changing working directory to #{opts[:dir]}"
       end
 
       if @opts[:log]
         @logger = Logger.new "picasaweb-backup.log", shift_age = "monthly"
       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
@@ -48,67 +119,26 @@ module Picasaweb
       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
-
-    def ensure_exists dir
+    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 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
+    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
+          photos = client.get_photos(album)
         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 }
+            client.download(photo)
             downloaded_photos += 1
           end
         end
@@ -118,38 +148,17 @@ module Picasaweb
       end
     end
 
-    # 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
-        end
-        photos << photo
-      end
-      photos
-    end
-
     def start_backup
-      verify_account @account
-      client = picasa_client @account["username"], @account["password"]
-      albums = get_albums client
+      albums = @client.get_albums.select do |album|
+        album[:title].downcase != "auto backup"
+      end
 
-      ensure_exists ALBUM_DIR
+      ensure_exists(ALBUM_DIR)
       Dir.chdir ALBUM_DIR
 
       albums.each do |album|
         ensure_exists album[:title]
-        download_album client, album
+        download_album(@client, album)
       end
 
     end

data/lib/version.rb

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

data/picasaweb-backup.gemspec

@@ -3,16 +3,17 @@ require File.expand_path('../lib/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Leonard Ehrenfried"]
-  gem.email    = ['leonard.ehrenfried@web.de']
+  gem.email    = ['leonard.ehrenfried@gmail.com']
   gem.summary = "Picasa Web Albums backup tool"
   gem.description = %{Backup all your photos from Google's Picasa Web Albums service,
     can be run repeatedly on the same folder and only downloads new files.}
 
-  gem.homepage = 'http://github.com/lenniboy/picasaweb-backup'
+  gem.homepage = 'http://github.com/leonardehrenfried/picasaweb-backup'
 
-  gem.add_dependency('gdata_19',  '~> 1.1.5')
-  gem.add_dependency('artii',     '~> 2.0.1')
-  gem.add_dependency('colored',   '~> 1.2')
+  gem.add_dependency('artii',       '~> 2.1')
+  gem.add_dependency('colored',     '~> 1.2')
+  gem.add_dependency('googleauth',  '~> 0.5.1')
+  gem.add_dependency('http',        '~> 2.1')
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,74 +1,82 @@
 --- !ruby/object:Gem::Specification
 name: picasaweb-backup
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Leonard Ehrenfried
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gdata_19
+  name: artii
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: artii
+  name: colored
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: googleauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-description: ! "Backup all your photos from Google's Picasa Web Albums service,\n
-  \   can be run repeatedly on the same folder and only downloads new files."
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+description: |-
+  Backup all your photos from Google's Picasa Web Albums service,
+      can be run repeatedly on the same folder and only downloads new files.
 email:
-- leonard.ehrenfried@web.de
+- leonard.ehrenfried@gmail.com
 executables:
 - picasaweb-backup
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -78,28 +86,27 @@ files:
 - lib/picasaweb-backup.rb
 - lib/version.rb
 - picasaweb-backup.gemspec
-homepage: http://github.com/lenniboy/picasaweb-backup
+homepage: http://github.com/leonardehrenfried/picasaweb-backup
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Picasa Web Albums backup tool
 test_files: []