gphotos 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca60cae44396023d5a11ffbe51ff0d84df3116a5
-  data.tar.gz: 6853345ab48a18e8087a073b005d01a4ebebadd2
+  metadata.gz: ebeab76559bd4ed56947ad1117d3e208764625e8
+  data.tar.gz: ccf6ae3c3950723f4d03a0eee00e88fade105668
 SHA512:
-  metadata.gz: 31f8ab4fae2816860c6fceabcfc46e0fdd66193dc3192a134a34992096c328adc7cc90d407cdf2c7b42b3bdd41a5ba55dd87f1dadc1332336b73c2c71eb61cfb
-  data.tar.gz: 5f1abec0b1187080289f88188fb64158e38b3b2419bfdd419666c3a07de5a6039dbdc251ad5859a0eb4cd632a3f3d9441b4ba907d7ed80ba43b8b6b7f24dfd33
+  metadata.gz: 48342084ba713b7efa7f736a64e71ac4ecfe12668ac24675f2c7de7aa6173b684ac8750c8ac2924c36c4174ffba6f40c50de3a2cfbdca70830c0e5f2cfca83ea
+  data.tar.gz: 916aa16a1d812bee7792c8ad87b04b975fb47d46ad9ff507773c3290efbf65fbc1022c954e95f01deb1a92b8f3a581a148a789d25315bdf28d9e5649687ff7af

data/README.md

@@ -50,7 +50,7 @@ Example:
     0 skipped
     0 not exist
 
-Set email and password in config file, `~/.gphotos.yml`:
+Set email and password in config file, `~/.gphotos/config.yml`:
 
     :email: foo@gmail.com
     :passwd: foo
@@ -59,7 +59,7 @@ If you use password managers like [pass](https://www.passwordstore.org/), you ca
 
     :passwd_exec: pass show foo@gmail.com
 
-Cookies will be saved in `~/.gphotos.cookies`, so you don't need to login every time.
+ChromeDriver user data(browser settings, cookies, cache) will be saved in `~/.gphotos/chromedriver`, so you don't need to login every time. If you encounter any browser related problem, remove the user data directory and retry.
 
 ## Development
 

data/lib/gphotos/app.rb

@@ -64,7 +64,7 @@ module Gphotos
 
     def initialize(args)
       options = self.class.parse(args)
-      config = self.class.load_config('~/.gphotos.yml')
+      config = self.class.load_config('~/.gphotos/config.yml')
       @options = OpenStruct.new(config.merge(options.to_h))
     end
 

data/lib/gphotos/gphotos.rb

@@ -6,26 +6,15 @@ module Gphotos
 
     def initialize(email, passwd, passwd_exec, options = {})
       options = {:page_timeout => 20, :upload_timeout => 7200 }.merge(options)
-      profile = Selenium::WebDriver::Chrome::Profile.new
-      profile['profile.managed_default_content_settings.images'] = 2
-      @driver = Selenium::WebDriver.for(:chrome, :profile => profile)
+      user_data_dir = File.expand_path('~/.gphotos/chromedriver')
+      prefs = {"profile" => {"managed_default_content_settings" => {"images" => 2}}}
+      @driver = Selenium::WebDriver.for(:chrome, :args => ["--user-data-dir=#{user_data_dir}"], :prefs => prefs)
       @driver.manage.timeouts.implicit_wait = options[:page_timeout]
       @wait = Selenium::WebDriver::Wait.new(:timeout => options[:upload_timeout])
-      @cookies = File.expand_path('~/.gphotos.cookies')
       @workaround_applied = false
-      load_cookies(@cookies)
       login(email, passwd, passwd_exec)
     end
 
-    def load_cookies(file)
-      @driver.navigate.to 'https://photos.google.com/'
-      if File.exists?(file)
-        YAML.load_file(file).each do |cookie|
-          @driver.manage.add_cookie(cookie)
-        end
-      end
-    end
-
     def login(email, passwd, passwd_exec)
       @driver.navigate.to 'https://photos.google.com/albums'
 
@@ -46,7 +35,6 @@ module Gphotos
       element.submit
 
       @driver.find_element(:css => 'input[type="file"]')
-      File.write(@cookies ,@driver.manage.all_cookies.to_yaml, :perm => 0600)
     end
 
     def upload(files, &block)

data/lib/gphotos/version.rb

@@ -1,3 +1,3 @@
 module Gphotos
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gphotos
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Zhong Jianxin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler