alipan-sdk 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3f53b591622f3f464672c3e9bb90f51cf0de5d3cd60442513700cb2b13df5ac
-  data.tar.gz: 635f457fddba0eddd3909dd3f53b872801dfaa041555b802082a9a2850857abd
+  metadata.gz: e4628bf443c49974992f06af3a266a6554f631efe8affb8e96fe4a0f1211c91e
+  data.tar.gz: d3dc3210dc35128e261c25454dfa36f5fd16384ad2d280e226520b9e03f81ac7
 SHA512:
-  metadata.gz: bcf71c608206c88d31caf4782fe724538128f56acfdfcbe5a88aa13c2413a2d243c2962cef5f6f2af3eae6bbb30ee39e0b7868f80860cda4cd587df7633387bb
-  data.tar.gz: 87807a884d03c3bc416625f100f28c86813f701dbdd6cb495118e17d1450bb7dbc829662d0a1c58ab3185cafb535f787f277ed4cd13801ebd073df8d26994468
+  metadata.gz: 9356ddf651b4f762cbcfe0c20c70dd3050f50307975647c0d21054a1b1b101047ebbc7d27f15c03c53abaa885bb251c9ea0a204dca95ca0e00da0149fa78189c
+  data.tar.gz: 1ee6392d663d57d12490c4ae12f007ad2343cee00bf2bb34dd729d6131ea6468b369b26c758b69a74cc060a1bde8b4d91d6fdd1fafa0480686a570d61a8f9549

data/lib/alipan/drive.rb

@@ -13,5 +13,23 @@ 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
 	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,8 +59,8 @@ 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,
@@ -72,6 +76,11 @@ module Alipan
         end
       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: " \
                     "#{response.headers}, body: #{response.body}")
 

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

@@ -27,13 +27,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 +47,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 +60,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 +72,55 @@ 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)
+
+			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
 	end
 end

data/lib/alipan/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Alipan
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alipan-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - freeshenls