Skip to content

Commit

Permalink
fix: code api change.
Browse files Browse the repository at this point in the history
  • Loading branch information
chivehao committed Aug 14, 2023
1 parent 14da7ca commit e0c3b0c
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 16 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ext {
springContext = '6.0.3'
pf4j = '3.8.0'
lombok = '1.18.24'
libFile = 'lib/api-0.4.0.jar'
libFile = 'lib/api-0.6.1.jar'
}


Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
group=run.ikaros.plugin.baidupan
description=a bai du pan plugin for ikaros.
version=0.4.1
version=0.6.1
Binary file removed lib/api-0.4.0-sources.jar
Binary file not shown.
Binary file removed lib/api-0.4.0.jar
Binary file not shown.
Binary file added lib/api-0.6.1-sources.jar
Binary file not shown.
Binary file added lib/api-0.6.1.jar
Binary file not shown.
20 changes: 8 additions & 12 deletions src/main/java/run/ikaros/plugin/baidupan/BaiDuPanClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import reactor.core.publisher.Mono;
import run.ikaros.api.core.setting.ConfigMap;
import run.ikaros.api.custom.ReactiveCustomClient;
import run.ikaros.api.exception.NotFoundException;
import run.ikaros.api.infra.exception.NotFoundException;
import run.ikaros.api.infra.properties.IkarosProperties;
import run.ikaros.api.infra.utils.FileUtils;
import run.ikaros.api.plugin.event.PluginConfigMapUpdateEvent;
Expand Down Expand Up @@ -149,12 +149,12 @@ public FileCreateResult uploadFile(Path path) {
}
// 根据VIP等级进行分片 普通用户-4MB 普通会员-16MB 超级会员-32MB
// @see https://pan.baidu.com/union/doc/nksg0s9vi
// 这里分片的规则是: 普通用户-4MB 普通会员-10MB 超级会员-30MB
// 这里分片的规则是: 普通用户-4MB 普通会员-16MB 超级会员-32MB
Integer vipType = me().getVipType();
int chunkSize = 1024;
switch (vipType) {
case 2 -> chunkSize = chunkSize * 30;
case 1 -> chunkSize = chunkSize * 10;
case 2 -> chunkSize = chunkSize * 32;
case 1 -> chunkSize = chunkSize * 16;
default -> chunkSize = chunkSize * 4;
}
FileUtils.split(path, chunkCacheDirPath, chunkSize);
Expand All @@ -172,14 +172,10 @@ public FileCreateResult uploadFile(Path path) {
int calculateFileHashIndex = 0;
log.info("start calculate chunk file md5 value, size: {}", size);
for (File listFile : sortedFiles) {
try {
blockList.add(
FileUtils.calculateFileHash(FileUtils.convertToDataBufferFlux(listFile)));
calculateFileHashIndex++;
log.info("current calculate file chunk: {}/{}", calculateFileHashIndex, size);
} catch (IOException e) {
throw new BaiDuPanException("calculate chunk file hash fail.", e);
}
blockList.add(
FileUtils.calculateFileHash(FileUtils.convertToDataBufferFlux(listFile)));
calculateFileHashIndex++;
log.info("current calculate file chunk: {}/{}", calculateFileHashIndex, size);
}
log.info("end calculate chunk file md5 value, size: {}", size);

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ name: PluginBaiDuPan
# plugin entry class that extends BasePlugin
clazz: run.ikaros.plugin.baidupan.BaiDuPanPlugin
# plugin 'version' is a valid semantic version string (see semver.org).
version: 0.4.1
requires: ">=0.4.2"
version: 0.6.1
requires: ">=0.6.1"
author:
name: Ikaros OSS Team
website: https://github.com/ikaros-dev
Expand Down

0 comments on commit e0c3b0c

Please sign in to comment.