alipan-sdk 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4628bf443c49974992f06af3a266a6554f631efe8affb8e96fe4a0f1211c91e
-  data.tar.gz: d3dc3210dc35128e261c25454dfa36f5fd16384ad2d280e226520b9e03f81ac7
+  metadata.gz: 48a3d90f95f3aec2c203b662aadf32aadf77877a399bebe105ca1283a703afa6
+  data.tar.gz: 295a90bea8c0add091d0bda3ec02cfe81787932d2558c06b7afbddc6f49976e2
 SHA512:
-  metadata.gz: 9356ddf651b4f762cbcfe0c20c70dd3050f50307975647c0d21054a1b1b101047ebbc7d27f15c03c53abaa885bb251c9ea0a204dca95ca0e00da0149fa78189c
-  data.tar.gz: 1ee6392d663d57d12490c4ae12f007ad2343cee00bf2bb34dd729d6131ea6468b369b26c758b69a74cc060a1bde8b4d91d6fdd1fafa0480686a570d61a8f9549
+  metadata.gz: 6f73f95422319ff361f1a29b218208f6f1634b3febd1321b8f5cb89af3a11a486808259f59d72e89e09e3af7ab245480ad6f29ce56644aa6c8f09151bb4419cd
+  data.tar.gz: 2e14c6f8c68b773c8cdaab666c960f023e5e377e4c8ed8dd41852d0f05efd9de5fe69850bb8e991bfe8d5aeb5055541a01239dccaf4be811fa975f9a6f03ed1f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
-## [Unreleased]
+## Change Log
 
 ## [0.1.0] - 2025-06-20
 
 - Initial release
+
+## [0.1.3] - 2025-07-08
+
+- 添加获取文件、上传文件方法

data/README.md

@@ -35,9 +35,15 @@ client = Alipan::Client.new({:access_token=>"xxx"})
 ### 获取drive
 drive = client.get_drive
 
-### 获取object
+### 获取文件列表
 objects = drive.list_objects
 
+### 获取文件
+objects = drive.get_object(key, opts = {}, &block)
+
+### 上传文件
+objects = drive.put_object(key, opts = {}, &block)
+
 ## 更多
 
 更多文档请查看:

data/lib/alipan/adapter.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Alipan
+	class Adapter
+		
+		def initialize()
+	    @producer = Fiber.new do 
+	    	yield self if block_given?
+	    	nil
+	    end
+	  end
+
+		def read(length = nil, outbuf = nil)
+	    chunk = @producer.resume
+	    outbuf.replace(chunk) if outbuf && chunk
+	    chunk
+	  end
+
+	  def write(chunk)
+	  	Fiber.yield chunk.to_s.force_encoding(Encoding::ASCII_8BIT)
+	  end
+
+	  alias << write
+
+	  def closed?
+	  	false
+	  end
+
+	  def close
+	  end
+	end
+end

data/lib/alipan/drive.rb

@@ -31,5 +31,20 @@ module Alipan
 
 			obj
 		end
+
+		def put_object(key, opts = {}, &block)
+			file = opts[:file]
+
+			if file
+				@protocol.put_object(resource_drive_id, key, opts) do |sw|
+					File.open(File.expand_path(file), 'rb') do |f|
+						sw << f.read(Protocol::STREAM_CHUNK_SIZE) until f.eof?
+					end
+				end
+			else
+				@protocol.put_object(resource_drive_id, key, opts, &block)
+			end
+		end
+		
 	end
 end

data/lib/alipan/http.rb

@@ -66,14 +66,11 @@ module Alipan
         :open_timeout => @config.open_timeout  || OPEN_TIMEOUT,
         :read_timeout => @config.read_timeout || READ_TIMEOUT
       )
-      response = request.execute do |resp, &blk|
-        if resp.code >= 300
-          e = RuntimeError.new JSON.parse(resp.body)
-          logger.error(e.to_s)
-          raise e
-        else
-          resp.return!(&blk)
-        end
+      begin
+        response = request.execute 
+      rescue RestClient::ExceptionWithResponse => e
+        response = e.response
+        response = RestClient::Response.create(response.body, Net::HTTPResponse.new('1.1', 200, 'OK'), request)
       end
 
       unless response.is_a?(RestClient::Response)
@@ -88,3 +85,13 @@ module Alipan
     end
 	end
 end
+
+module RestClient
+  module Payload
+    class Base
+      def headers
+        ({'Content-Length' => size.to_s} if size) || {}
+      end
+    end
+  end
+end

data/lib/alipan/protocol.rb

@@ -6,6 +6,8 @@ module Alipan
 	class Protocol
 		include Common::Logging
 
