Compare commits

...
Author SHA1 Message Date
Cursor Agentandqaiu bfa6453ee8 fix(web): show tree batch download on the right pane
Split tree view now has persistent 批量下载 chrome on the right
detail pane (top toolbar + bottom bar), so users can enter batch
mode without clicking the left tree first. Left-pane toolbar/footer
and tree batch auto-expand stay unchanged.

Co-authored-by: qaiu <[email protected]>
2026-09-19 07:20:20 +00:00
qaiu 0c678a4124 Merge pull request #221 from qaiu/cursor/release-046-b82b
release: v0.4.6
2026-09-18 19:01:51 -07:00
Cursor Agentandqaiu f77800602d release: 0.4.6 tree batch auto-expand and view-switch icons
Co-authored-by: qaiu <[email protected]>
2026-09-19 01:39:46 +00:00
qaiu 79ab829952 Merge pull request #220 from qaiu/cursor/tree-batch-expand-f84e
feat: 文件树批量勾选自动展开 + 视图切换图标 / Tree batch auto-expand and view-switch icons
2026-09-18 18:38:23 -07:00
Cursor Agentandqaiu 2181ef38df fix(web): set tree batch default max depth to 5
Align with VIP: default recursive batch depth is 5 (checked folder = depth 0). Still configurable via batchMaxDepth; warn when remaining folders hit the cap.

Co-authored-by: qaiu <[email protected]>
2026-09-19 01:14:06 +00:00
Cursor Agentandqaiu e09c9f76a7 feat(web): tree batch auto-expand with depth limit and view icons
勾选文件树文件夹时自动展开并懒加载子节点,按最大深度(默认 4,勾选文件夹为第 0 层)递归收集可下载文件;触及上限时中文提示部分文件已跳过。树侧栏顶部增加显眼的批量下载入口。Home/ShowList 窗格与文件树切换增加 Font Awesome 图标。

Co-authored-by: qaiu <[email protected]>
2026-09-19 01:12:33 +00:00
qaiu 7adb938357 更新 README.md 2026-09-18 00:36:05 -07:00
qaiu efb800d88e 更新 README.md 2026-09-18 00:30:44 -07:00
qandCursor 422d5b845b fix: recognize 123pan uid.share links and trim paste input
Clipboard auto-detect now matches {userId}.share.123pan.cn/123pan/{key}, and the share URL field is trimmed on paste and blur. Split web-service compiler args so IDE rebuilds no longer wipe classes.

Co-authored-by: Cursor <[email protected]>
2026-08-18 01:22:47 +08:00
qandCursor 054e9cc1ec fix: harden gzip decode and release 0.4.5
Avoid ZipException when Vert.x already decompressed gzip bodies, keep jackson-databind on the IDE classpath, and show a real build version instead of unknown.

Co-authored-by: Cursor <[email protected]>
2026-08-18 01:00:32 +08:00
qandCursor f3da45bb16 fix(lz): port Lanzou parser to wwww.lanzoux.com flow
Use the new share/ajax/verify pipeline (arg1 retry, regex ajax extract, delayed CDN verify) on the open-source PanBase client, keeping proxy support and complete() for downloadUrl.

Bump version to 0.4.4.

Co-authored-by: Cursor <[email protected]>
2026-08-18 00:25:49 +08:00
qandCursor 273dbae5e7 ci: only publish GitHub releases for v* tags
Agent/feature tags were matching '*' and becoming Latest, which also multiplied auto-generated notes.

Co-authored-by: Cursor <[email protected]>
2026-08-18 00:22:02 +08:00
q e103003b7a Merge branch 'main' of github.com:qaiu/netdisk-fast-download 2026-08-18 00:21:51 +08:00
qaiu b5f7d9694b 更新 README.md 2026-08-16 21:20:04 +08:00
qaiu f75d9f687b 更新 README.md 2026-08-16 21:18:37 +08:00
qaiu 703bfa3061 Merge pull request #213 from qaiu/claude/fangcloud-share-validity-check-9fzoi6
fix(parser): FangCloud share validity check reads the wrong JSON field
2026-08-13 16:05:23 +08:00
Claude 6c709fde65 fix(parser): fix FangCloud share validity check and h5 share link regex
Root cause confirmed against a live share link: FcTool never actually
checked share validity against the info API — it read a top-level
"is_valid" field that the endpoint doesn't return. The real validity
flags (process.is_closed / process.is_expired) live under "process",
so an invalid share fell through to HTML scraping and surfaced a
confusing "未匹配到文件id(typed_id)" error instead of a clear
"分享已失效" message. parse() now checks share_links/info first and
fails fast with a clear message when the share is closed/expired.

Also widen PanDomainTemplate's FC regex to accept the mobile H5
landing page path (/h5/share/{key}), which previously didn't match
at all.

Updated verify_fangcloud_share.py to reflect the confirmed API
response shape instead of the earlier incorrect guess.
2026-08-13 07:46:29 +00:00
Claude 449fd741ac Add diagnostic script for FangCloud share validity check
FcTool.java's share validity check hits a share_links/info endpoint on
v2.fangcloud.cn that doesn't appear in the project's own captured
traffic (pan-fc.http) or public docs, and its regex in
PanDomainTemplate doesn't match the /h5/share/ path used by mobile
links. This script reproduces both requests against a live share URL
to confirm the root cause before fixing the parser.
2026-08-13 07:29:42 +00:00
qaiu c18b8d80e1 更新 README.md 2026-08-07 09:36:35 +08:00
qaiu 06ba0aff52 Merge pull request #211 from qaiu/copilot/update-readme-to-latest-version
docs: update download URL to latest release v0.4.2
2026-08-05 21:42:39 +08:00
copilot-swe-agent[bot]andqaiu 74e401d99c docs: fix download URL and zip filename for v0.4.2 linux-amd64
Co-authored-by: qaiu <[email protected]>
2026-08-05 13:28:37 +00:00
copilot-swe-agent[bot]andqaiu 4995bca901 docs: update download URL to latest release v0.4.2
Co-authored-by: qaiu <[email protected]>
2026-08-05 13:18:11 +00:00
qaiu 7299fd8762 Merge pull request #207 from qaiu/cursor/ghsa-997r-ssrf-verify-2b8b
fix(security): GHSA-997r SSRF verification + residual hardening
2026-07-26 21:10:39 +08:00
Cursor Agentandqaiu efbadde4ed fix(security): harden GHSA-997r Cloudreve SSRF residual paths
Disable redirect following on CE/Ce4 attacker-controlled requests and stop
echoing upstream response bodies in client-facing JSON errors. Add
assertPublicHost regression coverage for the advisory PoC hosts.

