gphotos 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f96e4a1dd6266042cf0098cf422aa06bfff070c
-  data.tar.gz: 38e62cf9f413803f1dc318b2bfdaee09d9d7b181
+  metadata.gz: ca60cae44396023d5a11ffbe51ff0d84df3116a5
+  data.tar.gz: 6853345ab48a18e8087a073b005d01a4ebebadd2
 SHA512:
-  metadata.gz: 43b2e28efec1c793817fc4dc900d1c8e20d287cca66c07a40314288affb141e99dc653df53c6775eb2e3044657db99ff68dc5e0baa05e480c575723d1f3788d4
-  data.tar.gz: 1be3c894ed2989015af5d5c7100b127f0c0b820f7452c3c57386c830ae0f4d3befe7a53551c92523e630f8567462a2242ca5b126744aa7e03fa50124ce352a11
+  metadata.gz: 31f8ab4fae2816860c6fceabcfc46e0fdd66193dc3192a134a34992096c328adc7cc90d407cdf2c7b42b3bdd41a5ba55dd87f1dadc1332336b73c2c71eb61cfb
+  data.tar.gz: 5f1abec0b1187080289f88188fb64158e38b3b2419bfdd419666c3a07de5a6039dbdc251ad5859a0eb4cd632a3f3d9441b4ba907d7ed80ba43b8b6b7f24dfd33

data/lib/gphotos/app.rb

@@ -79,10 +79,13 @@ module Gphotos
 
       puts 'upload:'
       uploaded, skipped, not_exist = gphotos.upload(files) do |file, status|
-        if status == :uploaded
-          puts "#{file}"
-        else
-          puts "#{file} (#{status})"
+        case status
+        when :uploading
+          print "#{file} ..."
+        when :skipped, :not_exist
+          puts "\b\b\b(#{status})"
+        when :uploaded
+          puts "\b\b\b   "
         end
       end
 

data/lib/gphotos/gphotos.rb

@@ -5,7 +5,7 @@ module Gphotos
   class Gphotos
 
     def initialize(email, passwd, passwd_exec, options = {})
-      options = {:page_timeout => 20, :upload_timeout => 3600 }.merge(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)
@@ -62,14 +62,15 @@ module Gphotos
       not_exist = []
       result = ''
       files.each do |file|
-        file = File.expand_path(file)
-        if !File.exists?(file)
+        block.call(file, :uploading)
+        full_path = File.expand_path(file)
+        if !File.file?(full_path)
           not_exist.push(file)
           block.call(file, :not_exist)
           next
         end
         current_result = ''
-        element.send_keys(file)
+        element.send_keys(full_path)
         @wait.until do
           alert = @driver.find_element(:css => 'div[role="alert"]')
           begin

data/lib/gphotos/version.rb

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

metadata

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