baidupan 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63a2a4e78c3b198d7c4c375c7939794b1288856e
-  data.tar.gz: 31b1d38ef8145ec73121c9866c37526ebf3349f8
+  metadata.gz: a7bf29bd9e970583b16dcc95efbe8bd58c555d81
+  data.tar.gz: 50a1d6c214706ab0bead3a76a36c7201dde7b63c
 SHA512:
-  metadata.gz: 111618908ebb33590dc4550361cfb5d352e022e52523955f62bbd0a9d6458cb928a320b8e3b72f3cbbca7668944bafbfaadd81a7149ab9fedfc948ebd8cfc05c
-  data.tar.gz: fdf6e40a76af0b387ee7d2a5b8afec1ca0c03fb059c9071c55354e2e5259dafa8330a336c3024176a4bb7cdbd664524166e8962c59a118b0a7190e4c499db6d9
+  metadata.gz: e9615c5148eff1c8ab80e5351296ff70898dc9f1fcb8dabfc62fa32b09e1c196bcd4d7757e59ec88cafe6e80c19de99843e6db2cc5721722f0989dd685bb4ab2
+  data.tar.gz: 63de6c09ef2a05555c8a550d0748133e3d490f37dd6bedfe8b968e977382ef7ac5bc79870e159b098062f3e633c3f44122a74b0347fb33925be5d4db9299b9a9

data/README.md

@@ -20,24 +20,35 @@ Or install it yourself as:
 
 ## Usage
 如何使用该gem：
+
   * 创建百度应用 http://developer.baidu.com/wiki/index.php?title=%E5%B8%AE%E5%8A%A9%E6%96%87%E6%A1%A3%E9%A6%96%E9%A1%B5
+
   * baidupan setup 应用名字 api_key, secret_key
+
   * baidupan config 按照提示 进行授权
   
 基本命令:
+
   * baidupan setup 添加文件信息
+
   * baidupan config 进行授权
+
   * baidupan list or ls 显示app应用的文件列表
+
   * baidupan upload 文件
+
   * 更多命令 请运行baidupan 查看即可
   
 Todo：
   * 移动文件的位置
+
   * 删除文件
+
   * 对文件重命名
 
 已经实现:
   * 通过配置连接百度盘
+  
   * 能够上传、下载以及显示文件
 
 

data/lib/baidupan/cmd/fs_cmd.rb

@@ -35,6 +35,48 @@ overwrite：表示覆盖同名文件；newcopy：表示生成文件副本并进
       print_item res.body
     end
 
+    desc 'batch_upload [local dir, remote dir, file_pattern="*"]', <<-Desc
+    批量上传文件, 模式需要进行转义, 如下:
+    baidupan ./ test_dir \*.gem --show:
+    baidupan-0.0.4.gem
+    baidupan-0.0.2.gem
+    baidupan-0.0.3.gem
+    Desc
+    option :show, desc: "show files that will be uploaded"
+    option :recursive, desc: "对子目录递归上传", type: :boolean
+    def batch_upload(ldir, rdir, file_pattern="*")
+      opts = options.dup
+      old_ldir = ldir
+      
+      if opts[:recursive]
+        ldir = File.join(ldir, "**")
+        opts.delete(:recursive)
+      end
+
+
+      files = Dir.glob(File.join(ldir, file_pattern)).select{|f| File.file?(f)}
+      
+      if options[:show]
+        files.each{|file| puts file}
+        say "total #{files.size} files"
+        return
+      end
+
+      count = 0
+      origin_rdir = rdir
+      current_dir = Regexp.new("^#{File.join(old_ldir, '')}")
+      
+      files.each do |file|
+        dirname = File.dirname(file.gsub(current_dir, ''))
+        dirname = '' if dirname == '.'
+
+        rdir = File.join(origin_rdir, dirname)
+        Baidupan::FsCmd.upload(file, rdir, opts)
+        say file
+        count += 1
+      end
+      say "total upload #{count} files"
+    end
 
     desc 'download file [Remote path, Local path',  'download remote file to local, not support for download dir'
     def download(rpath, lpath=nil)

data/lib/baidupan/config.rb

@@ -26,6 +26,12 @@ module Baidupan
       def time_format
         "%Y%m%d%H%M%S"
       end
+
+      def join_path(*files)
+        files.inject(self.app_root) do |rpath, lpath|
+          File.join(rpath, lpath)
+        end
+      end
     end
 
     private

data/lib/baidupan/fs_cmd.rb

@@ -12,7 +12,7 @@ module Baidupan
       end
 
       def upload(lpath, rpath, opts={})
-      	params = common_params(:upload, path: "#{Config.app_root}/#{rpath}/#{lpath}").merge(ondup: :newcopy)
+      	params = common_params(:upload, path: "#{Config.join_path(rpath, File.basename(lpath))}").merge(ondup: :newcopy)
       	params[:ondup] = opts.delete(:ondup) if opts[:ondup]
         
         body = {:file => File.open(lpath)}
@@ -23,7 +23,6 @@ module Baidupan
 
       def download(rpath, lpath, opts={})
       	params = common_params(:download, path: "#{Config.app_root}/#{rpath}")
-
 		    get(Config.file_path, params, opts.merge(followlocation: true))
       end
     end

data/lib/baidupan/version.rb

@@ -1,3 +1,3 @@
 module Baidupan
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baidupan
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - AndyHu
@@ -129,7 +129,6 @@ files:
 - lib/baidupan/cmd/fs_cmd.rb
 - lib/baidupan/config.rb
 - lib/baidupan/fs_cmd.rb
-- lib/baidupan/test.rb
 - lib/baidupan/version.rb
 homepage: http://ml-china.org
 licenses:

data/lib/baidupan/test.rb

@@ -1,13 +0,0 @@
-require 'baidupan'
-require 'thor'
-
-module Baidupan
-  class Test < Thor
-    include Thor::Actions
-
-    desc 'test', 'test'
-    def test
-      puts 'test'
-    end
-  end
-end