Skip to content

Commit 0ec4cc6

Browse files
committed
🐛 修复导入重复的问题
1 parent 5d64aea commit 0ec4cc6

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

src/app/service/synchronize/manager.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ export default class SynchronizeManager extends Manager {
373373
name: script.name,
374374
// NOTE: tm会对同名的uuid校验,先屏蔽了
375375
// uuid: script.uuid,
376+
sc_uuid: script.uuid,
376377
modified: script.updatetime,
377378
file_url: script.downloadUrl,
378379
subscribe_url: script.subscribeUrl,

src/pages/import/App.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ function App() {
6666
item.script = await prepareScriptByCode(
6767
item.code,
6868
item.options?.meta.file_url || "",
69-
item.options?.meta.file_url
70-
? undefined
71-
: item.options?.meta.uuid || undefined
69+
item.options?.meta.sc_uuid ||
70+
item.options?.meta.uuid ||
71+
undefined
7272
);
7373
} catch (e: any) {
7474
item.error = e.toString();
@@ -80,6 +80,7 @@ function App() {
8080
meta: {
8181
name: item.script.name,
8282
uuid: item.script.uuid,
83+
sc_uuid: item.script.uuid,
8384
file_url: item.script.downloadUrl || "",
8485
modified: item.script.createtime,
8586
subscribe_url: item.script.subscribeUrl,

src/pkg/backup/struct.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ export type ScriptOptions = {
5151

5252
export type ScriptMeta = {
5353
name: string;
54-
uuid?: string;
54+
uuid?: string; // tm会对同名的uuid校验,先屏蔽了
55+
sc_uuid: string; // 脚本猫uuid
5556
modified: number;
5657
file_url: string;
5758
subscribe_url?: string;

0 commit comments

Comments
 (0)