+		STREAM_CHUNK_SIZE = 16 * 1024
+
 		def initialize(config)
 			@config = config
 			@http = HTTP.new(config)
@@ -85,6 +87,10 @@ module Alipan
 			r = @http.post( {:sub_res => "/adrive/v1.0/openFile/get_by_path"}, {:body => payload.to_json})
 			body = JSON.parse(r.body)
 
+			if body.fetch(:code.to_s, '') == 'NotFound.File'
+				return nil
+			end
+
 			obj = Object.new(
 					:drive_id => body.fetch(:drive_id.to_s),
 					:file_id => body.fetch(:file_id.to_s),
@@ -122,5 +128,101 @@ module Alipan
 
 			obj
 		end
+
+		def put_object(drive_id, object_name, opts = {}, &block)
+			logger.debug("Begin put object, drive_id: #{drive_id}, object: "\
+                     "#{object_name}, options: #{opts}")
+
+			obj = nil
+			need_dirs = Array.new
+			parent_file_id = 'root'
+			obj_dirname = File.dirname(object_name)
+			dirname = "#{obj_dirname}".start_with?("/") ? "#{obj_dirname}" : "/#{obj_dirname}"
+
+			until dirname == '/'
+				payload = {
+					:drive_id => drive_id,
+					:file_path => dirname
+				}
+
+				r = @http.post( {:sub_res => "/adrive/v1.0/openFile/get_by_path"}, {:body => payload.to_json})
+				body = JSON.parse(r.body)
+
+				if body.fetch(:code.to_s, '') == 'NotFound.File'
+					need_dirs.unshift File.basename(dirname)
+				else
+					if body.fetch(:type.to_s) != 'folder' 
+						e = RuntimeError.new "File #{dirname} has already existed!"
+						logger.error(e.to_s)
+						raise e
+					else
+						parent_file_id = body.fetch(:file_id.to_s)
+						break
+					end
+				end
+
+				dirname = File.dirname(dirname)
+			end
+
+			need_dirs.each do |need_dir|
+				payload = {
+					:drive_id => drive_id,
+					:parent_file_id => parent_file_id,
+					:name => need_dir,
+					:type => 'folder',
+					:check_name_mode => 'refuse'
+				}
+
+				r = @http.post( {:sub_res => "/adrive/v1.0/openFile/create"}, {:body => payload.to_json})
+				body = JSON.parse(r.body)
+
+				if body.fetch(:exist.to_s) == true && body.fetch(:type.to_s) != 'folder' 
+					e = RuntimeError.new "File #{dirname} has already existed!"
+					logger.error(e.to_s)
+					raise e
+				end
+
+				parent_file_id = body.fetch(:file_id.to_s)
+			end
+
+			payload = {
+				:drive_id => drive_id,
+				:parent_file_id => parent_file_id,
+				:name => File.basename(object_name),
+				:type => 'file',
+				:check_name_mode => 'refuse'
+			}
+
+			r = @http.post( {:sub_res => "/adrive/v1.0/openFile/create"}, {:body => payload.to_json})
+			body = JSON.parse(r.body)
+
+			file_id = body.fetch(:file_id.to_s)
+			upload_id = body.fetch(:upload_id.to_s)
+
+			body.fetch('part_info_list', Array.new).each do |part|
+				payload = Alipan::Adapter.new(&block)
+
+				@http.put( {:sub_res => part.fetch(:upload_url.to_s)}, { :headers => { 'Content-Type' => '', 'Transfer-Encoding' => 'chunked' }, :body => payload })
+
+				payload = {
+					:drive_id => drive_id,
+					:file_id => file_id,
+					:upload_id => upload_id
+				}
+
+				r = @http.post( {:sub_res => "/adrive/v1.0/openFile/complete"}, {:body => payload.to_json})
+				body = JSON.parse(r.body)
+
+				obj = Object.new(
+					:drive_id => body.fetch(:drive_id.to_s),
+					:file_id => body.fetch(:file_id.to_s),
+					:size => body.fetch(:size.to_s),
+					:parent_file_id => body.fetch(:parent_file_id.to_s),
+					:name => body.fetch(:name.to_s))
+			end
+
+			obj
+		end
+
 	end
 end

data/lib/alipan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Alipan
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/alipan.rb

@@ -8,3 +8,4 @@ require_relative "alipan/protocol"
 require_relative "alipan/iterator"
 require_relative "alipan/drive"
 require_relative "alipan/object"
+require_relative "alipan/adapter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alipan-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - freeshenls
@@ -36,6 +36,7 @@ files:
 - README.md
 - Rakefile
 - lib/alipan.rb
+- lib/alipan/adapter.rb
 - lib/alipan/client.rb
 - lib/alipan/common.rb
 - lib/alipan/common/logging.rb