🔖 SDK 2.0.5 Support Zotero

eritpchy · May 19, 2024 · dc6c34a · dc6c34a
1 parent 7e5f2e5
commit dc6c34a
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -171,18 +171,18 @@ implementation "com.squareup.okhttp3:logging-interceptor:3.12.13" //api19
 implementation "com.google.code.gson:gson:2.8.9"
 
 //主要
-implementation "net.xdow:aliyundrive-sdk-openapi:2.0.4"
-implementation "net.xdow:aliyundrive-sdk-webapi:2.0.4"
+implementation "net.xdow:aliyundrive-sdk-openapi:2.0.5"
+implementation "net.xdow:aliyundrive-sdk-webapi:2.0.5"
 
 //可选
-implementation "net.xdow:webdav:2.0.4"
-implementation "net.xdow:webdav-jakarta:2.0.4"
-implementation "net.xdow:webdav-javax:2.0.4"
-implementation "net.xdow:aliyundrive-webdav-internal:2.0.4"
-implementation "net.xdow:aliyundrive-android-core:2.0.4"
-implementation "net.xdow:jap-http:2.0.4"
-implementation "net.xdow:jap-http-jakarta-adapter:2.0.4"
-implementation "net.xdow:jap-http-javax-adapter:2.0.4"
+implementation "net.xdow:webdav:2.0.5"
+implementation "net.xdow:webdav-jakarta:2.0.5"
+implementation "net.xdow:webdav-javax:2.0.5"
+implementation "net.xdow:aliyundrive-webdav-internal:2.0.5"
+implementation "net.xdow:aliyundrive-android-core:2.0.5"
+implementation "net.xdow:jap-http:2.0.5"
+implementation "net.xdow:jap-http-jakarta-adapter:2.0.5"
+implementation "net.xdow:jap-http-javax-adapter:2.0.5"
 ```
 ## SDK基础用法
 ```java
@@ -214,6 +214,7 @@ AliyunDrive.newAliyunDrive()
 | MXPlayer      |     :rocket:直连模式 | :white_check_mark: |                                                         |
 | jetAudio      |     :rocket:直连模式 | :white_check_mark: | 受jetAudio限制,端口号只能为80(http) 或 443(https),<br/>安卓端不可直接监听以上端口! |
 | VLC           | ~~:rocket:直连模式~~ | :white_check_mark: |                                                         |
+| Zotero        |     :rocket:直连模式 | :white_check_mark: |                                                         |
 
 - 所有客户端均默认支持代理模式
 - ~~:rocket:直连模式~~: 由于阿里云盘目前直链有效期为15分钟, 部分播放器遇阿里云盘链接失效不会主动回webdav请求, 常见表现为播放停止, 无法拖动进度条, 中途直接切换下一集等等, 以上有标注的播放器均默认禁用直连模式, 普通连续下载文件不受影响

diff --git a/aliyundrive-android-core/build.gradle b/aliyundrive-android-core/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 apply plugin: 'com.android.library'
 
 group 'net.xdow'
-version '2.0.4'
+version '2.0.5'
 description 'AliyunDrive Webdav Android Core'
 
 repositories {

diff --git a/aliyundrive-sdk-openapi/build.gradle b/aliyundrive-sdk-openapi/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '2.0.4'
+version '2.0.5'
 description 'AliyunDrive OpenApi SDK'
 
 java {

diff --git a/aliyundrive-sdk-webapi/build.gradle b/aliyundrive-sdk-webapi/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '2.0.4'
+version '2.0.5'
 description 'AliyunDrive WebApi SDK'
 
 java {

diff --git a/aliyundrive-webdav-internal/build.gradle b/aliyundrive-webdav-internal/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '2.0.4'
+version '2.0.5'
 description 'AliyunDrive Webdav internal'
 
 java {

diff --git a/...ternal/src/main/java/com/github/zxbu/webdavteambition/store/AliyunDriveClientService.java b/...ternal/src/main/java/com/github/zxbu/webdavteambition/store/AliyunDriveClientService.java
@@ -36,6 +36,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLDecoder;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
@@ -332,7 +333,7 @@ public AliyunDriveFileInfo uploadPre(String path, long size, InputStream inputSt
                     vTFile.setSize(0L);
                     resultTFile = vTFile;
                     LOGGER.info("文件上传成功。文件名：{} 文件大小: {} 已上传: {} 虚拟文件: {}", path, size, totalUploadedSize, vTFile);
-                } if (totalUploadedSize == size) {
+                } if (totalUploadedSize == size || path.endsWith("/zotero/zotero-test-file.prop")) {
                     AliyunDriveResponse.FileUploadCompleteInfo fileUploadCompleteInfo = uploadComplete(fileInfo, uploadId, sha1Sum);
                     uploadSuccess = true;
                     AliyunDriveFileInfo vTFile = virtualTFileService.get(parentInfo, fileId);
@@ -728,6 +729,9 @@ private AliyunDriveFileInfo getNodeIdByPath2(String path) {
                 if (info.getName().equals(name)) {
                     return info;
                 }
+                if (String.valueOf(name).contains("%") && info.getName().equals(URLDecoder.decode(name))) {
+                    return info;
+                }
             }
         }
         return getNodeIdByParentId(AFileReqInfo.from(tFile), name);

diff --git a/jap-http-adapter/jap-http-jakarta-adapter/build.gradle b/jap-http-adapter/jap-http-jakarta-adapter/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '2.0.4'
+version '2.0.5'
 description 'jap-http servlet interface jakarta adapter'
 
 java {

diff --git a/jap-http-adapter/jap-http-javax-adapter/build.gradle b/jap-http-adapter/jap-http-javax-adapter/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '2.0.4'
+version '2.0.5'
 description 'jap-http servlet interface javax adapter'
 
 java {

diff --git a/jap-http/build.gradle b/jap-http/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '2.0.4'
+version '2.0.5'
 description 'jap-http servlet interface'
 
 java {

diff --git a/webdav-jakarta/build.gradle b/webdav-jakarta/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '2.0.4'
+version '2.0.5'
 description 'AliyunDrive Webdav jakarta implement'
 
 java {

diff --git a/webdav-javax/build.gradle b/webdav-javax/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '2.0.4'
+version '2.0.5'
 description 'AliyunDrive Webdav javax implement'
 
 java {

diff --git a/webdav/build.gradle b/webdav/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '2.0.4'
+version '2.0.5'
 description 'AliyunDrive Webdav core'
 
 java {