baidupan 0.0.5 → 0.0.6

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rvmrc

data/.rvmrc

@@ -1 +1,2 @@
-rvm use ruby-2.0.0-p247@common
+#rvm use ruby-2.0.0-p247@common
+rvm use ruby-1.9.3-p448@common

data/lib/baidupan.rb

@@ -3,6 +3,7 @@ require 'multi_json'
 
 require "baidupan/version"
 require "baidupan/config"
+require "baidupan/core_ext"
 
 require 'pry'
 
@@ -10,7 +11,7 @@ module Baidupan
   PAN_BASE_URL = "https://pcs.baidu.com/rest/2.0/pcs"
 
   class Base
-    attr_reader :body
+    attr_reader :body, :response
 
     def initialize(url, method=:get, params={}, body={}, opts={})
       @options = {
@@ -22,6 +23,7 @@ module Baidupan
       @options.merge!(opts)
       @request = Typhoeus::Request.new(url, @options)
       @request.on_complete do |response|
+        @response = response
         if response.success?
           if response.headers["Content-Disposition"] =~ /attachment;file/ or response.headers["Content-Type"] =~ /image\//
             @body = response.body

data/lib/baidupan/cmd/fs_cmd.rb

@@ -10,13 +10,12 @@ module Baidupan::Cmd
       def print_item(item)
         new_items = []
         new_items << item[:fs_id]
-        new_items << "#{item[:path].sub(Baidupan::Config.app_root + '/', '')}"
+        new_items << "#{item[:path].sub(Baidupan::Config.app_root + '/', '')}#{"/" if item[:isdir] == 1}"
         new_items << "#{Time.at(item[:mtime])}"
         print_in_columns new_items
       end
     end
 
-
     desc 'list [Remote path]', 'list files under Remote path'
     def list(rpath=nil)
       res = Baidupan::FsCmd.list(rpath)
@@ -53,7 +52,6 @@ overwrite：表示覆盖同名文件；newcopy：表示生成文件副本并进
         opts.delete(:recursive)
       end
 
-
       files = Dir.glob(File.join(ldir, file_pattern)).select{|f| File.file?(f)}
       
       if options[:show]
@@ -97,5 +95,56 @@ overwrite：表示覆盖同名文件；newcopy：表示生成文件副本并进
       File.binwrite(lpath, res.body)
       say "download and save at'#{lpath}'..."
     end
+
+    desc 'url [remote path]', 'get a stream-file url for using online, e.g. <img src="_streamurl" />'
+    def url(rpath)
+      say Baidupan::FsCmd.url(rpath)
+    end
+
+    desc "thumbnail rpath", "获取缩略图"
+    option :quality, type: :numeric, desc: "缩略图的质量，默认为“100”，取值范围(0,100]", default: 100
+    option :height, type: :numeric, desc: "指定缩略图的高度，取值范围为(0,1600]", default: 200
+    option :width, type: :numeric, desc: "指定缩略图的宽度，取值范围为(0,1600]", default: 200
+    def thumbnail(rpath)
+      opts = options.dup
+      say Baidupan::FsCmd.thumbnail(rpath, opts)
+    end
+
+    desc 'mkdir rpath', 'mkdir remote path, e.g. mkdir path/to/newdir'
+    def mkdir(rpath)
+      print_item Baidupan::FsCmd.mkdir(rpath).body
+    end
+
+    desc 'move from_rpath, to_rpath', 'move a remote path/to/from --> path/to/to'
+    def mv(from_rpath, to_rpath)
+      to_rpath += File.basename(from_rpath) if to_rpath[-1] == '/'                                        
+      say "from_rpath不能和to_rpath相同" and return if from_rpath == to_rpath
+      
+      body = Baidupan::FsCmd.move(from_rpath, to_rpath).body
+
+      say "success to mv file #{body[:extra][:list][0][:from]} ---> #{body[:extra][:list][0][:to]}"
+    end
+
+    desc 'copy from_rpath, to_rpath', 'copy a remote path/to/from --> path/to/to'
+    def copy(from_rpath, to_rpath)
+      to_rpath += File.basename(from_rpath) if to_rpath[-1] == '/'                                        
+      say "from_rpath不能和to_rpath相同" and return if from_rpath == to_rpath
+
+      body = Baidupan::FsCmd.copy(from_rpath, to_rpath).body
+      say "success to cp file #{body[:extra][:list][0][:from]} ---> #{body[:extra][:list][0][:to]}"    
+    end
+    map cp: :copy
+
+    desc 'delete rpath', 'delete a remote path'
+    option :force, type: :boolean, default: false
+    def delete(rpath)
+      if options[:force] || yes?("Are you sure to delte #{rpath}?")
+        response = Baidupan::FsCmd.delete(rpath).response
+        say "success to delete  #{rpath}"if response.success?
+      else
+        say "Cancel to delete #{rpath}"
+      end
+    end
+    map del: :delete
   end
 end

data/lib/baidupan/config.rb

@@ -19,8 +19,17 @@ module Baidupan
         single_instance.config[method.to_sym]
       end
 
-      def file_path
-        File.join(self.base_url, 'file')
+      def file_path(*files)
+        base_file = File.join(self.base_url, 'file')
+        files.each do |file|
+          base_file = File.join(base_file, file.to_s)
+        end
+
+        base_file
+      end
+
+      def thumbnail
+        File.join(self.base_url, 'thumbnail')
       end
 
       def time_format
@@ -29,7 +38,7 @@ module Baidupan
 
       def join_path(*files)
         files.inject(self.app_root) do |rpath, lpath|
-          File.join(rpath, lpath)
+          File.join(rpath, lpath.to_s)
         end
       end
     end

data/lib/baidupan/core_ext.rb

@@ -0,0 +1 @@
+require 'baidupan/core_ext/hash'

data/lib/baidupan/core_ext/hash.rb

@@ -0,0 +1,5 @@
+class Hash
+  def to_query_str
+    map{|k, v| "&#{k}=#{v}"}.join
+  end
+end

data/lib/baidupan/fs_cmd.rb

@@ -6,7 +6,7 @@ module Baidupan
   class FsCmd < Base
     class << self
 
-      def list(rpath, **opts)
+      def list(rpath, opts={})
         opts.merge!(common_params(:list, path: "#{Config.app_root}/#{rpath}"))
         get(Config.file_path, opts)
       end
@@ -22,9 +22,42 @@ module Baidupan
       end
 
       def download(rpath, lpath, opts={})
-      	params = common_params(:download, path: "#{Config.app_root}/#{rpath}")
+      	params = common_params(:download, path: "#{Config.join(rpath)}")
 		    get(Config.file_path, params, opts.merge(followlocation: true))
       end
+
+      def url(rpath)
+        params = common_params(:download, path: "#{Config.join_path(rpath)}")
+        "#{Config.file_path}?#{params.to_query_str}"
+      end
+
+      def thumbnail(rpath, opts={})
+        params = common_params(:generate, path: "#{Config.join_path(rpath)}").merge(opts)
+        "#{Config.thumbnail}?" + params.to_query_str
+      end
+
+      def mkdir(rpath)
+        post(Config.file_path, common_params(:mkdir, path: "#{Config.join_path(rpath)}"))
+      end
+
+      def move(from_rpath, to_rpath)
+        params = common_params(:move, 
+                               from: "#{Config.join_path(from_rpath)}",
+                               to: "#{Config.join_path(to_rpath)}")
+        post(Config.file_path, params)
+      end
+
+      def copy(from_rpath, to_rpath)
+        params = common_params(:copy, 
+                               from: "#{Config.join_path(from_rpath)}",
+                               to: "#{Config.join_path(to_rpath)}")
+        post(Config.file_path, params)
+      end
+
+      def delete(rpath)
+        params = common_params(:delete, path: "#{Config.join_path(rpath)}")
+        post(Config.file_path, params)
+      end
     end
   end
 end

data/lib/baidupan/version.rb

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

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: baidupan
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
+  prerelease: 
 platform: ruby
 authors:
 - AndyHu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,20 +30,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,15 +110,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 利用百度云盘接口， 实现文件备份功能
@@ -128,30 +143,33 @@ files:
 - lib/baidupan/cmd/base.rb
 - lib/baidupan/cmd/fs_cmd.rb
 - lib/baidupan/config.rb
+- lib/baidupan/core_ext.rb
+- lib/baidupan/core_ext/hash.rb
 - lib/baidupan/fs_cmd.rb
 - lib/baidupan/version.rb
 homepage: http://ml-china.org
 licenses:
 - MIT
-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: 2.1.4
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: 文件上传和查看等功能
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a7bf29bd9e970583b16dcc95efbe8bd58c555d81
-  data.tar.gz: 50a1d6c214706ab0bead3a76a36c7201dde7b63c
-SHA512:
-  metadata.gz: e9615c5148eff1c8ab80e5351296ff70898dc9f1fcb8dabfc62fa32b09e1c196bcd4d7757e59ec88cafe6e80c19de99843e6db2cc5721722f0989dd685bb4ab2
-  data.tar.gz: 63de6c09ef2a05555c8a550d0748133e3d490f37dd6bedfe8b968e977382ef7ac5bc79870e159b098062f3e633c3f44122a74b0347fb33925be5d4db9299b9a9