Co-authored-by: qaiu <[email protected]>
2026-07-26 12:05:16 +00:00
27 changed files with 1982 additions and 921 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ on:
workflow_dispatch:
push:
tags:
- '*'
- 'v*'
branches-ignore:
- '*'
paths-ignore:
+42 -27
View File
@@ -28,25 +28,31 @@ QQ交流群:1017480890
[公益解析,lz0站](https://lz0.qaiu.top)
[专业版](https://189.qaiu.top)
## 快速开始
命令行下载分享文件:
```shell
curl -LOJ "https://lz.qaiu.top/parser?url=https://share.feijipan.com/s/Tk1F2kGQ&pwd=1234"
```
或者使用wget:
```shell
wget -O bilibili.mp4 "https://lz.qaiu.top/parser?url=https://share.feijipan.com/s/Tk1F2kGQ&pwd=1234"
```
或者使用浏览器[直接访问](https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.top%2Fparser%3Furl%3Dhttps%3A%2F%2Fwww.ilanzou.com%2Fs%2FCDx6xKbT&name=bilibili.mp4&ext=mp4):
```
### 调用演示站下载:
https://lz.qaiu.top/parser?url=https://www.ilanzou.com/s/CDx6xKbT&pwd=1234
### 调用演示站预览:
https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.top%2Fparser%3Furl%3Dhttps%3A%2F%2Fwww.ilanzou.com%2Fs%2FCDx6xKbT&name=bilibili.mp4&ext=mp4
以带提取码的分享链接为例(提取码 `1234`),链接中含 `#`、`&`,作为 `url` 参数传入前必须做 URL 编码:
`https://www.ecpan.cn/web/#/yunpanProxy?path=%2F%23%2Fdrive%2Foutside&data=70017ece572737b12b30709b7f029308eJD0&isShare=1`
**命令行下载**
```shell
# curl
curl -LOJ "https://lz.qaiu.top/parser?url=https%3A%2F%2Fwww.ecpan.cn%2Fweb%2F%23%2FyunpanProxy%3Fpath%3D%252F%2523%252Fdrive%252Foutside%26data%3D70017ece572737b12b30709b7f029308eJD0%26isShare%3D1&pwd=1234"
# wget
wget -O v01 "https://lz.qaiu.top/parser?url=https%3A%2F%2Fwww.ecpan.cn%2Fweb%2F%23%2FyunpanProxy%3Fpath%3D%252F%2523%252Fdrive%252Foutside%26data%3D70017ece572737b12b30709b7f029308eJD0%26isShare%3D1&pwd=1234"
```
**短链方式**(key 取分享链接的 `data` 参数,提取码用 `@` 拼接)
| 用途 | 地址 |
| --- | --- |
| 下载 | `https://lz.qaiu.top/ec/70017ece572737b12b30709b7f029308eJD0@1234` |
| 在线预览 | [点击访问](https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.top%2Fec%2F70017ece572737b12b30709b7f029308eJD0%401234&name=v01&ext=mp4) |
> 无提取码时去掉 `&pwd=1234` / `@1234` 即可;预览页 `src` 需编码(`@` → `%40`),用短链可避免二次编码。
**解析器模块文档:** [parser/README.md](parser/README.md)
**JavaScript解析器文档:** [JavaScript解析器开发指南](parser/doc/JAVASCRIPT_PARSER_GUIDE.md) | [自定义解析器扩展指南](parser/doc/CUSTOM_PARSER_GUIDE.md) | [快速开始](parser/doc/CUSTOM_PARSER_QUICKSTART.md)
@@ -93,7 +99,9 @@ https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.
- Dropbox-pdp
- iCloud-pic
### 专业版提供
- 迅雷网盘-xl
- 百度网盘开放平台-bd
- 迅雷云盘开放平台-xl
- [光鸭云盘开放平台-gy](https://www.guangyapan.com)
- [夸克云盘-qk](https://pan.quark.cn/)
- [UC云盘-uc](https://fast.uc.cn/)
- [移动云盘-p139](https://yun.139.com/)
@@ -133,6 +141,7 @@ GET /json/parser?url={分享链接}&pwd={密码}
```
GET /json/{网盘标识}/{分享key}@{密码}
```
注意: 移动云云空间的 `分享key` 取分享链接中的 `data` 参数值
#### 3. 文件夹解析(v0.1.8fixed3+)
@@ -230,11 +239,6 @@ auths:
如果只是临时调用一次,不想改动服务端配置,也可以用上面提到的 `auth` 参数临时传递(`authType` 可选 `password`/`accesstoken`/`authorization`),无需重启服务,仅本次请求生效。
### 特殊说明
- 移动云云空间的 `分享key` 取分享链接中的 `data` 参数值
- 移动云云空间、小飞机网盘的加密分享可忽略密码参数
### 示例
```bash
@@ -455,8 +459,8 @@ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtow
> 注意: netdisk-fast-download.service中的ExecStart的路径改为实际路径
```shell
cd ~
wget -O netdisk-fast-download.zip https://github.com/qaiu/netdisk-fast-download/releases/download/v3.0.2/netdisk-fast-download-bin.zip
unzip netdisk-fast-download-bin.zip
wget -O netdisk-fast-download.zip https://github.com/qaiu/netdisk-fast-download/releases/download/v0.4.6/netdisk-fast-download-linux-amd64.zip
unzip netdisk-fast-download.zip
cd netdisk-fast-download
bash service-install.sh
```
@@ -544,11 +548,22 @@ Core模块集成Vert.x实现类似spring的注解式路由API
</picture>
</a>
## **免责声明**
- 用户在使用本项目时,应自行承担风险,并确保其行为符合当地法律法规。开发者不对用户因使用本项目而导致的任何后果负责。
## 支持该项目
开源不易,用爱发电,本项目长期维护如果觉得有帮助, 可以请作者喝杯咖啡, 感谢支持
## **声明**
- 本项目**仅供个人学习与技术交流使用**,请勿用于商业用途或大规模滥用。
- 所用接口均来自各网盘**官方开放平台**、官方公开接口及**已知开源项目**,仅解析用户主动提供的分享链接,**不涉及破解或绕过版权保护**。
- 本项目**相当于自动化程序代替用户发起请求**,**不会提升或绕过任何会员权限**,也**不会突破网盘的限速策略**;我们**鼓励用户开通官方 VIP/SVIP**以获得更好的下载与加速体验。
- 使用者应遵守各网盘服务商的**用户协议与使用条款**,以及所在地区的**法律法规**,违反所产生的后果自行承担。
- **高频调用可能触发网盘风控**,导致**账号限流、封禁**或**来源 IP 被屏蔽**,请合理控制请求频率,避免高并发与批量请求。
- 网盘接口调整、风控策略变更等因素可能导致功能失效,本项目**不对可用性与稳定性作任何担保**。
- 开发者**不对**使用本项目产生的**任何直接或间接损失**(账号封禁、数据丢失、法律纠纷等)**承担责任**。
- 开发者保留**随时修改本免责声明**的权利,恕不另行通知。
- **下载、部署或使用本项目,即视为您已阅读并接受上述全部条款。**
## 赞助该项目
开源不易,用爱发电,本项目长期维护如果觉得有帮助, 可以请开发者[喝杯咖啡](https://blog.qaiu.top/archives/da-shang-zhuan-yong), 感谢支持。
本项目的服务器由林枫云提供赞助<br>
</a>
@@ -162,13 +162,18 @@ public class CommonUtil {
try (var is = CommonUtil.class.getClassLoader().getResourceAsStream("app.properties")) {
if (is != null) {
properties.load(is);
if (!properties.isEmpty()) {
appVersion = properties.getProperty("app.version") + "build" + properties.getProperty("build");
String version = properties.getProperty("app.version");
String build = properties.getProperty("build");
if (version != null && !version.contains("${")) {
appVersion = version + "build" + (build == null || build.contains("${") ? "" : build);
}
}
} catch (IOException e) {
} catch (Exception e) {
LOGGER.error("读取app.properties失败", e);
}
if (appVersion == null) {
appVersion = "unknown";
}
}
return appVersion;
}
+1 -1
View File
@@ -63,7 +63,7 @@
<lombok.version>1.18.38</lombok.version>
<slf4j.version>2.0.16</slf4j.version>
<commons-lang3.version>3.18.0</commons-lang3.version>
<jackson.version>2.18.6</jackson.version>
<jackson.version>2.18.9</jackson.version>
<logback.version>1.5.32</logback.version>
<junit.version>4.13.2</junit.version>
</properties>
@@ -368,9 +368,12 @@ public abstract class PanBase implements IPanTool, Closeable {
// 检查响应头中的Content-Encoding是否为gzip
String contentEncoding = res.getHeader("Content-Encoding");
try {
if ("gzip".equalsIgnoreCase(contentEncoding)) {
if ("gzip".equalsIgnoreCase(contentEncoding) && res.body() instanceof Buffer gzipBody
&& gzipBody.length() >= 2
&& (gzipBody.getByte(0) & 0xff) == 0x1f
&& (gzipBody.getByte(1) & 0xff) == 0x8b) {
// 如果是gzip压缩的响应体,解压(只解压一次,缓存结果)
String decompressed = decompressGzip((Buffer) res.body());
String decompressed = decompressGzip(gzipBody);
return new JsonObject(decompressed);
} else {
return res.bodyAsJsonObject();
@@ -382,9 +385,10 @@ public abstract class PanBase implements IPanTool, Closeable {
log.error("响应gzip解压或JSON解析失败: {}", e.getMessage());
fail("响应gzip解压或JSON解析失败: {}", e.getMessage());
} else {
// 上游响应体可能来自内网探测目标,仅写日志,避免经 HTTP 500 回传给调用方
String bodyPreview = responseBodyPreview(res);
log.error("解析失败: json格式异常: {}", bodyPreview);
fail("解析失败: json格式异常: {}", bodyPreview);
fail("解析失败: json格式异常");
}
return JsonObject.of();
}
@@ -121,9 +121,9 @@ public enum PanDomainTemplate {
"https://lecloud.lenovo.com/share/{shareKey}",
LeTool.class),
// https://v2.fangcloud.com/s/
// https://v2.fangcloud.com/s/ https://v2.fangcloud.cn/h5/share/ (移动端H5落地页)
FC("亿方云",
compile("https://v2\\.fangcloud\\.(com|cn)/(s|share|sharing)/(?<KEY>.+)"),
compile("https://v2\\.fangcloud\\.(com|cn)/(?:h5/)?(s|share|sharing)/(?<KEY>.+)"),
"https://v2.fangcloud.com/s/{shareKey}",
"https://www.fangcloud.com/",
FcTool.class),
@@ -111,7 +111,8 @@ public class Ce4Tool extends PanBase {
private void requestShareDetail(String baseUrl, String key, String pwd, String path) {
String shareApiUrl = baseUrl + SHARE_API_PATH + key;
HttpRequest<Buffer> httpRequest = clientSession.getAbs(shareApiUrl);
// 禁止跟随重定向:防止公网 host 302 到内网/元数据绕过 assertPublicHost
HttpRequest<Buffer> httpRequest = clientNoRedirects.getAbs(shareApiUrl);
if (pwd != null && !pwd.isEmpty()) {
httpRequest.addQueryParam("password", pwd);
}
@@ -232,7 +233,7 @@ public class Ce4Tool extends PanBase {
.put("uris", new JsonArray().add(filePath))
.put("download", true);
clientSession.postAbs(fileUrlApi)
clientNoRedirects.postAbs(fileUrlApi)
.putHeader("Content-Type", "application/json")
.sendJsonObject(requestBody)
.onSuccess(res -> {
@@ -78,7 +78,8 @@ public class CeTool extends PanBase {
private void tryV4Ping(String baseUrl, String key, String pwd) {
String pingUrlV4 = baseUrl + PING_API_V4_PATH;
clientSession.getAbs(pingUrlV4).send().onSuccess(res -> {
// 禁止跟随重定向:assertPublicHost 只校验初始 host,自动 30x 会绕过 SSRF 防护
clientNoRedirects.getAbs(pingUrlV4).send().onSuccess(res -> {
if (res.statusCode() == 200) {
try {
JsonObject json = asJson(res);
@@ -108,7 +109,7 @@ public class CeTool extends PanBase {
private void tryV3Ping(String baseUrl, String key, String pwd) {
String pingUrlV3 = baseUrl + PING_API_V3_PATH;
clientSession.getAbs(pingUrlV3).send().onSuccess(res -> {
clientNoRedirects.getAbs(pingUrlV3).send().onSuccess(res -> {
if (res.statusCode() == 200) {
try {
JsonObject json = asJson(res);
@@ -139,7 +140,7 @@ public class CeTool extends PanBase {
*/
private void verifyV3AndParse(String baseUrl, String key, String pwd) {
String shareApiUrl = baseUrl + SHARE_API_PATH + key;
HttpRequest<Buffer> httpRequest = clientSession.getAbs(shareApiUrl);
HttpRequest<Buffer> httpRequest = clientNoRedirects.getAbs(shareApiUrl);
if (pwd != null && !pwd.isEmpty()) {
httpRequest.addQueryParam("password", pwd);
}
@@ -175,7 +176,7 @@ public class CeTool extends PanBase {
*/
private void tryV4ShareApi(String baseUrl, String key, String pwd) {
String shareApiUrl = baseUrl + "/api/v4/share/info/" + key;
HttpRequest<Buffer> httpRequest = clientSession.getAbs(shareApiUrl);
HttpRequest<Buffer> httpRequest = clientNoRedirects.getAbs(shareApiUrl);
if (pwd != null && !pwd.isEmpty()) {
httpRequest.addQueryParam("password", pwd);
}
@@ -291,7 +292,8 @@ public class CeTool extends PanBase {
}
private void getDownURL(String shareApiUrl) {
clientSession.putAbs(shareApiUrl)
// PUT 默认不跟随重定向,但仍统一使用 no-redirect 客户端避免配置漂移
clientNoRedirects.putAbs(shareApiUrl)
.putHeader("Referer", shareLinkInfo.getShareUrl())
.send().onSuccess(res -> {
JsonObject jsonObject = asJson(res);
@@ -22,6 +22,7 @@ public class FcTool extends PanBase {
public static final String SHARE_URL_PREFIX = "https://v2.fangcloud.com/sharing/";
public static final String SHARE_URL_PREFIX2 = "https://v2.fangcloud.cn/sharing/";
private static final String SHARE_INFO_URL = "https://v2.fangcloud.cn/apps/share_links/info/";
private static final String DOWN_REQUEST_URL = "https://v2.fangcloud.cn/apps/files/download?file_id={fid}" +
"&scenario=share&unique_name={uname}";
@@ -38,6 +39,25 @@ public class FcTool extends PanBase {
final String dataKey = shareLinkInfo.getShareKey();
final String pwd = shareLinkInfo.getSharePassword();
WebClientSession sClient = WebClientSession.create(client);
// 先查询分享有效性, 避免分享已失效/已过期时仍去解析HTML, 报出令人困惑的技术错误
sClient.getAbs(SHARE_INFO_URL + dataKey).send().onSuccess(infoRes -> {
JsonObject infoJson = asJson(infoRes);
if (promise.future().isComplete()) {
return;
}
JsonObject process = infoJson.getJsonObject("process");
boolean isClosed = process != null && Boolean.TRUE.equals(process.getBoolean("is_closed"));
boolean isExpired = process != null && Boolean.TRUE.equals(process.getBoolean("is_expired"));
if (process == null || isClosed || isExpired) {
fail("分享已失效或不存在");
return;
}
doParse(dataKey, pwd, sClient);
}).onFailure(handleFail(SHARE_INFO_URL + dataKey));
return promise.future();
}
private void doParse(String dataKey, String pwd, WebClientSession sClient) {
// 第一次请求 自动重定向
sClient.getAbs(SHARE_URL_PREFIX + dataKey).send().onSuccess(res -> {
@@ -67,7 +87,6 @@ public class FcTool extends PanBase {
}
getDownURL(dataKey, promise, res, sClient);
}).onFailure(handleFail(SHARE_URL_PREFIX + dataKey));
return promise.future();
}
private void getDownURL(String dataKey, Promise<String> promise, HttpResponse<Buffer> res,
File diff suppressed because it is too large Load Diff
@@ -119,8 +119,18 @@ public class HttpResponseHelper {
};
}
private static boolean looksLikeGzip(Buffer compressed) {
return compressed != null && compressed.length() >= 2
&& (compressed.getByte(0) & 0xff) == 0x1f
&& (compressed.getByte(1) & 0xff) == 0x8b;
}
// -------------------- gzip --------------------
private static String decompressGzip(Buffer compressed) throws IOException {
// Vert.x 可能已解压但仍带 Content-Encoding: gzip,再走 GZIPInputStream 会变成 ZipException
if (!looksLikeGzip(compressed)) {
return compressed.toString(StandardCharsets.UTF_8);
}
try (ByteArrayInputStream bais = new ByteArrayInputStream(compressed.getBytes());
GZIPInputStream gzis = new GZIPInputStream(bais);
InputStreamReader isr = new InputStreamReader(gzis, StandardCharsets.UTF_8);
@@ -0,0 +1,44 @@
package cn.qaiu.parser;
import org.junit.Test;
import java.io.IOException;
import java.net.URL;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
* GHSA-997r-7xx2-p9x6 regression: Cloudreve generic parser must reject
* hosts that resolve to loopback / private / link-local / metadata ranges
* before any outbound request.
*/
public class AssertPublicHostTest {
@Test
public void rejectsLoopbackAndPrivateHosts() throws Exception {
String[] blocked = {
"http://127.0.0.1.nip.io/s/poc",
"http://localhost/s/poc",
"http://10.0.0.1/s/poc",
"http://192.168.1.1/s/poc",
"http://172.16.0.1/s/poc",
"http://169.254.169.254/s/poc",
"http://[::1]/s/poc"
};
for (String raw : blocked) {
try {
PanBase.assertPublicHost(new URL(raw));
fail("expected block for " + raw);
} catch (IOException expected) {
assertTrue(expected.getMessage().contains("不允许访问")
|| expected.getMessage().contains("无法解析"));
}
}
}
@Test
public void allowsPublicHost() throws Exception {
PanBase.assertPublicHost(new URL("https://example.com/s/demo"));
}
}
@@ -170,6 +170,10 @@ public class PanDomainTemplateTest {
assertTrue("YE should match redirected mshare URL", redirectedUrl.find());
assertEquals("lN7UVv-pbYJ", redirectedUrl.group("KEY"));
Matcher shareUrl = yePattern.matcher("https://1815268665.share.123pan.cn/123pan/iaKtVv-r4aCd");
assertTrue("YE should match uid.share.123pan.cn URL", shareUrl.find());
assertEquals("iaKtVv-r4aCd", shareUrl.group("KEY"));
Matcher htmlUrl = yePattern.matcher("https://www.123278.com/s/lN7UVv-pbYJ.html?pwd=abcd");
assertTrue("YE should match html URL with query", htmlUrl.find());
assertEquals("lN7UVv-pbYJ", htmlUrl.group("KEY"));
@@ -1,52 +0,0 @@
package cn.qaiu.parser.impl;
import org.junit.Test;
import static org.junit.Assert.*;
public class LzToolAjaxExtractTest {
@Test
public void testExtractWpSignAjaxfile() {
String html = """
<script>
var wp_sign = 'BWMGOF5v';
var ajaxdata = 'MrBR';
var kdns =1;
$.ajax({
type : 'post',
url : '/ajaxfile.php?file=150233466',
data : { 'action':'downprocess','websignkey':ajaxdata,'signs':ajaxdata,'sign':wp_sign,'websign':'','kd':kdns,'ves':1 }
});
</script>
""";
LzTool.AjaxCall call = LzTool.extractAjaxFromHtml(html, null);
assertNotNull(call);
assertEquals("/ajaxfile.php?file=150233466", call.path());
assertEquals("BWMGOF5v", call.form().get("sign"));
assertEquals("MrBR", call.form().get("websignkey"));
assertEquals("downprocess", call.form().get("action"));
assertEquals("1", call.form().get("kd"));
}
@Test
public void testExtractPasswordSign() {
String html = """
<input id="pwd">
<script>
function down_p(){
$.ajax({
type : 'post',
url : '/ajaxm.php?file=1',
data : { 'action':'downprocess','sign':'ABC123','p':'x' }
});
}
</script>
""";
LzTool.AjaxCall call = LzTool.extractAjaxFromHtml(html, "e4k4");
assertNotNull(call);
assertEquals("/ajaxm.php?file=1", call.path());
assertEquals("ABC123", call.form().get("sign"));
assertEquals("e4k4", call.form().get("p"));
}
}
+1 -1
View File
@@ -17,7 +17,7 @@
</modules>
<properties>
<revision>0.4.3</revision>
<revision>0.4.6</revision>
<java.version>17</java.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
+169
View File
@@ -0,0 +1,169 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
"""
亿方云 (FangCloud) 分享链接有效性验证脚本
用法: 直接 `python3 verify_fangcloud_share.py` 运行, 分享链接已写死在 SHARE_URL
里 (不走命令行传参), 要换链接就直接改这个常量。
根因(已用真实分享链接验证确认)
--------------------------------
GET https://v2.fangcloud.cn/apps/share_links/info/{uname}
返回的是 200 + JSON, 结构形如:
{
"process": {
"is_closed": false,
"is_expired": false,
"item": {"type": "file", "id": 45006535173, "name": "..."},
...
}
}
FcTool.java 原来的实现判断有效性时读的是响应体**顶层**的 "is_valid" 字段
(`json.getBoolean("is_valid")`), 但这个字段根本不存在于该接口的实际响应里
(有效性信息实际上是 process.is_closed / process.is_expired, 且没有任何
名叫 "is_valid" 的字段) —— 所以旧的判断逻辑其实从未真正读取过这个接口的
有效性判断, 而是走的另一套 HTML 抓取 typed_id 的流程, 分享失效时会得到一个
"未匹配到文件id(typed_id)" 这种令人困惑的技术报错, 而不是清晰的"分享已失效"。
修复方案(已同步到 FcTool.java): 解析前先请求一次
https://v2.fangcloud.cn/apps/share_links/info/{uname}, 用
process.is_closed / process.is_expired 判断分享是否有效, 无效则直接返回
"分享已失效或不存在", 有效再继续走原来的 HTML + files/download 流程。
本脚本用于本地复现/回归验证这条判断逻辑, 并顺带跑一遍完整的取直链流程。
"""
import re
import sys
import requests
# 直接写死分享链接, 不通过命令行参数传入
SHARE_URL = "https://v2.fangcloud.cn/h5/share/ded6dc6b9c3672b40b769804bf"
# 如果分享有密码, 在这里填上, 没有就留空字符串
SHARE_PASSWORD = ""
HEADERS = {
"User-Agent": (
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
"(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36"
),
"Accept": "application/json, text/html;q=0.9, */*;q=0.8",
"Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
}
# 修复后的正则, 额外兼容 /h5/share/ 移动端落地页路径 (对齐 PanDomainTemplate.FC)
FC_REGEX = re.compile(r"https://v2\.fangcloud\.(com|cn)/(?:h5/)?(s|share|sharing)/(?P<KEY>.+)")
SHARE_INFO_URL = "https://v2.fangcloud.cn/apps/share_links/info/{key}"
SHARE_URL_PREFIX = "https://v2.fangcloud.com/sharing/{key}"
DOWN_REQUEST_URL = "https://v2.fangcloud.cn/apps/files/download"
TYPED_ID_RE = re.compile(r'id="typed_id"\s+value="file_(\d+)"')
def extract_share_key(url: str) -> str:
m = FC_REGEX.search(url)
if not m:
raise ValueError(f"无法从链接中提取 shareKey (正则不匹配): {url}")
return m.group("KEY")
def check_is_valid(share_key: str, session: requests.Session) -> bool:
print("=" * 70)
print("Step 1. 请求 share_links/info 判断分享有效性 (对齐 FcTool.java 修复后的逻辑)")
print("=" * 70)
url = SHARE_INFO_URL.format(key=share_key)
r = session.get(url, timeout=15)
print(f"GET {url}")
print(f"状态码: {r.status_code}")
try:
data = r.json()
except Exception:
print("响应不是合法JSON => 判定分享已失效或不存在\n")
return False
process = data.get("process")
if not process:
print("响应中没有 process 字段 => 判定分享已失效或不存在\n")
return False
is_closed = bool(process.get("is_closed"))
is_expired = bool(process.get("is_expired"))
item = process.get("item")
print(f"is_closed = {is_closed}, is_expired = {is_expired}, item = {item}")
if is_closed or is_expired:
print("=> 分享已失效或不存在\n")
return False
print("=> 分享有效\n")
return True
def get_download_url(share_key: str, pwd: str, session: requests.Session) -> str:
print("=" * 70)
print("Step 2. 走原有 HTML + files/download 流程取直链")
print("=" * 70)
r = session.get(SHARE_URL_PREFIX.format(key=share_key), timeout=15)
print(f"GET {SHARE_URL_PREFIX.format(key=share_key)} -> {r.status_code}, 最终URL: {r.url}")
html = r.text
if pwd:
# 加密分享: 提交密码换取跳转后的落地页 (此处仅示意, 具体见 FcTool.java)
m = re.search(r'name="requesttoken"\s+value="([a-zA-Z0-9_+=]+)"', html)
if not m:
raise RuntimeError("未匹配到加密分享的密码输入页面的 requesttoken")
token = m.group(1)
r2 = session.post(
"https://v2.fangcloud.cn/sharing/" + share_key,
data={"requesttoken": token, "password": pwd},
timeout=15,
)
html = r2.text
m = TYPED_ID_RE.search(html)
if not m:
raise RuntimeError("未匹配到文件id(typed_id), 分享可能是文件夹或页面结构有变化")
fid = m.group(1)
print(f"提取到 file_id = {fid}")
r3 = session.get(
DOWN_REQUEST_URL,
params={"file_id": fid, "scenario": "share", "unique_name": share_key},
timeout=15,
allow_redirects=False,
)
print(f"GET {DOWN_REQUEST_URL} -> {r3.status_code}")
if r3.status_code in (301, 302) and r3.headers.get("Location"):
return r3.headers["Location"]
data = r3.json()
if not data.get("success"):
raise RuntimeError(f"取直链失败: {data}")
return data["download_url"]
def main() -> None:
share_key = extract_share_key(SHARE_URL)
print(f"分享链接: {SHARE_URL}")
print(f"提取到的 shareKey: {share_key}\n")
session = requests.Session()
session.headers.update(HEADERS)
if not check_is_valid(share_key, session):
print("结论: 分享无效, 不再继续取直链。")
sys.exit(1)
try:
url = get_download_url(share_key, SHARE_PASSWORD, session)
print(f"\n>>> 直链: {url}")
except Exception as e:
print(f"\n取直链失败: {e}")
sys.exit(1)
if __name__ == "__main__":
main()
+3 -2
View File
@@ -1,13 +1,14 @@
{
"name": "nfd-web",
"version": "0.4.2",
"version": "0.4.6",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"dev": "vue-cli-service serve",
"build": "node scripts/sync-version.js && vue-cli-service build && node scripts/compress-vs.js",
"build:no-compress": "node scripts/sync-version.js && vue-cli-service build",
"lint": "vue-cli-service lint"
"lint": "vue-cli-service lint",
"test": "node --test src/utils/batchTreeCollect.spec.js"
},
"dependencies": {
"@element-plus/icons-vue": "^2.3.1",
+440 -144
View File
@@ -103,7 +103,23 @@
<splitpanes v-if="!isMobile" class="split-theme custom-splitpanes" style="height:100%;">
<pane>
<div class="tree-sidebar">
<div class="tree-scroll-wrap">
<div class="tree-toolbar">
<span class="tree-toolbar-title">
<i class="fas fa-sitemap" aria-hidden="true"></i> 文件树
</span>
<el-button
v-if="!batchMode"
type="warning"
size="small"
@click="toggleBatchMode"
>
<i class="fas fa-check-double"></i> 批量下载
</el-button>
<span v-else class="tree-toolbar-hint">
{{ treeExpanding ? '正在展开并收集文件…' : `勾选文件夹将自动展开(最多 ${effectiveBatchMaxDepth} 层)` }}
</span>
</div>
<div class="tree-scroll-wrap" v-loading="treeExpanding">
<el-tree
ref="fileTree"
:data="treeData"
@@ -115,6 +131,7 @@
:show-checkbox="batchMode"
:check-strictly="false"
@node-click="onNodeClick"
@check="onTreeCheck"
@check-change="onTreeCheckChange"
:default-expand-all="false"
:default-expanded-keys="['root']"
@@ -122,113 +139,114 @@
style="background:transparent;"
/>
</div>
<div v-if="batchMode" class="tree-sidebar-footer">
<span class="tree-sidebar-count">已勾选 {{ selectedFiles.length }} 个文件</span>
<div class="tree-sidebar-actions">
<el-button
type="primary"
size="small"
:disabled="selectedFiles.length === 0 || batchDownloading || batchBrowserDownloadDisabled"
:loading="batchDownloading"
@click="batchBrowserDownload"
:title="batchBrowserDownloadDisabled ? '所选文件需使用下载器下载' : ''"
>
浏览器下载
</el-button>
<el-button
type="success"
size="small"
:disabled="selectedFiles.length === 0 || batchDownloading"
:loading="batchDownloading"
@click="batchSendToDownloader"
>
发送到下载器
</el-button>
<el-button
size="small"
@click="toggleBatchMode"
>
取消
</el-button>
</div>
<div v-if="batchDownloading" class="batch-progress-info">
<el-progress :percentage="batchProgressPercent" :status="batchProgressStatus" />
<p>{{ batchProgress.current }} / {{ batchProgress.total }}
<span v-if="batchProgress.failed > 0" style="color:#f56c6c;"> ({{ batchProgress.failed }} 失败)</span>
</p>
</div>
</div>
<TreeBatchActionBar
v-if="batchMode"
class="tree-sidebar-footer"
v-bind="treeBatchBarBind"
@browser-download="batchBrowserDownload"
@send-downloader="batchSendToDownloader"
@cancel="toggleBatchMode"
/>
</div>
</pane>
<pane>
<div class="tree-content">
<div v-if="selectedNode" class="file-detail-panel">
<div class="file-detail-icon-wrap">
<i :class="getFileIcon(selectedNode)" class="file-detail-icon"></i>
</div>
<h4 class="file-detail-name">{{ selectedNode.fileName }}</h4>
<div v-if="selectedNode.fileType !== 'folder'" class="file-detail-meta">
<p>类型: {{ selectedNode.fileType === 'url' ? '超链接' : getFileTypeClass(selectedNode) }}</p>
<p v-if="selectedNode.fileType !== 'url'">大小: {{ selectedNode.sizeStr || '0B' }}</p>
<p v-if="selectedNode.fileType === 'url' && selectedNode.previewUrl" class="file-detail-link">
链接: {{ selectedNode.previewUrl }}
</p>
<p v-if="formatDate(selectedNode.createTime)">创建时间: {{ formatDate(selectedNode.createTime) }}</p>
<p v-if="formatDate(selectedNode.updateTime)">更新时间: {{ formatDate(selectedNode.updateTime) }}</p>
</div>
<div class="file-detail-actions">
<el-button
v-if="selectedNode.fileType === 'url' && selectedNode.previewUrl"
type="primary" size="small"
@click="openExternalLink(selectedNode)"
>
<i class="fas fa-external-link-alt"></i> 打开链接
</el-button>
<el-button
v-else-if="selectedNode.parserUrl || selectedNode.previewUrl"
size="small"
@click="previewFile(selectedNode)"
>
<i class="fas fa-external-link-alt"></i> 打开
</el-button>
<el-button
v-if="isDownloadableFile(selectedNode)"
type="success" size="small"
@click="handleDownload(selectedNode)"
:loading="downloadLoading"
:disabled="needsDownloader(selectedNode)"
:title="needsDownloader(selectedNode) ? '该网盘需使用下载器下载' : ''"
>
<i class="fas fa-download"></i> 下载
</el-button>
<el-button
v-if="isDownloadableFile(selectedNode)"
type="primary" size="small"
@click="sendSingleToDownloader(selectedNode)"
:loading="singleSendLoading"
>
<i class="fas fa-paper-plane"></i> 发送到下载器
</el-button>
<el-button
v-if="isDownloadableFile(selectedNode)"
size="small"
@click="copyDirectLink(selectedNode)"
:loading="copyLinkLoading"
:disabled="needsDownloader(selectedNode)"
:title="needsDownloader(selectedNode) ? '该网盘需使用下载器,无法直接复制直链' : ''"
>
<i class="fas fa-link"></i> 复制直链
</el-button>
</div>
</div>
<div v-else class="file-detail-empty">
<i class="fas fa-hand-pointer" style="font-size:32px;color:#bbb;margin-bottom:12px;"></i>
<p>请在左侧选择文件查看详情</p>
</div>
<div v-if="!batchMode" class="tree-batch-trigger">
<el-button type="warning" size="small" @click="toggleBatchMode">
<div class="tree-toolbar tree-content-toolbar">
<span class="tree-toolbar-title">
<i class="fas fa-file-alt" aria-hidden="true"></i> 详情
</span>
<el-button
v-if="!batchMode"
type="warning"
size="small"
@click="toggleBatchMode"
>
<i class="fas fa-check-double"></i> 批量下载
</el-button>
<span v-else class="tree-toolbar-hint">
{{ treeExpanding ? '正在展开并收集文件…' : `勾选左侧文件夹将自动展开(最多 ${effectiveBatchMaxDepth} 层)` }}
</span>
</div>
<div class="tree-content-body">
<div v-if="selectedNode" class="file-detail-panel">
<div class="file-detail-icon-wrap">
<i :class="getFileIcon(selectedNode)" class="file-detail-icon"></i>
</div>
<h4 class="file-detail-name">{{ selectedNode.fileName }}</h4>
<div v-if="selectedNode.fileType !== 'folder'" class="file-detail-meta">
<p>类型: {{ selectedNode.fileType === 'url' ? '超链接' : getFileTypeClass(selectedNode) }}</p>
<p v-if="selectedNode.fileType !== 'url'">大小: {{ selectedNode.sizeStr || '0B' }}</p>
<p v-if="selectedNode.fileType === 'url' && selectedNode.previewUrl" class="file-detail-link">
链接: {{ selectedNode.previewUrl }}
</p>
<p v-if="formatDate(selectedNode.createTime)">创建时间: {{ formatDate(selectedNode.createTime) }}</p>
<p v-if="formatDate(selectedNode.updateTime)">更新时间: {{ formatDate(selectedNode.updateTime) }}</p>
</div>
<div class="file-detail-actions">
<el-button
v-if="selectedNode.fileType === 'url' && selectedNode.previewUrl"
type="primary" size="small"
@click="openExternalLink(selectedNode)"
>
<i class="fas fa-external-link-alt"></i> 打开链接
</el-button>
<el-button
v-else-if="selectedNode.parserUrl || selectedNode.previewUrl"
size="small"
@click="previewFile(selectedNode)"
>
<i class="fas fa-external-link-alt"></i> 打开
</el-button>
<el-button
v-if="isDownloadableFile(selectedNode)"
type="success" size="small"
@click="handleDownload(selectedNode)"
:loading="downloadLoading"
:disabled="needsDownloader(selectedNode)"
:title="needsDownloader(selectedNode) ? '该网盘需使用下载器下载' : ''"
>
<i class="fas fa-download"></i> 下载
</el-button>
<el-button
v-if="isDownloadableFile(selectedNode)"
type="primary" size="small"
@click="sendSingleToDownloader(selectedNode)"
:loading="singleSendLoading"
>
<i class="fas fa-paper-plane"></i> 发送到下载器
</el-button>
<el-button
v-if="isDownloadableFile(selectedNode)"
size="small"
@click="copyDirectLink(selectedNode)"
:loading="copyLinkLoading"
:disabled="needsDownloader(selectedNode)"
:title="needsDownloader(selectedNode) ? '该网盘需使用下载器,无法直接复制直链' : ''"
>
<i class="fas fa-link"></i> 复制直链
</el-button>
</div>
</div>
<div v-else class="file-detail-empty">
<i class="fas fa-hand-pointer" style="font-size:32px;color:#bbb;margin-bottom:12px;"></i>
<p>请在左侧选择文件查看详情</p>
<p v-if="!batchMode" class="file-detail-empty-hint">或直接点击「批量下载」勾选多个文件</p>
</div>
</div>
<div class="tree-content-footer" :class="{ 'is-batch': batchMode }">
<template v-if="!batchMode">
<span class="tree-content-footer-hint">可直接勾选多个文件下载</span>
<el-button type="warning" size="small" @click="toggleBatchMode">
<i class="fas fa-check-double"></i> 批量下载
</el-button>
</template>
<TreeBatchActionBar
v-else
v-bind="treeBatchBarBind"
@browser-download="batchBrowserDownload"
@send-downloader="batchSendToDownloader"
@cancel="toggleBatchMode"
/>
</div>
</div>
</pane>
@@ -236,7 +254,23 @@
<!-- 移动端:上下布局 -->
<template v-else>
<div class="mobile-tree-top">
<div class="tree-scroll-wrap">
<div class="tree-toolbar">
<span class="tree-toolbar-title">
<i class="fas fa-sitemap" aria-hidden="true"></i> 文件树
</span>
<el-button
v-if="!batchMode"
type="warning"
size="small"
@click="toggleBatchMode"
>
<i class="fas fa-check-double"></i> 批量下载
</el-button>
<span v-else class="tree-toolbar-hint">
{{ treeExpanding ? '正在展开并收集文件…' : `勾选文件夹将自动展开(最多 ${effectiveBatchMaxDepth} 层)` }}
</span>
</div>
<div class="tree-scroll-wrap" v-loading="treeExpanding">
<el-tree
ref="fileTree"
:data="treeData"
@@ -248,6 +282,7 @@
:show-checkbox="batchMode"
:check-strictly="false"
@node-click="onNodeClick"
@check="onTreeCheck"
@check-change="onTreeCheckChange"
:default-expand-all="false"
:default-expanded-keys="['root']"
@@ -319,26 +354,21 @@
<div v-else class="file-detail-empty">
<i class="fas fa-hand-pointer" style="font-size:24px;color:#bbb;margin-bottom:8px;"></i>
<p>请在上方选择文件查看详情</p>
<p v-if="!batchMode" class="file-detail-empty-hint">或直接点击「批量下载」勾选多个文件</p>
</div>
<div v-if="!batchMode" class="mobile-batch-trigger">
<el-button type="warning" size="small" @click="toggleBatchMode">
<i class="fas fa-check-double"></i> 批量下载
</el-button>
</div>
<div v-if="batchMode" class="mobile-batch-footer">
<span class="tree-sidebar-count">已勾选 {{ selectedFiles.length }} 个文件</span>
<div class="tree-sidebar-actions">
<el-button type="primary" size="small" :disabled="selectedFiles.length === 0 || batchDownloading || batchBrowserDownloadDisabled" :loading="batchDownloading" @click="batchBrowserDownload" :title="batchBrowserDownloadDisabled ? '所选文件需使用下载器下载' : ''">浏览器下载</el-button>
<el-button type="success" size="small" :disabled="selectedFiles.length === 0 || batchDownloading" :loading="batchDownloading" @click="batchSendToDownloader">发送到下载器</el-button>
<el-button size="small" @click="toggleBatchMode">取消</el-button>
</div>
<div v-if="batchDownloading" class="batch-progress-info">
<el-progress :percentage="batchProgressPercent" :status="batchProgressStatus" />
<p>{{ batchProgress.current }} / {{ batchProgress.total }}
<span v-if="batchProgress.failed > 0" style="color:#f56c6c;"> ({{ batchProgress.failed }} 失败)</span>
</p>
</div>
</div>
<TreeBatchActionBar
v-if="batchMode"
class="mobile-batch-footer"
v-bind="treeBatchBarBind"
@browser-download="batchBrowserDownload"
@send-downloader="batchSendToDownloader"
@cancel="toggleBatchMode"
/>
</div>
</template>
</div>
@@ -419,11 +449,21 @@ import { Splitpanes, Pane } from 'splitpanes'
import 'splitpanes/dist/splitpanes.css'
import fileTypeUtils from '@/utils/fileTypeUtils'
import DownloadDialog from '@/components/DownloadDialog.vue'
import TreeBatchActionBar from '@/components/TreeBatchActionBar.vue'
import { testConnection, autoDetect, addDownload, batchAddDownload, getConfig, saveConfig } from '@/utils/downloaderService'
import batchTreeCollect from '@/utils/batchTreeCollect'
const {
DEFAULT_BATCH_MAX_DEPTH,
getTreeNodeId,
normalizeTreeItem,
uniqueFiles,
collectFolderFiles
} = batchTreeCollect
export default {
name: 'DirectoryTree',
components: { ElTree, Splitpanes, Pane, DownloadDialog },
components: { ElTree, Splitpanes, Pane, DownloadDialog, TreeBatchActionBar },
props: {
fileList: {
type: Array,
@@ -445,6 +485,11 @@ export default {
viewMode: {
type: String,
default: 'pane' // 'pane' or 'tree'
},
// 树批量勾选文件夹时的最大展开深度;用户勾选的文件夹为第 0 层,默认 5
batchMaxDepth: {
type: Number,
default: DEFAULT_BATCH_MAX_DEPTH
}
},
data() {
@@ -477,7 +522,8 @@ export default {
batchMode: false,
selectedFiles: [],
batchDownloading: false,
batchProgress: { current: 0, total: 0, failed: 0 }
batchProgress: { current: 0, total: 0, failed: 0 },
treeExpanding: false
}
},
computed: {
@@ -513,6 +559,23 @@ export default {
batchBrowserDownloadDisabled() {
return this.selectedFiles.length > 0
&& this.selectedFiles.every(f => this.needsDownloader(f))
},
effectiveBatchMaxDepth() {
const depth = Number(this.batchMaxDepth)
return Number.isFinite(depth) && depth >= 0 ? depth : DEFAULT_BATCH_MAX_DEPTH
},
treeBatchBarBind() {
return {
selectedCount: this.selectedFiles.length,
batchDownloading: this.batchDownloading,
treeExpanding: this.treeExpanding,
browserDisabled: this.batchBrowserDownloadDisabled,
progressPercent: this.batchProgressPercent,
progressStatus: this.batchProgressStatus,
progressCurrent: this.batchProgress.current,
progressTotal: this.batchProgress.total,
progressFailed: this.batchProgress.failed
}
}
},
watch: {
@@ -525,10 +588,7 @@ export default {
id: 'root',
fileName: '全部文件',
fileType: 'folder',
children: (newList || []).map(item => ({
...item,
isLeaf: item.fileType !== 'folder'
})),
children: (newList || []).map(item => normalizeTreeItem(item)),
isLeaf: false
}
]
@@ -536,6 +596,9 @@ export default {
}
}
},
created() {
this.resetTreeCollectState()
},
methods: {
...fileTypeUtils,
apiKeyHeaders() {
@@ -563,17 +626,14 @@ export default {
}
return this.withAuth(`${baseUrl}?${params.toString()}`)
},
// 懒加载子节点
// 懒加载子节点(批量勾选文件夹时会通过 node.expand → store.load 复用此方法)
loadNode(node, resolve) {
if (node.level === 0) {
resolve(this.treeData[0].children)
resolve((this.treeData[0]?.children || []).map(item => normalizeTreeItem(item)))
} else if (node.data.fileType === 'folder' && node.data.parserUrl) {
axios.get(this.withAuth(node.data.parserUrl), { headers: this.apiKeyHeaders() }).then(res => {
if (res.data.code === 200) {
const children = (res.data.data || []).map(item => ({
...item,
isLeaf: item.fileType !== 'folder'
}))
const children = (res.data.data || []).map(item => normalizeTreeItem(item))
resolve(children)
} else {
this.$message.error(res.data.msg || '获取子节点失败')
@@ -970,9 +1030,156 @@ export default {
this.selectedFiles = []
this.batchDownloading = false
this.batchProgress = { current: 0, total: 0, failed: 0 }
// tree 模式下清除勾选
if (this.$refs.fileTree) {
this.$refs.fileTree.setCheckedKeys([])
this.treeExpanding = false
this.resetTreeCollectState()
const tree = this.getFileTree()
if (tree) {
tree.setCheckedKeys([])
}
},
resetTreeCollectState() {
this._folderCheckQueue = []
this._queuedFolderKeys = new Set()
this._visitedInCollect = new Set()
this._folderLoadPromises = new Map()
this._treeCollecting = false
},
getFileTree() {
const ref = this.$refs.fileTree
if (!ref) return null
return Array.isArray(ref) ? ref[0] : ref
},
findTreeNode(data) {
const tree = this.getFileTree()
if (!tree || !data) return null
const key = getTreeNodeId(data)
if (key) {
const byKey = tree.getNode(key)
if (byKey) return byKey
}
const byData = tree.getNode(data)
if (byData) return byData
const nodesMap = tree.store?.nodesMap
if (nodesMap) {
return Object.values(nodesMap).find(node => getTreeNodeId(node.data) === key) || null
}
return null
},
ensureTreeNodeLoaded(node) {
if (!node) return Promise.resolve(null)
const key = getTreeNodeId(node.data)
if (key && this._folderLoadPromises.has(key)) {
return this._folderLoadPromises.get(key)
}
const promise = new Promise((resolve) => {
if (node.loaded && node.expanded) {
resolve(node)
return
}
let settled = false
const finish = () => {
if (settled) return
settled = true
resolve(node)
}
const timer = setTimeout(finish, 20000)
const expandNow = () => {
if (node.loaded && node.expanded) {
clearTimeout(timer)
finish()
return
}
try {
node.expand(() => {
clearTimeout(timer)
finish()
})
} catch (e) {
clearTimeout(timer)
finish()
}
}
if (node.loading) {
const started = Date.now()
const poll = () => {
if (!node.loading || Date.now() - started > 20000) {
expandNow()
return
}
setTimeout(poll, 50)
}
poll()
return
}
expandNow()
})
if (key) this._folderLoadPromises.set(key, promise)
return promise
},
isCheckedInInfo(data, info) {
if (!info) return false
const key = getTreeNodeId(data)
if (key && (info.checkedKeys || []).map(String).includes(key)) return true
return (info.checkedNodes || []).some(n => getTreeNodeId(n) === key)
},
syncSelectedFilesFromTree(extraFiles = []) {
const tree = this.getFileTree()
const fromTree = tree
? tree.getCheckedNodes().filter(n => this.isDownloadableFile(n))
: []
this.selectedFiles = uniqueFiles([...fromTree, ...extraFiles])
},
enqueueFolderCollect(folderData) {
const key = getTreeNodeId(folderData)
if (!key || this._queuedFolderKeys.has(key) || this._visitedInCollect.has(key)) return
this._queuedFolderKeys.add(key)
this._folderCheckQueue.push(folderData)
this.drainFolderCollectQueue()
},
async drainFolderCollectQueue() {
if (this._treeCollecting) return
this._treeCollecting = true
this.treeExpanding = true
try {
while (this._folderCheckQueue.length) {
const next = this._folderCheckQueue.shift()
this._queuedFolderKeys.delete(getTreeNodeId(next))
await this.handleFolderCheck(next)
}
} finally {
this._treeCollecting = false
this.treeExpanding = false
this._visitedInCollect.clear()
}
},
async handleFolderCheck(folderData) {
try {
const ctx = await collectFolderFiles({
folderData,
depth: 0,
maxDepth: this.effectiveBatchMaxDepth,
getNode: (data) => this.findTreeNode(data),
ensureLoaded: (node) => this.ensureTreeNodeLoaded(node),
isDownloadable: (data) => this.isDownloadableFile(data),
visitedKeys: this._visitedInCollect
})
this.syncSelectedFilesFromTree(ctx.files)
if (ctx.depthExceeded) {
this.$message.warning(
`已达到最大展开深度(${this.effectiveBatchMaxDepth} 层),部分深层文件未勾选`
)
}
} catch (e) {
console.error('批量展开文件夹失败:', e)
this.$message.error('展开文件夹失败,已跳过部分内容')
this.syncSelectedFilesFromTree()
}
},
// 用户点击复选框(不含级联),文件夹勾选时触发递归展开
onTreeCheck(data, info) {
if (!this.batchMode || !data || data.fileType !== 'folder') return
if (this.isCheckedInInfo(data, info)) {
this.enqueueFolderCollect(data)
}
},
isFileSelected(file) {
@@ -988,6 +1195,8 @@ export default {
}
},
onBatchClick(file) {
// 窗格批量:点击文件夹仍进入该目录(避免破坏现有导航)。
// 仅收集当前目录文件;递归展开只在树模式勾选文件夹时进行。
if (file.fileType === 'folder') {
this.enterFolder(file)
return
@@ -1001,9 +1210,8 @@ export default {
this.selectedFiles = []
},
onTreeCheckChange() {
if (!this.$refs.fileTree) return
const checked = this.$refs.fileTree.getCheckedNodes()
this.selectedFiles = checked.filter(n => this.isDownloadableFile(n))
if (!this.batchMode || this._treeCollecting) return
this.syncSelectedFilesFromTree()
},
extractTypeParam(file) {
if (!file.parserUrl) return null
@@ -1442,10 +1650,21 @@ html, body, #app, .main-container, .directory-tree, .content-card {
.batch-progress-info {
margin-top: 12px;
}
.tree-batch-trigger {
position: absolute;
bottom: 12px;
right: 12px;
.tree-content-footer-hint {
font-size: 12px;
color: #909399;
line-height: 1.4;
}
.dark-theme .tree-content-footer-hint {
color: #bdc3c7;
}
.file-detail-empty-hint {
margin-top: 8px;
font-size: 13px;
color: #909399;
}
.dark-theme .file-detail-empty-hint {
color: #bdc3c7;
}
.stats {
@@ -1516,8 +1735,7 @@ html, body, #app, .main-container, .directory-tree, .content-card {
}
.tree-content {
flex: 1;
padding: 16px;
overflow-y: auto;
min-height: 0;
position: relative;
}
@@ -1762,18 +1980,96 @@ html, body, #app, .main-container, .directory-tree, .content-card {
border-right: 1px solid #eaeaea;
}
.tree-toolbar {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
flex-wrap: wrap;
flex-shrink: 0;
padding: 8px 10px;
border-bottom: 1px solid #eaeaea;
background: #f8f9fa;
}
.dark-theme .tree-toolbar {
border-bottom-color: #404040;
background: #232323;
}
.tree-toolbar-title {
display: inline-flex;
align-items: center;
gap: 6px;
font-size: 13px;
font-weight: 600;
color: #303133;
}
.dark-theme .tree-toolbar-title {
color: #e1e1e1;
}
.tree-toolbar-hint {
flex: 1;
min-width: 0;
font-size: 12px;
color: #909399;
line-height: 1.4;
}
.dark-theme .tree-toolbar-hint {
color: #bdc3c7;
}
.tree-content {
width: 100%;
height: 100%;
min-height: 0;
display: flex;
flex-direction: column;
overflow: auto;
padding: 24px 16px 16px 16px;
align-items: center;
overflow: hidden;
padding: 0;
align-items: stretch;
position: relative;
}
.tree-content-toolbar {
width: 100%;
}
.tree-content-body {
flex: 1;
min-height: 0;
overflow: auto;
display: flex;
flex-direction: column;
align-items: center;
padding: 24px 16px 16px;
}
.tree-content-footer {
flex-shrink: 0;
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
flex-wrap: wrap;
padding: 10px 12px;
border-top: 1px solid #eaeaea;
background: #f8f9fa;
}
.tree-content-footer.is-batch {
display: block;
}
.dark-theme .tree-content-footer {
border-top-color: #404040;
background: #232323;
}
.file-detail-panel {
display: flex;
flex-direction: column;
@@ -0,0 +1,51 @@
<template>
<div>
<span class="tree-sidebar-count">已勾选 {{ selectedCount }} 个文件</span>
<div class="tree-sidebar-actions">
<el-button
type="primary"
size="small"
:disabled="selectedCount === 0 || batchDownloading || treeExpanding || browserDisabled"
:loading="batchDownloading"
:title="browserDisabled ? '所选文件需使用下载器下载' : ''"
@click="$emit('browser-download')"
>
浏览器下载
</el-button>
<el-button
type="success"
size="small"
:disabled="selectedCount === 0 || batchDownloading || treeExpanding"
:loading="batchDownloading"
@click="$emit('send-downloader')"
>
发送到下载器
</el-button>
<el-button size="small" @click="$emit('cancel')">取消</el-button>
</div>
<div v-if="batchDownloading" class="batch-progress-info">
<el-progress :percentage="progressPercent" :status="progressStatus" />
<p>{{ progressCurrent }} / {{ progressTotal }}
<span v-if="progressFailed > 0" style="color:#f56c6c;"> ({{ progressFailed }} 失败)</span>
</p>
</div>
</div>
</template>
<script>
export default {
name: 'TreeBatchActionBar',
props: {
selectedCount: { type: Number, default: 0 },
batchDownloading: { type: Boolean, default: false },
treeExpanding: { type: Boolean, default: false },
browserDisabled: { type: Boolean, default: false },
progressPercent: { type: Number, default: 0 },
progressStatus: { type: String, default: '' },
progressCurrent: { type: Number, default: 0 },
progressTotal: { type: Number, default: 0 },
progressFailed: { type: Number, default: 0 }
},
emits: ['browser-download', 'send-downloader', 'cancel']
}
</script>
@@ -0,0 +1,65 @@
<template>
<el-radio-group
:model-value="modelValue"
size="small"
class="view-mode-switch"
@update:model-value="$emit('update:modelValue', $event)"
>
<el-radio-button label="pane" title="窗格视图">
<i class="fas fa-th" aria-hidden="true"></i>
<span class="view-mode-text">{{ paneLabel }}</span>
</el-radio-button>
<el-radio-button label="tree" title="文件树视图">
<i class="fas fa-sitemap" aria-hidden="true"></i>
<span class="view-mode-text">{{ treeLabel }}</span>
</el-radio-button>
</el-radio-group>
</template>
<script>
export default {
name: 'ViewModeSwitch',
props: {
modelValue: {
type: String,
default: 'pane'
},
paneLabel: {
type: String,
default: '窗格'
},
treeLabel: {
type: String,
default: '文件树'
}
},
emits: ['update:modelValue']
}
</script>
<style scoped>
.view-mode-switch :deep(.el-radio-button__inner) {
display: inline-flex;
align-items: center;
justify-content: center;
gap: 6px;
min-height: 36px;
min-width: 76px;
padding: 8px 12px;
}
.view-mode-switch i {
font-size: 14px;
line-height: 1;
}
.view-mode-text {
line-height: 1;
}
@media (max-width: 480px) {
.view-mode-switch :deep(.el-radio-button__inner) {
min-width: 68px;
min-height: 40px;
padding: 10px 12px;
}
}
</style>
+6 -2
View File
@@ -246,8 +246,8 @@
storage: 'hash'
},
'123pan': {
reg: /((?:https?:\/\/)?www\.(123pan|123865|123684)\.com\/s\/[\w-]{6,})/,
host: /www\.123pan\.com/,
reg: /((?:https?:\/\/)?(?:[a-zA-Z\d-]+\.(?:m?share)\.123pan\.cn\/123pan\/[\w-]+|(?:www\.)?(?:123panpay|123pan|123\d{3})\.(?:com|cn)\/s\/[\w-]{6,}(?:\.html)?)(?:\?[^#\s]*)?)/i,
host: /(?:[a-zA-Z\d-]+\.(?:m?share)\.123pan\.cn|(?:www\.)?(?:123panpay|123pan|123\d{3})\.(?:com|cn))/i,
input: ['.ca-fot input', ".appinput .appinput"],
button: ['.ca-fot button', ".appinput button"],
name: '123云盘',
@@ -377,6 +377,7 @@
parseLink(text = '') {
let obj = {name: '', link: '', storage: '', storagePwdName: ''};
if (text) {
text = String(text).trim();
try {
text = decodeURIComponent(text);
} catch {
@@ -390,6 +391,9 @@
let matches = text.match(val.reg);
obj.name = val.name;
obj.link = matches[0];
if (obj.link && !/^https?:\/\//i.test(obj.link)) {
obj.link = 'https://' + obj.link.replace(/^\/\//, '');
}
obj.storage = val.storage;
obj.storagePwdName = val.storagePwdName || null;
if (val.replaceHost) {
+152
View File
@@ -0,0 +1,152 @@
/**
* 文件树批量勾选:按深度递归展开并收集可下载文件。
*
* Depth convention (checked folder = depth 0):
* - 用户勾选的文件夹为第 0 层。
* - 其直接子项为第 1 层。
* - 当 depth < maxDepth 时继续展开子文件夹;默认 maxDepth = 5,
* 即最多再向下展开 5 层(第 0/1/2/3/4 层会 load,第 5 层文件夹不再展开)。
* - 触及上限时若仍有未加载/剩余子文件夹,标记 depthExceeded,由 UI 提示跳过。
*/
const DEFAULT_BATCH_MAX_DEPTH = 5
function getTreeNodeId(item) {
if (!item) return ''
if (item.id) return String(item.id)
if (item.fileId) return `fid:${item.fileId}`
if (item.parserUrl) return `url:${item.parserUrl}`
return `name:${item.fileName || ''}:${item.fileType || ''}`
}
function normalizeTreeItem(item) {
if (!item || typeof item !== 'object') return item
return {
...item,
id: getTreeNodeId(item),
isLeaf: item.fileType !== 'folder'
}
}
function fileIdentity(file) {
return `${file?.parserUrl || ''}::${file?.fileName || ''}::${file?.fileId || file?.id || ''}`
}
function uniqueFiles(files) {
const seen = new Set()
const out = []
for (const file of files || []) {
const key = fileIdentity(file)
if (!key || seen.has(key)) continue
seen.add(key)
out.push(file)
}
return out
}
function isFolderNode(data) {
return !!(data && data.fileType === 'folder')
}
function collectAlreadyLoadedFiles(node, isDownloadable, ctx) {
for (const child of node.childNodes || []) {
if (isDownloadable(child.data)) {
ctx.files.push(child.data)
} else if (isFolderNode(child.data) && child.loaded) {
collectAlreadyLoadedFiles(child, isDownloadable, ctx)
}
}
}
function hasUnexploredFolders(node) {
if (!node) return false
if (isFolderNode(node.data) && !node.loaded) return true
return (node.childNodes || []).some((child) => {
if (!isFolderNode(child.data)) return false
if (!child.loaded) return true
return hasUnexploredFolders(child)
})
}
/**
* 递归展开文件夹并收集可下载文件(对接 el-tree node / loadNode)。
*
* @param {object} opts
* @param {object} opts.folderData 勾选的文件夹 data(depth 从 0 计)
* @param {number} [opts.depth=0]
* @param {number} opts.maxDepth
* @param {(data: object) => any} opts.getNode el-tree getNode
* @param {(node: any) => Promise<any>} opts.ensureLoaded 展开并触发懒加载
* @param {(data: object) => boolean} opts.isDownloadable
* @param {Set<string>} [opts.visitedKeys]
* @param {(data: object) => string} [opts.getKey]
* @param {{ files: object[], depthExceeded: boolean }} [opts.ctx]
*/
async function collectFolderFiles(opts) {
const {
folderData,
depth = 0,
maxDepth,
getNode,
ensureLoaded,
isDownloadable,
getKey = getTreeNodeId,
visitedKeys = new Set(),
ctx = { files: [], depthExceeded: false }
} = opts
if (!folderData || typeof maxDepth !== 'number') return ctx
const key = getKey(folderData)
if (key) visitedKeys.add(key)
const node = getNode(folderData)
if (!node) return ctx
if (depth >= maxDepth) {
// 未 load 的节点在真实 el-tree 中没有 childNodes,不能把预置子项算进去
if (node.loaded) {
collectAlreadyLoadedFiles(node, isDownloadable, ctx)
if (hasUnexploredFolders(node)) {
ctx.depthExceeded = true
}
} else if (isFolderNode(node.data)) {
ctx.depthExceeded = true
}
return ctx
}
try {
await ensureLoaded(node)
} catch {
// 单层加载失败:跳过该分支,不中断整次收集
return ctx
}
for (const child of node.childNodes || []) {
const data = child.data
if (!data) continue
if (isDownloadable(data)) {
ctx.files.push(data)
} else if (isFolderNode(data)) {
await collectFolderFiles({
...opts,
folderData: data,
depth: depth + 1,
visitedKeys,
ctx
})
}
}
return ctx
}
module.exports = {
DEFAULT_BATCH_MAX_DEPTH,
getTreeNodeId,
normalizeTreeItem,
fileIdentity,
uniqueFiles,
isFolderNode,
collectFolderFiles
}
@@ -0,0 +1,237 @@
const { describe, it } = require('node:test')
const assert = require('node:assert/strict')
const {
DEFAULT_BATCH_MAX_DEPTH,
getTreeNodeId,
normalizeTreeItem,
fileIdentity,
uniqueFiles,
collectFolderFiles
} = require('./batchTreeCollect.js')
function file(name, extra = {}) {
return {
fileName: name,
fileType: 'file',
parserUrl: `/v2/redirectUrl/demo/${name}`,
...extra
}
}
function folder(name, extra = {}) {
return {
fileName: name,
fileType: 'folder',
parserUrl: `/v2/getFileList?dir=${name}`,
...extra
}
}
function makeNode(data, children = [], { loaded = true, expanded = true, failLoad = false } = {}) {
const node = {
data,
loaded,
expanded,
childNodes: [],
expand(cb) {
if (failLoad) throw new Error('load failed')
this.loaded = true
this.expanded = true
if (cb) cb()
}
}
node.childNodes = children.map((child) => (child.data ? child : makeNode(child)))
return node
}
function createStore(rootNode) {
const map = new Map()
const walk = (node) => {
map.set(getTreeNodeId(node.data), node)
for (const child of node.childNodes || []) walk(child)
}
walk(rootNode)
return {
getNode(data) {
return map.get(getTreeNodeId(data)) || null
},
async ensureLoaded(node) {
if (node.loaded && node.expanded) return node
await new Promise((resolve) => node.expand(resolve))
for (const child of node.childNodes || []) {
map.set(getTreeNodeId(child.data), child)
}
return node
},
isDownloadable(data) {
return !!(data && data.parserUrl && data.fileType !== 'folder' && data.fileType !== 'url')
}
}
}
describe('batchTreeCollect helpers', () => {
it('uses checked folder as depth 0 and defaults max depth to 5', () => {
assert.equal(DEFAULT_BATCH_MAX_DEPTH, 5)
assert.equal(getTreeNodeId({ id: 'root' }), 'root')
assert.equal(normalizeTreeItem({ fileId: 'abc', fileType: 'folder' }).id, 'fid:abc')
assert.equal(normalizeTreeItem({ fileId: 'abc', fileType: 'folder' }).isLeaf, false)
})
it('deduplicates files by parserUrl + name + id', () => {
const a = file('a.txt', { fileId: '1' })
const dup = file('a.txt', { fileId: '1' })
const b = file('b.txt', { fileId: '2' })
assert.equal(fileIdentity(a), fileIdentity(dup))
assert.deepEqual(uniqueFiles([a, dup, b]).map((f) => f.fileName), ['a.txt', 'b.txt'])
})
it('collects current-level files and recurses into folders', async () => {
const leafA = file('a.txt')
const leafB = file('b.txt')
const nested = folder('nested')
const root = folder('root')
const store = createStore(makeNode(root, [
makeNode(leafA),
makeNode(nested, [makeNode(leafB)])
]))
const ctx = await collectFolderFiles({
folderData: root,
maxDepth: 4,
...store
})
assert.equal(ctx.depthExceeded, false)
assert.deepEqual(ctx.files.map((f) => f.fileName).sort(), ['a.txt', 'b.txt'])
})
it('default depth 5 expands four descendant folders then stops', async () => {
// depth 0 root → 1 d1 → 2 d2 → 3 d3 → 4 d4 → 5 d5 (cap, still has leftover folder)
const skipped = file('skipped.txt')
const capFile = file('cap.txt')
const d5 = folder('d5')
const d4 = folder('d4')
const d3 = folder('d3')
const d2 = folder('d2')
const d1 = folder('d1')
const root = folder('root')
const tree = makeNode(root, [
makeNode(d1, [
makeNode(d2, [
makeNode(d3, [
makeNode(d4, [
makeNode(d5, [
makeNode(capFile),
makeNode(folder('d6'), [makeNode(skipped)], { loaded: false, expanded: false })
], { loaded: true })
])
])
])
])
])
const store = createStore(tree)
const loadedIds = []
const ctx = await collectFolderFiles({
folderData: root,
maxDepth: DEFAULT_BATCH_MAX_DEPTH,
getNode: store.getNode,
ensureLoaded: async (node) => {
loadedIds.push(node.data.fileName)
return store.ensureLoaded(node)
},
isDownloadable: store.isDownloadable
})
assert.equal(ctx.depthExceeded, true)
assert.deepEqual(ctx.files.map((f) => f.fileName), ['cap.txt'])
assert.ok(!ctx.files.some((f) => f.fileName === 'skipped.txt'))
assert.ok(loadedIds.includes('d4'))
assert.ok(!loadedIds.includes('d5'))
})
it('stops expanding at maxDepth and warns when remaining folders exist', async () => {
// depth 0: root
// depth 1: d1
// depth 2: d2
// depth 3: d3
// depth 4: d4 (cap when maxDepth=4) — still has child folder d5
const deepFile = file('deep.txt')
const skipped = file('skipped.txt')
const d5 = folder('d5')
const d4 = folder('d4')
const d3 = folder('d3')
const d2 = folder('d2')
const d1 = folder('d1')
const root = folder('root')
const d5Node = makeNode(d5, [makeNode(skipped)], { loaded: false, expanded: false })
const d4Node = makeNode(d4, [makeNode(deepFile), d5Node], { loaded: true })
const tree = makeNode(root, [
makeNode(d1, [
makeNode(d2, [
makeNode(d3, [d4Node])
])
])
])
const store = createStore(tree)
let loadedIds = []
const ctx = await collectFolderFiles({
folderData: root,
maxDepth: 4,
getNode: store.getNode,
ensureLoaded: async (node) => {
loadedIds.push(node.data.fileName)
return store.ensureLoaded(node)
},
isDownloadable: store.isDownloadable
})
assert.equal(ctx.depthExceeded, true)
assert.deepEqual(ctx.files.map((f) => f.fileName), ['deep.txt'])
assert.ok(!ctx.files.some((f) => f.fileName === 'skipped.txt'))
assert.ok(!loadedIds.includes('d4'), 'depth-4 folder must not be expanded')
assert.ok(loadedIds.includes('root'))
assert.ok(loadedIds.includes('d3'))
})
it('collects already-loaded files at the depth cap without expanding further', async () => {
const capFile = file('cap.txt')
const inner = folder('inner')
const cap = folder('cap')
const root = folder('root')
const tree = makeNode(root, [
makeNode(cap, [
makeNode(capFile),
makeNode(inner, [makeNode(file('too-deep.txt'))], { loaded: false })
])
])
const store = createStore(tree)
const ctx = await collectFolderFiles({
folderData: root,
maxDepth: 1,
...store
})
assert.equal(ctx.depthExceeded, true)
assert.deepEqual(ctx.files.map((f) => f.fileName), ['cap.txt'])
})
it('skips a branch when ensureLoaded throws', async () => {
const ok = file('ok.txt')
const badFolder = folder('bad')
const root = folder('root')
const badNode = makeNode(badFolder, [makeNode(file('lost.txt'))], { loaded: false, failLoad: true })
const tree = makeNode(root, [makeNode(ok), badNode])
const store = createStore(tree)
const ctx = await collectFolderFiles({
folderData: root,
maxDepth: 4,
getNode: store.getNode,
ensureLoaded: async (node) => {
if (node.data.fileName === 'bad') throw new Error('network')
return store.ensureLoaded(node)
},
isDownloadable: store.isDownloadable
})
assert.deepEqual(ctx.files.map((f) => f.fileName), ['ok.txt'])
})
})
+22 -10
View File
@@ -90,7 +90,7 @@
<!-- 开关按钮,控制是否自动读取剪切板 -->
<el-switch v-model="autoReadClipboard" active-text="自动识别剪切板"></el-switch>
<el-input placeholder="请粘贴分享链接(http://或https://)" v-model="link" id="url" @paste="onPaste">
<el-input placeholder="请粘贴分享链接(http://或https://)" v-model="link" id="url" @paste="onPaste" @blur="normalizeShortcutInput">
<template #prepend>分享链接</template>
<template #append v-if="!autoReadClipboard">
<el-button @click="getPaste(true)">读取剪切板</el-button>
@@ -417,10 +417,7 @@
<!-- 目录树组件 -->
<div v-if="showDirectoryTree" class="directory-tree-container">
<div style="margin-bottom: 10px; text-align: right;">
<el-radio-group v-model="directoryViewMode" size="small">
<el-radio-button label="pane">窗格</el-radio-button>
<el-radio-button label="tree">文件树</el-radio-button>
</el-radio-group>
<ViewModeSwitch v-model="directoryViewMode" pane-label="窗格" tree-label="文件树" />
</div>
<DirectoryTree
:file-list="directoryData"
@@ -619,6 +616,7 @@ import axios from 'axios'
import QRCode from 'qrcode'
import DarkMode from '@/components/DarkMode'
import DirectoryTree from '@/components/DirectoryTree'
import ViewModeSwitch from '@/components/ViewModeSwitch'
import DownloadDialog from '@/components/DownloadDialog'
import parserUrl from '../parserUrl1'
import fileTypeUtils from '@/utils/fileTypeUtils'
@@ -629,7 +627,7 @@ import { PREVIEW_BASE_URL } from '@/utils/constants'
export default {
name: 'Home',
components: { DarkMode, DirectoryTree, DownloadDialog },
components: { DarkMode, DirectoryTree, ViewModeSwitch, DownloadDialog },
mixins: [fileTypeUtils],
data() {
return {
@@ -1143,10 +1141,24 @@ export default {
normalizeShortcutInput() {
if (!this.link) return
const trimmed = this.link.trim()
if (!trimmed) return
if (!trimmed) {
this.link = ''
return
}
this.link = trimmed
// 已经是直接链接,跳过
if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) return
// 已经是直接链接:仍尝试从整段文本中抽出标准分享地址
if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) {
const linkInfo = parserUrl.parseLink(trimmed)
if (linkInfo.link) {
this.link = linkInfo.link
const pwd = parserUrl.parsePwd(trimmed)
if (!this.password && pwd) {
this.password = pwd
}
}
return
}
// 尝试短格式
const shortInfo = this.expandShortFormat(trimmed)
@@ -1420,7 +1432,7 @@ export default {
// 获取剪切板内容
async getPaste(isManual = false) {
try {
const text = await navigator.clipboard.readText()
const text = (await navigator.clipboard.readText() || '').trim()
const shortInfo = this.expandShortFormat(text)
if (shortInfo) {
+8 -5
View File
@@ -8,10 +8,12 @@
</div>
<div style="text-align:right;margin-bottom:12px;">
<DarkMode @theme-change="toggleTheme" style="float: left;"/>
<el-radio-group v-model="viewMode" size="small" style="margin-left:20px;">
<el-radio-button label="pane">窗格</el-radio-button>
<el-radio-button label="tree">目录树</el-radio-button>
</el-radio-group>
<ViewModeSwitch
v-model="viewMode"
pane-label="窗格"
tree-label="目录树"
style="margin-left:20px;"
/>
</div>
<div v-if="loading" style="text-align:center;margin-top:40px;">加载中...</div>
<div v-else-if="error" style="color:red;text-align:center;margin-top:40px;">{{ error }}</div>
@@ -29,11 +31,12 @@
<script>
import axios from 'axios'
import DirectoryTree from '@/components/DirectoryTree'
import ViewModeSwitch from '@/components/ViewModeSwitch'
import DarkMode from '@/components/DarkMode'
export default {
name: 'ShowList',
components: { DirectoryTree, DarkMode },
components: { DirectoryTree, ViewModeSwitch, DarkMode },
data() {
return {
loading: true,
+12 -1
View File
@@ -30,6 +30,16 @@
<groupId>cn.qaiu</groupId>
<artifactId>parser</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@@ -81,7 +91,8 @@
${project.basedir}/src/main/generated
</generatedSourcesDirectory>
<compilerArgs>
<arg>-AoutputDirectory=${project.basedir}/src/main -Xlint:unchecked</arg>
<arg>-AoutputDirectory=${project.basedir}/src/main</arg>
<arg>-Xlint:unchecked</arg>
</compilerArgs>
</configuration>
</plugin>
@@ -463,11 +463,14 @@ public class ParserApi {
// 获取版本号
@RouteMapping("/build-version")
public String getVersion() {
return CommonUtil.getAppVersion()
String version = CommonUtil.getAppVersion();
if (version == null || version.isBlank()) {
return "unknown";
}
return version
.replace("-", "")
.replace("Z", "")
.replace("T", "_")
.replace("-", "")
.replace(":", "");
}