alipan-sdk 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3f53b591622f3f464672c3e9bb90f51cf0de5d3cd60442513700cb2b13df5ac
-  data.tar.gz: 635f457fddba0eddd3909dd3f53b872801dfaa041555b802082a9a2850857abd
+  metadata.gz: 48a3d90f95f3aec2c203b662aadf32aadf77877a399bebe105ca1283a703afa6
+  data.tar.gz: 295a90bea8c0add091d0bda3ec02cfe81787932d2558c06b7afbddc6f49976e2
 SHA512:
-  metadata.gz: bcf71c608206c88d31caf4782fe724538128f56acfdfcbe5a88aa13c2413a2d243c2962cef5f6f2af3eae6bbb30ee39e0b7868f80860cda4cd587df7633387bb
-  data.tar.gz: 87807a884d03c3bc416625f100f28c86813f701dbdd6cb495118e17d1450bb7dbc829662d0a1c58ab3185cafb535f787f277ed4cd13801ebd073df8d26994468
+  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

@@ -13,5 +13,38 @@ module Alipan
 		def list_objects(opts = {})
 			Iterator::Objects.new(@protocol, resource_drive_id, 'root', opts).to_enum
 		end
+
+		def get_object(key, opts = {}, &block)
+			obj = nil
+			file = opts[:file]
+			if file
+				File.open(File.expand_path(file), 'wb') do |f|
+					obj = @protocol.get_object(resource_drive_id, key, opts) do |chunk|
+						f.write(chunk)
+					end
+				end
+			elsif block
+				obj = @protocol.get_object(resource_drive_id, key, opts, &block)
+			else
+				obj = @protocol.get_object(resource_drive_id, key, opts)
+			end
+
+			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

@@ -16,6 +16,10 @@ module Alipan
 			@config = config
     end
 
+    def handle_response(r, &block)
+      r.read_body { |chunk| yield chunk }
+    end
+
 		def get(resources = {}, http_options = {}, &block)
       do_request('GET', resources, http_options, &block)
     end
@@ -45,7 +49,7 @@ module Alipan
     def do_request(verb, resources = {}, http_options = {}, &block)
     	sub_res = resources[:sub_res]
 
-      headers = http_options[:headers] || {}
+      headers = {}
       headers['Content-Type'] ||= DEFAULT_CONTENT_TYPE
       headers[AUTH_HEADER] = @config.access_token if @config.access_token
 
@@ -55,21 +59,23 @@ module Alipan
       block_response = ->(r) { handle_response(r, &block) } if block
       request = RestClient::Request.new(
         :method => verb,
-        :url => "https://open.aliyundrive.com#{sub_res}",
-        :headers => headers,
+        :url => "#{sub_res}".start_with?("/") ? "https://open.aliyundrive.com#{sub_res}" : "#{sub_res}",
+        :headers => http_options[:headers] || headers,
         :payload => http_options[:body],
         :block_response => block_response,
         :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)
+        response = RestClient::Response.create(nil, response, request)
+        response.return!
       end
 
       logger.debug("Received HTTP response, code: #{response.code}, headers: " \
@@ -79,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/object.rb

@@ -6,12 +6,7 @@ module Alipan
 		attrs :drive_id, :file_id, :parent_file_id,
 		:name, :size, :file_extension, :content_hash, 
 		:category, :type, :thumbnail, :url, :created_at, 
-		:updated_at, :play_cursor, :video_media_metadata, 
-		:video_preview_metadata
+		:updated_at, :video_media_metadata, :video_preview_metadata
 
-		def initialize(opts = {}, protocol = nil)
-			super(opts)
-			@protocol = protocol
-		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)
@@ -27,13 +29,14 @@ module Alipan
 				:backup_drive_id => body.fetch(:backup_drive_id.to_s),
 				:folder_id => body.fetch(:folder_id.to_s)
 			}, self)
+
 			logger.info("Done get drive, drive: #{drive}")
 
 			drive
 		end
 
 		def list_objects(drive_id, parent_file_id, opts = {})
-			logger.info("Begin list objects, options: #{opts}")
+			logger.debug("Begin list object, drive: #{drive_id}, options: #{opts}")
 
 			payload = {
 				:drive_id => drive_id,
@@ -46,7 +49,6 @@ module Alipan
 
 			objects = body[:items.to_s].map do |item|
 				Object.new(
-				{
 					:drive_id => item.fetch(:drive_id.to_s),
 					:file_id => item.fetch(:file_id.to_s),
 					:parent_file_id => item.fetch(:parent_file_id.to_s),
@@ -60,11 +62,9 @@ module Alipan
 					:url => item.fetch(:url.to_s),
 					:created_at => item.fetch(:created_at.to_s),
 					:updated_at => item.fetch(:updated_at.to_s),
-					:play_cursor => item.fetch(:play_cursor.to_s),
 					:video_media_metadata => item.fetch(:video_media_metadata.to_s),
-					:video_preview_metadata => item.fetch(:video_preview_metadata.to_s)
-				}, self)
-			end
+					:video_preview_metadata => item.fetch(:video_preview_metadata.to_s))
+			end || []
 
 			more = {
 				:marker => body[:next_marker.to_s]
@@ -74,5 +74,155 @@ module Alipan
 
 			[objects, more]
 		end
+
+		def get_object(drive_id, object_name, opts = {}, &block)
+			logger.debug("Begin get object, drive_id: #{drive_id}, "\
+                     "object: #{object_name}")
+
+			payload = {
+				:drive_id => drive_id,
+				:file_path => "#{object_name}".start_with?("/") ? "#{object_name}" : "/#{object_name}"
+			}
+
+			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),
+					:parent_file_id => body.fetch(:parent_file_id.to_s),
+					:name => body.fetch(:name.to_s),
+					:size => body.fetch(:size.to_s),
+					:file_extension => body.fetch(:file_extension.to_s),
+					:content_hash => body.fetch(:content_hash.to_s),
+					:category => body.fetch(:category.to_s),
+					:type => body.fetch(:type.to_s),
+					:thumbnail => body.fetch(:thumbnail.to_s),
+					:url => body.fetch(:url.to_s),
+					:created_at => body.fetch(:created_at.to_s),
+					:updated_at => body.fetch(:updated_at.to_s),
+					:video_media_metadata => body.fetch(:video_media_metadata.to_s),
+					:video_preview_metadata => body.fetch(:video_preview_metadata.to_s))
+
+			if block_given?
+				if obj.type == 'folder' || obj.file_id.nil?
+					yield nil
+				else
+					payload = {
+						:drive_id => drive_id,
+						:file_id => obj.file_id
+					}
+
+					r = @http.post( {:sub_res => "/adrive/v1.0/openFile/getDownloadUrl"}, {:body => payload.to_json})
+					body = JSON.parse(r.body)
+
+					@http.get( {:sub_res => body.fetch(:url.to_s)}, {:headers => {}}, &block) 
+				end
+			end
+
+			logger.debug("Done get object")
+
+			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.1"
+  VERSION = "0.1.3"
 end

data/lib/alipan.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'pry'
 require_relative "alipan/common"
 require_relative "alipan/config"
 require_relative "alipan/client"
@@ -9,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.1
+  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