Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

feat(media): 接入光鸭云盘只读挂载来源

longmeidaoa1b9030e9107
diff --git a/frontend/src/application/chrome.js b/frontend/src/application/chrome.js
index 40483b090..f5832063d 100644
--- a/frontend/src/application/chrome.js
+++ b/frontend/src/application/chrome.js
@@ -73,7 +73,7 @@ api('/api/libraries',{signal:effects.signal}).then(data=>{
if(!choices.some(row=>row[0]===selected)){sessionStorage.removeItem('peach.library');location.reload();return}
const current=sessionStorage.getItem('peach.library')||'';
boardBrand.querySelector('h1').textContent=current||'全部媒体库';
- const libraryMark=glyph=>MEDIA_SOURCE_ICONS[glyph]?.startsWith('data:')?`<img src="${MEDIA_SOURCE_ICONS[glyph]}" alt="">`:icon(glyph==='local'?'hard-drive':glyph);
+ const libraryMark=glyph=>MEDIA_SOURCE_ICONS[glyph]?.startsWith('data:')?`<img src="${MEDIA_SOURCE_ICONS[glyph]}" alt="">`:icon(MEDIA_SOURCE_ICONS[glyph]||glyph);
const mark=document.createElement('span');mark.className='mark';mark.setAttribute('aria-hidden','true');
mark.innerHTML=libraryMark(choices.find(row=>row[0]===current)?.[2]||'database');boardBrand.querySelector('.mark').replaceWith(mark);
libraryPicker.innerHTML=`<p>媒体库</p><div class="board-library-rows">${choices.map(([id,name,glyph])=>`<button type="button" data-library="${esc(id)}" aria-pressed="${id===current}"><span class="board-library-avatar">${libraryMark(glyph)}</span><span>${esc(name)}</span></button>`).join('')}</div><footer><button type="button" class="geist-button primary" data-library-manage>管理媒体库</button></footer>`;
diff --git a/frontend/src/application/preferences.js b/frontend/src/application/preferences.js
index 87b044875..706a904b2 100644
--- a/frontend/src/application/preferences.js
+++ b/frontend/src/application/preferences.js
@@ -50,8 +50,9 @@ export function replaceCatalogAddress(){
export function sidebarDot(loc){
if(loc==='local')return {kind:'glyph',name:'hard-drive'};
if(loc==='online')return {kind:'glyph',name:'rss'};
+ if(loc==='guangya')return {kind:'glyph',name:MEDIA_SOURCE_ICONS.guangya};
if(preferencesState.SRCICON[loc]&&MEDIA_SOURCE_ICONS[loc])return {kind:'image',src:MEDIA_SOURCE_ICONS[loc]};
- // 计费的两家(PikPak、在线)上面都有自己的记号,走到这里的都不计费。
+ // 已登记的计费来源使用自己的标识。
return {kind:'cost',cost:'free'};
}
@@ -197,6 +198,7 @@ preferencesState.SRCICON = {
local:icon('hard-drive'),
'115':`<img class="source-icon" src="${MEDIA_SOURCE_ICONS['115']}" alt="">`,
pikpak:`<img class="source-icon" src="${MEDIA_SOURCE_ICONS.pikpak}" alt="">`,
+ guangya:icon(MEDIA_SOURCE_ICONS.guangya),
online:icon('rss'),
};
preferencesState.srcBadge = (loc,cost,cls)=>{const label=`${LOC[loc]||loc}${cost==='metered'?' · 计费':''}`;
diff --git a/frontend/src/core/index.ts b/frontend/src/core/index.ts
index ce26c3de9..542f7aa97 100644
--- a/frontend/src/core/index.ts
+++ b/frontend/src/core/index.ts
@@ -214,7 +214,7 @@ const clipGraphemes=(value:unknown,max:number)=>{
return parts.length>max?`${parts.slice(0,Math.max(0,max-1)).join('')}…`:parts.join('');
};
/** 来源代号到界面名称:`local`→`本地`、`115`→`115`、`pikpak`→`PikPak`、`online`→`在线`。 */
-const LOC:Record<string,string>={local:'本地','115':'115',pikpak:'PikPak',online:'在线'};
+const LOC:Record<string,string>={local:'本地','115':'115',pikpak:'PikPak',guangya:'光鸭云盘',online:'在线'};
/* 种子随机:FNV-1a 把「种子 + 键」压成一个 32 位数当排序键。同一个种子下顺序稳定,
换种子就是另一套顺序,客户端不必存 PRNG 状态,也不必让后端多带一个参数。首页的
抽样和关注页岛的两排共用这一份,同一粒种子两边取到的是同一批。 */
diff --git a/frontend/src/react/data-cleanup/resource-sync.ts b/frontend/src/react/data-cleanup/resource-sync.ts
index de4624a90..febdea6de 100644
--- a/frontend/src/react/data-cleanup/resource-sync.ts
+++ b/frontend/src/react/data-cleanup/resource-sync.ts
@@ -105,7 +105,7 @@ export const hasChanges = (scan: ResourceScanState | undefined) =>
/** 来源代号在这一块里的名字。认不出的来源统称「媒体来源」。 */
export const SOURCE_LABELS: Record<string, string> = {
- local: '本地磁盘', '115': '115', pikpak: 'PikPak',
+ local: '本地磁盘', '115': '115', pikpak: 'PikPak', guangya: '光鸭云盘',
};
const count = (value: number | undefined) => Number(value || 0).toLocaleString();
diff --git a/frontend/src/react/media-sources.ts b/frontend/src/react/media-sources.ts
index 7a714b649..9a9c40629 100644
--- a/frontend/src/react/media-sources.ts
+++ b/frontend/src/react/media-sources.ts
@@ -14,13 +14,13 @@ export async function prefetchMediaSources(signal: AbortSignal): Promise<void> {
await queryClient.fetchQuery({ queryKey: MEDIA_SOURCES_KEY, queryFn: () => fetchMediaSources(signal) });
}
-/** 落盘的三种存储来源。`online` 这类在线来源不落盘,不参与扫描与对账。 */
-export const SCANNABLE_LOCATIONS = ['local', '115', 'pikpak'];
+/** 挂载存储来源。`online` 这类在线来源不落盘,不参与扫描与对账。 */
+export const SCANNABLE_LOCATIONS = ['local', '115', 'pikpak', 'guangya'];
export const scannableSources = (data: MediaSourcesData | undefined): MediaSourceStatus[] =>
(data?.sources ?? []).filter((source) => SCANNABLE_LOCATIONS.includes(source.location));
/** 配了根目录的网盘。离线的网盘仍然属于已配置来源:它上面的重复副本照样能挑着留。 */
export const cloudLocations = (data: MediaSourcesData | undefined): string[] =>
- (data?.sources ?? []).filter((source) => ['115', 'pikpak'].includes(source.location)
+ (data?.sources ?? []).filter((source) => ['115', 'pikpak', 'guangya'].includes(source.location)
&& (source.roots === undefined || source.roots.length > 0)).map((source) => source.location);
diff --git a/frontend/src/react/settings/clouddrive-guide.tsx b/frontend/src/react/settings/clouddrive-guide.tsx
index 150ced328..4dd8d80b2 100644
--- a/frontend/src/react/settings/clouddrive-guide.tsx
+++ b/frontend/src/react/settings/clouddrive-guide.tsx
@@ -21,6 +21,7 @@ export function CloudDriveGuide() {
<ExternalLink href="https://www.clouddrive2.com/help.html">挂载帮助</ExternalLink>
</Help>
<Help>缓存按所在硬盘和可用内存选起步值,再根据播放表现调整。</Help>
+ <Help>光鸭云盘需要 CloudDrive2 v1.0.11 或更高版本,文件管理请使用光鸭云盘客户端。</Help>
{/* 三档同形、跨档比较:窄处每档一块纵排,宽处三项读数排成三列对齐。 */}
<ul aria-label="按缓存所在硬盘分档" className="flex flex-col gap-2">
{CLOUDDRIVE_PROFILES.map((profile) => (
diff --git a/frontend/src/react/settings/folder-rows.tsx b/frontend/src/react/settings/folder-rows.tsx
index 87f571d8a..fdb2cfb4b 100644
--- a/frontend/src/react/settings/folder-rows.tsx
+++ b/frontend/src/react/settings/folder-rows.tsx
@@ -31,10 +31,11 @@ export type SourceOption = readonly [kind: string, name: string];
export const MEDIA_SOURCES: readonly SourceOption[] = [
['local', '本地磁盘'], ['115', 'CloudDrive · 115'], ['pikpak', 'CloudDrive · PikPak'],
+ ['guangya', 'CloudDrive · 光鸭云盘(只读)'],
];
export const sourceMark = (location: string) => MEDIA_SOURCE_ICONS[location] || 'database';
-export const isCloudSource = (location: string) => location === '115' || location === 'pikpak';
+export const isCloudSource = (location: string) => ['115', 'pikpak', 'guangya'].includes(location);
export interface FolderRowValue { path: string; location: string }
diff --git a/frontend/src/ui-kit/media-source-icons.ts b/frontend/src/ui-kit/media-source-icons.ts
index 8aa887c1d..03df40f24 100644
--- a/frontend/src/ui-kit/media-source-icons.ts
+++ b/frontend/src/ui-kit/media-source-icons.ts
@@ -1,2 +1,2 @@
/* 官方站点图标,来源与摘要见 docs/reference-snapshots/media-source-icons.md。 */
-export const MEDIA_SOURCE_ICONS: Readonly<Record<string, string>> = {"local": "hard-drive", "115": "data:image/png;base64,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", "pikpak": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACY0lEQVR4nNWXy2tTQRSHv7m5RUWttqlNW1OairhKNbrU+lhE/AOkdCOIIO7arty0QhSxCIIQ7VJwIfgfCIJdFB+rgC32AVIflD5CbFUsoohJRiZzb5Ne05p4kxv94HCTc+bO+c0MM3eOoICD/TJswAAQBdoBH5UhA8wDo1mIv7ojpuyAsH9EBuQgkmuASXVJI4lN3BXDawIifXIQwQ28RDA0ERfDwpr2cQ9G7iSdhcOGteZeJ1eYKreB5DS1I2oiCJba2hDQVA9tjdDaCHMfICuhMwDJz5D8BMtftK9E2s2NttrJMOxvzSdT1rIb6goW69KIXsjr5/K+nxlIWWKWrOebJIxNFhXgK7r20QjcPL+59PllGH8LarDvU3oWFHU+CDZpK+TKA3j88vd+zGKd93av/y8lrKxao7Ls6bROrrj6EE6E9WzZppZKrJ0y0Hu8RAGhZuhohqk5nShp2Y/0+nZqxPaoFQsr2my2mNDSkBe01w/7AvAu9QcB/nrYs0vboU4qSsNOwCHAoMYY/5WAsckNt1NJ8WKY5TS+fF8/E7f/Lu5aQDrjLu5agOlzF3ct4NYFd3HXAk51uYv/k9vQLPeFr9/h4gh0dcCBNu17vaiP7nt9sGNblQVs3wo9x+DZNCRm9aUyFICebh0rF9PpWP22+QvqC3f2qLZyKda34XTMLsGLGSrO8xndtxMR6ZfqQ+tz7uczRyDor0zyxY/6LlDkoMqYVsUSKvSqho8SVB/JglqCUWqF4ImharVcueQ96j4bN3KFoiDmeXpJTOXO7QJVoyEZ8mgm0rm6sLA4talFef4LaurBZfZxNPMAAAAASUVORK5CYII="};
+export const MEDIA_SOURCE_ICONS: Readonly<Record<string, string>> = {"local": "hard-drive", "guangya": "database", "115": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAHB0lEQVR4nO2bbUwURxjH/zN38qIcb4JWoIoHFYumWhDbRquNiSlYC4ZGjVYrotHWD1VTLdY00X7zbA22Na21KWqsUMHYSiygJjaRQDW+VK2YioBarVZBQA9QDm6nedajCuxxHrfH7dX+kiXcvszM8+zO7DPP/JfBzcQmfx4O1jpJEmKUgBTHwUYIIAyAwbYRZtoYUCdBVDLwi5yxCgjfo1Uly2vd2T7mjkJj3vgsUVitcwWkqQxstAv1CAFxnoEfZjpdbvXPq05p1gFxqSZDexuWCIhMCMTDHTBcYGA5+n7YdrEwy6xOkS4yJi07uMliWSGEeB9ACPqGBsbYFwE+PpvP7l/Z6BEHCCFYzDRTBgATBMLhCRhofMiqLsrawRgTvSuiFxinbxjK2pErgAnQAAwoE3rMrTmw5s9eXOscxpSNE5iQ9glgEDQEA24LxtNrij8sc+Y67szJscmmTAjpiNaMJ+Q2CemI3Ea1n4CZM/N1p5pqPoXASngDDNmJAcbVBQWzrI5PfRLjzTX7AKTCuyhMNBjTHTmBOypFvvPeZzyRamt775+A2GRTpgTxHbwYDraoqiQrx2kHGFM2TqBBBYAPvBsLGJ9i7+3AenjPn9DiaN/rV6QeSUpxgl4pwotNMeWqbXw/PceYuAiEBvk7dZ2/Xz8MCQvE2JERGB4ZgteXOt8jyRY5cBPi1a4Ro77rybbwVtUIzzDAF7mmOYiPGexSOZt2Hu31tRS12mzbbvctMCYtO1iO7VVmUXqSy8bX323Bjp9OutoUk81GZQc0WSwr1J7YBAb4IiNtnMvlbCs4jpYHba4VIhAu26jkgLhUk8E2pVWVRenj5S7QWyxtVhQcOoecH0+o0h6ykWztNga0t2GJ2vP5oAA/ZKQldtv/1Q+/Yv8vFWg0P3BYhrm5Fa2WdjWbFWKzdVMnB8iZHJVZ/NZ4BPTvfPfzis64NJipgc1W2QG8I4endhor2OCHd1ITOu27/6AN2btK4XEE4mWbYXMAJTD74u5/f+A07jS2QAt02MzlH5Cmqn/3u/d9vV6HyeOM8nFP02Ezo7y9hPu31MwQr86YjHdnv9zjOTXX7+D4uWsoKv0D5WeuwgMIDv/Belq0gFDP+JBAf8zv0veVMEYNlLc508bir1t3sffw78g/eA5/16mS7X4SGNnOacVG7b4/wN+5CWTk4CAsnzcRh79djPlvOnaeWkhCjOK0XKVmoXWNzdhTchalpy7Ld9YZ+vv5YP2yqfK8YfDAALgbASmOxSRvoGmv67GqHcJCBuDFkRHybC5pdBQSno8EY457XPW1O5i9ajca7t13V9Oo359kxuQNlwFEo494JsyAGVNGYeGMcbJzeuLcxZt4e02e63MA+1yh1+C/cXFfQIPc1vxjmJSxFZt3lcJqleye+0LcEKyYP9GdzTH0uQM6oPj+y9xyzM3Kw83ae3bPmzc9ARGDAt3qAI9ysuI6Zn2wG7X1TYrHfX30WDb7FbfVz23iBI9yo/YeFq/bK88VlJicZHRX1WZNOIA4X3ULuw6cVjwWER6I6Ai3rLybOclSoBFy9p2wO/ePHTpQ9foYUMdJkwONUNvQjIuXlSVBOp36w5UEUclJkAQNcdPOXIDTs6oyjMRYshpLQ1gl5big5nq96nVxxio4SdEeps21QVx0uGJesPKK6mo5QbZz0uGRFA0agMLk4ZGh3faX/XaF9HKqQjZXlSyvlUcW0uFBA9BUWKmvUxZZbTps5vIPnS4XHoZecwsU0mgHyypRUU0JK3XpsJnTH1mByXABHoKySFvWzpAXQrtOiT/aXKx+hQwXOlSn/NE+ZldE4E6GDQlGwaZ5eG4YyYcfcbu+CRkf5+Nuk+PFE2d53Fbe8Q/JT0mBiT6CJjlLZ76Eoq8zMTyq88B36WodFqzdgxu37c8SXaDBZqtMpxEnJsW0XgixDm6CNAKUGaLU+OzkMQgN6t/peLtVwjf5x7Alr1xeE3QHjLFPqouz1ivqAwJ8fDabLa3LXF0hHjEsDBMSoqHjHH4+egwM7g9jVCgS46O69XOC0l6Hyiuxs/CU3VBYFRhqycbOu7pgTNmwEAI5aiyMvjbeiEkJRhifDUXkoCB5qbyt3YrmFguu3mxE5dVaHCq7hPIzV2CV+iAWY8isKV6zvUcHiIcSmVKt6IDV1BNXFWd1k8jwbicyJkh4TMIi/EewiaTmKinKudIFpKYi4bEsMfN+LLKI2o6SnNu7inR1HOw9eDlkQ08Kct7TxbLCkiEb3gpDdk8qUcJhmoVU1yQ8hvdRaGs7XHJAQcEsK6muvepJILn8EyjFCafyTDbx9Nca1g9bqM87euwfhzlbw1P9yQxBFZDwmAILaATbR1NJzhpP/P/ZHFzkqf1wsitP7aezSjyVH0/DDlr/fP4fOwTeE5lpP+gAAAAASUVORK5CYII=", "pikpak": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACY0lEQVR4nNWXy2tTQRSHv7m5RUWttqlNW1OairhKNbrU+lhE/AOkdCOIIO7arty0QhSxCIIQ7VJwIfgfCIJdFB+rgC32AVIflD5CbFUsoohJRiZzb5Ne05p4kxv94HCTc+bO+c0MM3eOoICD/TJswAAQBdoBH5UhA8wDo1mIv7ojpuyAsH9EBuQgkmuASXVJI4lN3BXDawIifXIQwQ28RDA0ERfDwpr2cQ9G7iSdhcOGteZeJ1eYKreB5DS1I2oiCJba2hDQVA9tjdDaCHMfICuhMwDJz5D8BMtftK9E2s2NttrJMOxvzSdT1rIb6goW69KIXsjr5/K+nxlIWWKWrOebJIxNFhXgK7r20QjcPL+59PllGH8LarDvU3oWFHU+CDZpK+TKA3j88vd+zGKd93av/y8lrKxao7Ls6bROrrj6EE6E9WzZppZKrJ0y0Hu8RAGhZuhohqk5nShp2Y/0+nZqxPaoFQsr2my2mNDSkBe01w/7AvAu9QcB/nrYs0vboU4qSsNOwCHAoMYY/5WAsckNt1NJ8WKY5TS+fF8/E7f/Lu5aQDrjLu5agOlzF3ct4NYFd3HXAk51uYv/k9vQLPeFr9/h4gh0dcCBNu17vaiP7nt9sGNblQVs3wo9x+DZNCRm9aUyFICebh0rF9PpWP22+QvqC3f2qLZyKda34XTMLsGLGSrO8xndtxMR6ZfqQ+tz7uczRyDor0zyxY/6LlDkoMqYVsUSKvSqho8SVB/JglqCUWqF4ImharVcueQ96j4bN3KFoiDmeXpJTOXO7QJVoyEZ8mgm0rm6sLA4talFef4LaurBZfZxNPMAAAAASUVORK5CYII="};
diff --git a/frontend/test/react/media-settings.test.tsx b/frontend/test/react/media-settings.test.tsx
index eeb41ec78..fb4192777 100644
--- a/frontend/test/react/media-settings.test.tsx
+++ b/frontend/test/react/media-settings.test.tsx
@@ -46,6 +46,22 @@ it('不能编辑时只说原因,不画表单', async () => {
});
describe('媒体文件夹', () => {
+ it('光鸭来源回填只读名称、挂载帮助和现有图标,保存带上来源', async () => {
+ const fetcher = fetchMock(200, { saved: true, url: '/', revision: 'rev-2' });
+ vi.stubGlobal('fetch', fetcher);
+ const host = await open({ windows: true, media_sources: [
+ { location: 'guangya', root: 'G:\\Movies', path: 'G:\\Movies', online: true },
+ ] });
+ expect(paths(host)[0]?.value).toBe('G:\\Movies');
+ expect(host.textContent).toContain('CloudDrive · 光鸭云盘(只读)');
+ expect(host.querySelector('use[href="#i-database"]')).not.toBeNull();
+ expect(host.textContent).toContain('光鸭云盘需要 CloudDrive2 v1.0.11');
+ await submit(host.querySelector('form'));
+ expect(sentBody(fetcher).media_sources).toEqual([
+ { location: 'guangya', root: 'G:\\Movies', path: 'G:\\Movies', library: '', library_icon: '' },
+ ]);
+ });
+
it('Windows 只填本机路径,选了网盘才出 CloudDrive 帮助', async () => {
const host = await open({ windows: true, media_sources: [{ location: 'local', root: 'D:/', path: 'D:/' }] });
expect(host.textContent).not.toContain('Windows 中的对应路径');
diff --git a/scripts/identify_resources.py b/scripts/identify_resources.py
index 68a14ea4f..ec915e174 100644
--- a/scripts/identify_resources.py
+++ b/scripts/identify_resources.py
@@ -24,6 +24,7 @@ if str(SRC_DIR) not in sys.path:
sys.path.insert(0, str(SRC_DIR))
from peach.config import DATABASE_PATH, GENERATED_DIR
+from peach.media_sources import SCANNABLE_LOCATIONS
from peach.resource_identification import (
CANDIDATE_FILENAME,
build_worklist,
@@ -45,7 +46,7 @@ def build_parser() -> argparse.ArgumentParser:
sub = parser.add_subparsers(dest="command", required=True)
worklist = sub.add_parser("worklist", help="生成联网识别清单")
- worklist.add_argument("--location", action="append", choices=("local", "115", "pikpak"))
+ worklist.add_argument("--location", action="append", choices=SCANNABLE_LOCATIONS)
worklist.add_argument("--root", help="账本口径的目录前缀,例如 B:\\xxr\\0208 (23)")
worklist.add_argument("--paired-only", action="store_true", help="只列有同目录配套图片的")
worklist.add_argument("--sparse-only", action="store_true",
@@ -65,7 +66,7 @@ def cmd_worklist(args: argparse.Namespace) -> int:
try:
rows = build_worklist(
connection,
- locations=tuple(args.location or ("local", "115", "pikpak")),
+ locations=tuple(args.location or SCANNABLE_LOCATIONS),
prefix=args.root, paired_only=args.paired_only,
sparse_only=args.sparse_only, limit=args.limit,
)
diff --git a/scripts/job_status.py b/scripts/job_status.py
index ecb08f938..d6cf24485 100644
--- a/scripts/job_status.py
+++ b/scripts/job_status.py
@@ -34,6 +34,7 @@ if str(SRC_DIR) not in sys.path:
sys.path.insert(0, str(SRC_DIR))
from peach.config import DATABASE_PATH, GENERATED_DIR, STATE_DIR
+from peach.media_sources import SCANNABLE_LOCATIONS
from peach.review_csv import read_rows
# 两个路径都从 peach.config 推出来:2026 年上半年数据根从 `R:\peach-data` 搬到内置盘,
@@ -100,7 +101,7 @@ def collect(db_path: Path, generated: Path, state_path: Path | None = None) -> l
# 矛盾,其实一个是可执行量、一个是原始量,都对。
# 没有时长就算不出 seek 点,抽帧脚本处理不了,那些要先补 probe。
lines.append("- 待抽帧(可抽 / 缺时长待 probe / 合计):")
- for loc in ("local", "115", "pikpak"):
+ for loc in SCANNABLE_LOCATIONS:
ready = one("SELECT count(*) FROM asset WHERE medium='video' AND location=? "
"AND (snapshot_path IS NULL OR snapshot_path='') AND duration>0", loc)
blocked = one("SELECT count(*) FROM asset WHERE medium='video' AND location=? "
diff --git a/src/peach/media_configuration.py b/src/peach/media_configuration.py
index d802c2d40..0cbf2a0e1 100644
--- a/src/peach/media_configuration.py
+++ b/src/peach/media_configuration.py
@@ -9,7 +9,7 @@ from typing import Any
from . import platform
SOURCE_OPTIONS = (("local", "本地磁盘"), ("115", "CloudDrive · 115"),
- ("pikpak", "CloudDrive · PikPak"))
+ ("pikpak", "CloudDrive · PikPak"), ("guangya", "CloudDrive · 光鸭云盘(只读)"))
def _windows_installed_names() -> list[str]:
@@ -79,7 +79,7 @@ def validate(raws: object, *, windows: bool) -> tuple[dict, dict, list[str]]:
raise ValueError("媒体来源格式不正确")
location = row.get("location")
if not isinstance(location, str) or location not in dict(SOURCE_OPTIONS):
- raise ValueError("请选择本地磁盘、115 或 PikPak")
+ raise ValueError("请选择本地磁盘、115、PikPak 或光鸭云盘")
text = str(row.get("path", "")).strip()
root = text if windows else str(row.get("root", "")).strip()
if any(ord(char) < 32 for char in text + root):
diff --git a/src/peach/media_sources.py b/src/peach/media_sources.py
new file mode 100644
index 000000000..d59f0b9ac
--- /dev/null
+++ b/src/peach/media_sources.py
@@ -0,0 +1,11 @@
+"""挂载来源的读取与文件写入能力。"""
+
+SCANNABLE_LOCATIONS = ("local", "115", "pikpak", "guangya")
+CLOUD_LOCATIONS = frozenset({"115", "pikpak", "guangya"})
+READ_ONLY_LOCATIONS = frozenset({"guangya"})
+
+
+def require_writable_location(location: str | None) -> None:
+ """只读挂载在任何文件系统写入之前拒绝。"""
+ if location in READ_ONLY_LOCATIONS:
+ raise ValueError("光鸭云盘为只读来源,请在光鸭云盘客户端管理文件")
diff --git a/src/peach/organize.py b/src/peach/organize.py
index 1d4c6f8c7..08be4d22d 100644
--- a/src/peach/organize.py
+++ b/src/peach/organize.py
@@ -23,6 +23,7 @@ from pathlib import Path
from .catalog_rules import is_jav_code, is_uncensored_release, normalise_code_key, part_marker
from .jobs import ACTIVE_ASSET_SQL
+from .media_sources import require_writable_location
from .organize_templates import MAX_PATH, TemplateError, render, validate_template
from .platform import (is_windows_path, location_mounts, location_roots, resolve_root, root_online,
translate_ledger_path, within_root)
@@ -64,6 +65,7 @@ class UnverifiedRename(OSError):
@contextmanager
def verified_renames(location: str, rename: Callable[[str, str], None]):
"""在这段上下文里,`location` 的改名交给 `rename`(它自己确认云端结果)。"""
+ require_writable_location(location)
if location in _verified_renames:
raise RuntimeError(f"来源 {location} 已注入核验改名")
_verified_renames[location] = rename
@@ -91,7 +93,10 @@ def unverified_location(location: str | None) -> bool:
def refuse_unverified(paths: Iterable[str]) -> None:
"""整批动盘之前的门槛:涉及须核验来源而没有核验通道时整批拒绝,一个文件都不动。"""
- blocked = sorted({location for location in map(_location_of, map(str, paths))
+ locations = [_location_of(str(path)) for path in paths]
+ for location in locations:
+ require_writable_location(location)
+ blocked = sorted({location for location in locations
if unverified_location(location)})
if blocked:
raise OrganizeError(f"来源 {'、'.join(blocked)} 的挂载改名无法核验云端结果,整批未执行;"
@@ -305,6 +310,8 @@ def _rename(source: str, target: str) -> None:
须核验来源(`VERIFIED_RENAME_LOCATIONS`)交给注入的官方改名;没有注入时拒绝。
"""
location = _location_of(str(source))
+ require_writable_location(location)
+ require_writable_location(_location_of(str(target)))
if location in VERIFIED_RENAME_LOCATIONS:
verified = _verified_renames.get(location)
if verified is None:
@@ -370,7 +377,9 @@ def apply_plan(connection: sqlite3.Connection, rows: Sequence[dict], *,
`web_organize` 都是这么做的)。这里只负责动盘、写账本和留下批次日志。
"""
movable = [row for row in rows if row.get("action") in {"rename", "move"}]
- refuse_unverified(row["current_path"] for row in movable)
+ for row in movable:
+ require_writable_location(row.get("location"))
+ refuse_unverified(path for row in movable for path in (row["current_path"], row["target_path"]))
entries: list[dict] = []
failures: list[dict] = []
log_path = batch_log_dir(generated_root) / (
@@ -403,7 +412,7 @@ def rollback_batch(connection: sqlite3.Connection, log_path: Path | str, *,
path = Path(log_path)
payload = json.loads(path.read_text(encoding="utf-8"))
entries = list(payload.get("entries") or [])
- refuse_unverified(entry["new_path"] for entry in entries)
+ refuse_unverified(path for entry in entries for path in (entry["new_path"], entry["old_path"]))
restored: list[dict] = []
failures: list[dict] = []
for index, entry in enumerate(reversed(entries), 1):
diff --git a/src/peach/resource_identification.py b/src/peach/resource_identification.py
index 2a6385825..e0b20888b 100644
--- a/src/peach/resource_identification.py
+++ b/src/peach/resource_identification.py
@@ -19,6 +19,7 @@ from .catalog_rules import is_jav_code, strip_promo_markers
from .entities import canonicalize_entity_name, collapse_repeated_entity_name
from .library_processing import FIELDS, LABELS
from .review_csv import read_rows, write_rows
+from .media_sources import SCANNABLE_LOCATIONS
SOURCE = "websearch"
POLICY_VERSION = "websearch-v1"
@@ -104,7 +105,7 @@ def _sibling_images(connection) -> dict[str, dict[str, str]]:
def build_worklist(
- connection: sqlite3.Connection, *, locations: tuple[str, ...] = ("local", "115", "pikpak"),
+ connection: sqlite3.Connection, *, locations: tuple[str, ...] = SCANNABLE_LOCATIONS,
prefix: str | None = None, ids: tuple[int, ...] | None = None,
paired_only: bool = False, sparse_only: bool = False, limit: int = 0,
) -> list[dict[str, object]]:
diff --git a/src/peach/routes_pages.py b/src/peach/routes_pages.py
index 05393c673..c8182bd0d 100644
--- a/src/peach/routes_pages.py
+++ b/src/peach/routes_pages.py
@@ -98,7 +98,7 @@ _POSIX_MEDIA_NOTE = "本机文件夹是这台电脑读取媒体的位置;Windo
#: 有一行媒体来源选了云盘时,媒体库底下出现的那句提示和它的帮助链接。
-_CLOUD_HELP = "CloudDrive 可运行在本机或 NAS。请先挂载网盘;Windows 读取 NAS 共享时,请先映射为盘符,再选择对应文件夹。本机安装提示仅适用于在本机运行 CloudDrive。"
+_CLOUD_HELP = "CloudDrive 可运行在本机或 NAS。请先挂载网盘;Windows 读取 NAS 共享时,请先映射为盘符,再选择对应文件夹。本机安装提示仅适用于在本机运行 CloudDrive。光鸭云盘需要 CloudDrive2 v1.0.11 或更高版本,文件管理请使用光鸭云盘客户端。"
_CLOUD_HELP_URL = "https://www.clouddrive2.com/help.html"
_CLOUD_HELP_LABEL = "挂载帮助"
diff --git a/src/peach/web_batch.py b/src/peach/web_batch.py
index 569eb4f6d..baca1ca84 100644
--- a/src/peach/web_batch.py
+++ b/src/peach/web_batch.py
@@ -26,6 +26,7 @@ from typing import Sequence
from .catalog_rules import duration_clusters, is_jav_code, normalise_code_key
from .config import GENERATED_DIR, LOCATION_ROOT_DECLARATIONS
from .field_owners import USER_MANUAL, write_owned_fields
+from .media_sources import READ_ONLY_LOCATIONS, SCANNABLE_LOCATIONS
from .personal_records import ASSET_REFERENCE_TABLES, VANISHED
from .platform import is_unmapped, root_online, translate_ledger_path, within_root
from .regions import normalize_region
@@ -241,7 +242,7 @@ def _junk_rows(connection):
rows = connection.execute(
"SELECT id,location,name,medium,creator,code,size,duration,width,height,snapshot_path,"
"feedback,disposal,play_count,leave_ratio,o_count,studio,ctx_orient,path "
- "FROM asset WHERE location IN ('local','115','pikpak') AND disposal IS NULL "
+ "FROM asset WHERE location IN ('local','115','pikpak','guangya') AND disposal IS NULL "
"AND (COALESCE(medium,'other')<>'video' OR (size < ? "
"AND (duration IS NULL OR duration <= 1200)))",
(JUNK_VIDEO_MAX_BYTES,)).fetchall()
@@ -602,6 +603,8 @@ def _online_source_roots() -> dict[str, tuple[Path, ...]]:
"""Return only declared physical roots that can be enumerated now, per source."""
roots: dict[str, tuple[Path, ...]] = {}
for location, declarations in LOCATION_ROOT_DECLARATIONS.items():
+ if location in READ_ONLY_LOCATIONS:
+ continue
online = []
for declaration in declarations:
root = translate_ledger_path(declaration)
@@ -702,6 +705,14 @@ def purge_assets(connection, rows, *, missing_only: bool = False):
purged, blocked, staged, snapshots, parents = [], [], [], [], []
for row in rows:
media = row["path"]
+ location = row["location"] if "location" in row.keys() else None
+ if location is None:
+ stored = connection.execute("SELECT location FROM asset WHERE id=?", (row["id"],)).fetchone()
+ location = stored[0] if stored else None
+ if media and not missing_only and location in READ_ONLY_LOCATIONS:
+ blocked.append({"id": row["id"], "path": media,
+ "reason": "光鸭云盘为只读来源,请在光鸭云盘客户端管理文件"})
+ continue
if media and missing_only:
try:
present = translate_ledger_path(media).exists()
@@ -726,7 +737,7 @@ def purge_assets(connection, rows, *, missing_only: bool = False):
snapshot = row["snapshot_path"]
if snapshot:
snapshots.append(Path(snapshot))
- if media:
+ if media and location not in READ_ONLY_LOCATIONS:
parents.append(Path(media).parent)
purged.append(row["id"])
try:
@@ -759,7 +770,7 @@ def w_empty_trash(contract: WebContract):
try:
with contract.write_transaction() as connection:
rows = connection.execute(
- "SELECT id,path,snapshot_path FROM asset WHERE disposal='trash'",
+ "SELECT id,location,path,snapshot_path FROM asset WHERE disposal='trash'",
).fetchall()
outcome = purge_assets(connection, rows)
except BaseException:
@@ -797,7 +808,7 @@ def _reject_ineligible_targets(operation: str, rows) -> None:
if operation == "dispose" and any(row["disposal"] == VANISHED for row in rows):
raise ValueError("vanished assets cannot be moved to the recycle bin")
if operation in {"dismiss-junk", "reconsider-junk"} and any(
- row["location"] not in {"local", "115", "pikpak"}
+ row["location"] not in SCANNABLE_LOCATIONS
or row["disposal"] is not None for row in rows):
raise ValueError("junk decisions are only allowed for active physical assets")
diff --git a/src/peach/web_catalog.py b/src/peach/web_catalog.py
index b77731f70..af9ab6b44 100644
--- a/src/peach/web_catalog.py
+++ b/src/peach/web_catalog.py
@@ -38,7 +38,7 @@ from .web_state import WebContract
from .western_artwork import artwork_key
-COST = {"local": "free", "115": "free", "pikpak": "metered", "online": "metered"}
+COST = {"local": "free", "115": "free", "pikpak": "metered", "guangya": "metered", "online": "metered"}
GROUP_TABLES = ('asset', 'asset_entity', 'entity')
#: 卡片随每条记录返回的女优上限。共演作品必须带上全部出镜者,而不是只留第一位;
diff --git a/src/peach/web_organize.py b/src/peach/web_organize.py
index 4d0a49e6e..bf5e4a220 100644
--- a/src/peach/web_organize.py
+++ b/src/peach/web_organize.py
@@ -14,6 +14,7 @@ from pathlib import Path
from . import organize
from .migrations import sqlite_backup
+from .media_sources import require_writable_location
from .organize_templates import PLACEHOLDERS, TemplateError, validate_template
from .platform import location_roots
from .scripting import verify_after_write
@@ -26,6 +27,7 @@ ORGANIZE_LOCATIONS = ("local", "115", "pikpak")
def _templates(contract, body) -> tuple[str, str, str]:
"""取出这一次要用的来源与两份模板;模板缺省时用账本里存着的那一份。"""
location = str(body.get("location") or "").strip()
+ require_writable_location(location)
if location not in ORGANIZE_LOCATIONS:
raise ValueError(f"不认识的来源:{location or '(空)'}")
stored = organize_templates(contract).get(location, {})
diff --git a/src/peach/web_resource_sync.py b/src/peach/web_resource_sync.py
index 429a83507..73b996c4a 100644
--- a/src/peach/web_resource_sync.py
+++ b/src/peach/web_resource_sync.py
@@ -29,6 +29,7 @@ from .catalog_rules import dir_expr, normalise_code_key, photo_set_title
from .config import LOCATION_ROOT_DECLARATIONS
from .jobs import BackgroundJob
from .media import normalized_path
+from .media_sources import READ_ONLY_LOCATIONS, SCANNABLE_LOCATIONS
from .personal_records import VANISHED, mark_vanished, record_holders
from .platform import is_unmapped, root_online, translate_ledger_path, within_root
from .record_rehome import reattach_vanished
@@ -77,7 +78,7 @@ RESOURCE_SCAN_WORKERS = 8
def configured_resource_locations() -> tuple[str, ...]:
"""核对已声明的媒体来源,离线状态由扫描阶段报告。"""
return tuple(location for location, roots in LOCATION_ROOT_DECLARATIONS.items()
- if location in ("local", "115", "pikpak") and roots)
+ if location in SCANNABLE_LOCATIONS and roots)
def _scan_resource_directory(
@@ -287,7 +288,8 @@ def _scan_sources(
if online:
unreadable: set[str] = set()
gone = vanished_asset_rows(contract, location, unreadable_dirs=unreadable)
- empties = _empty_directories(_source_roots(location), unreadable)
+ empties = ([] if location in READ_ONLY_LOCATIONS
+ else _empty_directories(_source_roots(location), unreadable))
vanished_ids.extend(int(row["id"]) for row in gone)
keep = _keeps_records(contract, gone)
keep_ids.update(keep)
@@ -676,7 +678,8 @@ def w_resource_sync_apply(contract: ResourceSyncContract, body, *, progress=None
report(checked=0, total=None, message="正在删除空文件夹")
dirs_removed, dir_errors = 0, 0
for location, paths in state["empty_dirs"].items():
- if location not in configured_resource_locations() or not source_is_online(location):
+ if (location in READ_ONLY_LOCATIONS or location not in configured_resource_locations()
+ or not source_is_online(location)):
continue
removed, errors = _remove_empty_directories([Path(path) for path in paths],
_source_roots(location))
diff --git a/tests/test_guangya_sources.py b/tests/test_guangya_sources.py
new file mode 100644
index 000000000..e52be457d
--- /dev/null
+++ b/tests/test_guangya_sources.py
@@ -0,0 +1,144 @@
+"""光鸭挂载配置、来源读取与远端写入边界。"""
+from contextlib import closing
+import json
+from pathlib import Path
+import sqlite3
+import tempfile
+import unittest
+from unittest.mock import Mock, patch
+
+from peach import media_configuration, onboarding, organize, resource_identification, settings_file
+from peach import web_batch, web_catalog, web_organize, web_resource_sync
+from peach.media_sources import READ_ONLY_LOCATIONS, SCANNABLE_LOCATIONS
+from support.ledger import fresh_ledger
+
+
+class GuangyaSourceTests(unittest.TestCase):
+ def setUp(self):
+ self.temporary = tempfile.TemporaryDirectory()
+ self.addCleanup(self.temporary.cleanup)
+ self.root = Path(self.temporary.name).resolve()
+
+ def test_cloud_only_setup_roundtrips_windows_and_macos_mounts(self):
+ for windows, path in ((True, "G:/Movies"), (False, "/Volumes/Guangya/Movies")):
+ with self.subTest(windows=windows):
+ config = settings_file.load_config(environ={"PEACH_DATA_ROOT": str(self.root)})
+ answers = onboarding.Answers(self.root, (), "127.0.0.1", 8900, "peach", [
+ {"location": "guangya", "path": path, "root": "G:/Movies"}])
+ prepared = onboarding.configure(config, answers, windows=windows)
+ settings_file.write(prepared, force=True)
+ loaded = settings_file.load_config(environ={"PEACH_DATA_ROOT": str(self.root)})
+ self.assertEqual(loaded.locations, {"guangya": ("G:\\Movies",)})
+ self.assertEqual(loaded.mounts, {} if windows else {"guangya": (path,)})
+ self.assertEqual(media_configuration.rows(loaded, windows=windows)[0]["path"],
+ "G:\\Movies" if windows else path)
+ self.assertFalse((self.root / "database" / "ledger.db").exists())
+
+ def test_setup_answers_accept_the_guangya_source(self):
+ from peach.routes_pages import _read_answers
+ config = settings_file.load_config(environ={"PEACH_DATA_ROOT": str(self.root)})
+ answers, errors = _read_answers(config, {
+ "data_root": str(self.root), "media_dir": ["/Volumes/Guangya"],
+ "media_location": ["guangya"], "media_root": ["G:/"], "host": "1",
+ }, windows=False)
+ self.assertEqual(errors, {})
+ self.assertEqual(answers.media_sources[0]["location"], "guangya")
+ self.assertIn("只读", dict(media_configuration.SOURCE_OPTIONS)["guangya"])
+
+ def test_guangya_is_scannable_metered_and_read_only(self):
+ self.assertIn("guangya", SCANNABLE_LOCATIONS)
+ self.assertIn("guangya", READ_ONLY_LOCATIONS)
+ self.assertEqual(web_catalog.COST["guangya"], "metered")
+ with patch.object(web_resource_sync, "LOCATION_ROOT_DECLARATIONS", {"guangya": ("G:/",)}):
+ self.assertEqual(web_resource_sync.configured_resource_locations(), ("guangya",))
+
+ def test_default_identification_reads_guangya_metadata(self):
+ with closing(sqlite3.connect(fresh_ledger(self.root))) as connection:
+ connection.row_factory = sqlite3.Row
+ connection.execute("INSERT INTO asset(id,location,path,name,medium,size) "
+ "VALUES(1,'guangya',?,'FeatureFilm.mp4','video',123)",
+ ("G:\\FeatureFilm.mp4",))
+ worklist = resource_identification.build_worklist(connection)
+ self.assertEqual(len(worklist), 1)
+
+ def test_organize_refuses_guangya_before_any_filesystem_write(self):
+ with patch.object(organize, "location_roots", return_value={"guangya": ("G:/",)}), \
+ patch.object(organize.os, "rename") as rename:
+ for paths in (("G:\\film.mp4",), ("R:\\film.mp4", "G:\\film.mp4")):
+ with self.subTest(paths=paths), self.assertRaisesRegex(ValueError, "只读"):
+ organize.refuse_unverified(paths)
+ with self.assertRaisesRegex(ValueError, "只读"):
+ organize._rename("G:\\film.mp4", "G:\\renamed.mp4")
+ with self.assertRaisesRegex(ValueError, "只读"):
+ organize.apply_plan(Mock(), [{"asset_id": 1, "location": "guangya", "action": "rename",
+ "current_path": "G:\\film.mp4", "target_path": "G:\\renamed.mp4"}],
+ generated_root=self.root)
+ with self.assertRaisesRegex(ValueError, "只读"):
+ with organize.verified_renames("guangya", Mock()):
+ self.fail("只读来源不能注入改名通道")
+ log = self.root / "organize.json"
+ log.write_text(json.dumps({"entries": [{"asset_id": 1,
+ "old_path": "G:\\film.mp4", "new_path": "G:\\renamed.mp4"}]}), encoding="utf-8")
+ with self.assertRaisesRegex(ValueError, "只读"):
+ organize.rollback_batch(Mock(), log)
+ rename.assert_not_called()
+ with self.assertRaisesRegex(ValueError, "只读"):
+ web_organize.w_organize_apply(Mock(), {"confirm": True, "location": "guangya"})
+
+ def test_permanent_delete_keeps_guangya_file_and_ledger_row(self):
+ media = self.root / "film.mp4"
+ media.write_bytes(b"media")
+ with closing(sqlite3.connect(fresh_ledger(self.root))) as connection:
+ connection.row_factory = sqlite3.Row
+ connection.execute("INSERT INTO asset(id,location,path,name,medium) "
+ "VALUES(1,'guangya',?,'film.mp4','video')", (str(media),))
+ for columns in ("id,location,path,snapshot_path", "id,path,snapshot_path"):
+ with self.subTest(columns=columns):
+ result = web_batch.purge_assets(connection, connection.execute(
+ f"SELECT {columns} FROM asset").fetchall())
+ self.assertEqual(result["purged"], 0)
+ self.assertIn("只读", result["blocked"][0]["reason"])
+ self.assertEqual(connection.execute("SELECT count(*) FROM asset").fetchone()[0], 1)
+ self.assertEqual(media.read_bytes(), b"media")
+
+ def test_missing_guangya_row_cleanup_never_cleans_remote_parents(self):
+ with closing(sqlite3.connect(fresh_ledger(self.root))) as connection:
+ connection.row_factory = sqlite3.Row
+ connection.execute("INSERT INTO asset(id,location,path,name,medium) "
+ "VALUES(1,'guangya',?,'missing.mp4','video')", (str(self.root / "missing.mp4"),))
+ rows = connection.execute("SELECT id,location,path,snapshot_path FROM asset").fetchall()
+ result = web_batch.purge_assets(connection, rows, missing_only=True)
+ self.assertEqual(result["purged"], 1)
+ self.assertEqual(result["_parents"], [])
+ with patch.object(web_batch, "LOCATION_ROOT_DECLARATIONS", {"guangya": (str(self.root),)}):
+ self.assertEqual(web_batch._online_source_roots(), {})
+
+ def test_resource_scan_does_not_offer_read_only_empty_directories(self):
+ from contextlib import contextmanager
+ database = fresh_ledger(self.root)
+ @contextmanager
+ def read_connection():
+ with closing(sqlite3.connect(database)) as connection:
+ yield connection
+ contract = Mock(read_connection=read_connection)
+ with patch.object(web_resource_sync, "LOCATION_ROOT_DECLARATIONS", {"guangya": (str(self.root),)}), \
+ patch.object(web_resource_sync, "source_is_online", return_value=True), \
+ patch.object(web_resource_sync, "vanished_asset_rows", return_value=[]), \
+ patch.object(web_resource_sync, "_keeps_records", return_value=set()), \
+ patch.object(web_resource_sync, "_empty_directories") as empty:
+ result = web_resource_sync._scan_sources(contract)
+ self.assertEqual(result["empty_dirs"], {"guangya": []})
+ self.assertEqual(result["sources"][0]["empty"], 0)
+ empty.assert_not_called()
+
+ def test_resource_apply_rejects_read_only_directories_in_a_saved_scan(self):
+ contract = Mock()
+ scan = {"vanished_ids": [], "empty_dirs": {"guangya": [str(self.root / "empty")]},
+ "result": {"sources": []}}
+ with patch.object(web_resource_sync, "configured_resource_locations", return_value=("guangya",)), \
+ patch.object(web_resource_sync, "_completed_scan", return_value=scan), \
+ patch.object(web_resource_sync, "_remove_empty_directories") as remove:
+ result = web_resource_sync.w_resource_sync_apply(contract,
+ {"confirm": True, "scan_id": "scan", "clean_cache": False})
+ self.assertEqual(result["dirs_removed"], 0)
+ remove.assert_not_called()
diff --git a/tests/test_onboarding.py b/tests/test_onboarding.py
index 7f641372b..71700946d 100644
--- a/tests/test_onboarding.py
+++ b/tests/test_onboarding.py
@@ -623,7 +623,7 @@ class SetupJsonContractTests(_SetupHttpCase):
self.assertEqual(by_key["media_dir"]["input"], "folders")
self.assertEqual(data["windows"], NATIVE_WINDOWS)
self.assertFalse(data["standalone"])
- self.assertEqual([row["value"] for row in data["media_sources"]], ["local", "115", "pikpak"])
+ self.assertEqual([row["value"] for row in data["media_sources"]], ["local", "115", "pikpak", "guangya"])
self.assertEqual(data["media_source_default"], "local")
if NATIVE_WINDOWS:
self.assertIsNone(data["media_root"])
diff --git a/web/dist/peach-pages.js b/web/dist/peach-pages.js
index 2adb336d0..c99275e4e 100644
--- a/web/dist/peach-pages.js
+++ b/web/dist/peach-pages.js
@@ -19349,6 +19349,7 @@ function im(e, t, n = () => !0) {
//#region src/ui-kit/media-source-icons.ts
var am = {
local: "hard-drive",
+ guangya: "database",
115: "data:image/png;base64,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",
pikpak: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACY0lEQVR4nNWXy2tTQRSHv7m5RUWttqlNW1OairhKNbrU+lhE/AOkdCOIIO7arty0QhSxCIIQ7VJwIfgfCIJdFB+rgC32AVIflD5CbFUsoohJRiZzb5Ne05p4kxv94HCTc+bO+c0MM3eOoICD/TJswAAQBdoBH5UhA8wDo1mIv7ojpuyAsH9EBuQgkmuASXVJI4lN3BXDawIifXIQwQ28RDA0ERfDwpr2cQ9G7iSdhcOGteZeJ1eYKreB5DS1I2oiCJba2hDQVA9tjdDaCHMfICuhMwDJz5D8BMtftK9E2s2NttrJMOxvzSdT1rIb6goW69KIXsjr5/K+nxlIWWKWrOebJIxNFhXgK7r20QjcPL+59PllGH8LarDvU3oWFHU+CDZpK+TKA3j88vd+zGKd93av/y8lrKxao7Ls6bROrrj6EE6E9WzZppZKrJ0y0Hu8RAGhZuhohqk5nShp2Y/0+nZqxPaoFQsr2my2mNDSkBe01w/7AvAu9QcB/nrYs0vboU4qSsNOwCHAoMYY/5WAsckNt1NJ8WKY5TS+fF8/E7f/Lu5aQDrjLu5agOlzF3ct4NYFd3HXAk51uYv/k9vQLPeFr9/h4gh0dcCBNu17vaiP7nt9sGNblQVs3wo9x+DZNCRm9aUyFICebh0rF9PpWP22+QvqC3f2qLZyKda34XTMLsGLGSrO8xndtxMR6ZfqQ+tz7uczRyDor0zyxY/6LlDkoMqYVsUSKvSqho8SVB/JglqCUWqF4ImharVcueQ96j4bN3KFoiDmeXpJTOXO7QJVoyEZ8mgm0rm6sLA4talFef4LaurBZfZxNPMAAAAASUVORK5CYII="
}, om = bt({
@@ -20467,8 +20468,13 @@ function Wh({ className: e }) {
var Gh = [
["local", "本地磁盘"],
["115", "CloudDrive · 115"],
- ["pikpak", "CloudDrive · PikPak"]
-], Kh = (e) => am[e] || "database", qh = (e) => e === "115" || e === "pikpak";
+ ["pikpak", "CloudDrive · PikPak"],
+ ["guangya", "CloudDrive · 光鸭云盘(只读)"]
+], Kh = (e) => am[e] || "database", qh = (e) => [
+ "115",
+ "pikpak",
+ "guangya"
+].includes(e);
function Jh({ initial: e, blank: t, pickFolder: n, describe: r, focusAfterPick: i = !1 }) {
let [a, o] = (0, y.useState)(e), [s, c] = (0, y.useState)([]), [l, u] = (0, y.useState)(null), [d, f] = (0, y.useState)(null), p = (0, y.useRef)(!1), m = (0, y.useRef)([]);
(0, y.useLayoutEffect)(() => {