fix: Rename subscription and collection will break artifacts

sub-store-org · Aug 9, 2022 · 6ea3575 · 6ea3575
1 parent 26820ea
commit 6ea3575
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 14 deletions.
diff --git a/backend/dist/cron-sync-artifacts.min.js b/backend/dist/cron-sync-artifacts.min.js
diff --git a/backend/dist/sub-store-parser.loon.min.js b/backend/dist/sub-store-parser.loon.min.js
diff --git a/backend/package.json b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sub-store",
-  "version": "2.12.2",
+  "version": "2.12.3",
   "description": "Advanced Subscription Manager for QX, Loon, Surge, Stash and ShadowRocket.",
   "main": "src/main.js",
   "scripts": {

diff --git a/backend/src/restful/collections.js b/backend/src/restful/collections.js
@@ -1,5 +1,5 @@
 import { deleteByName, findByName, updateByName } from '@/utils/database';
-import { COLLECTIONS_KEY } from '@/constants';
+import { COLLECTIONS_KEY, ARTIFACTS_KEY } from '@/constants';
 import { failed, success } from '@/restful/response';
 import $ from '@/core/app';
 import { RequestInvalidError, ResourceNotFoundError } from '@/restful/errors';
@@ -67,6 +67,21 @@ function updateCollection(req, res) {
             ...collection,
         };
         $.info(`正在更新组合订阅：${name}...`);
+
+        if (name !== newCol.name) {
+            // update all artifacts referring this collection
+            const allArtifacts = $.read(ARTIFACTS_KEY) || [];
+            for (const artifact of allArtifacts) {
+                if (
+                    artifact.type === 'collection' &&
+                    artifact.source === oldCol.name
+                ) {
+                    artifact.source = newCol.name;
+                }
+            }
+            $.write(allArtifacts, ARTIFACTS_KEY);
+        }
+
         updateByName(allCols, name, newCol);
         $.write(allCols, COLLECTIONS_KEY);
         success(res, newCol);

diff --git a/backend/src/restful/subscriptions.js b/backend/src/restful/subscriptions.js
@@ -5,7 +5,7 @@ import {
     RequestInvalidError,
 } from './errors';
 import { deleteByName, findByName, updateByName } from '@/utils/database';
-import { SUBS_KEY, COLLECTIONS_KEY } from '@/constants';
+import { SUBS_KEY, COLLECTIONS_KEY, ARTIFACTS_KEY } from '@/constants';
 import { getFlowHeaders } from '@/utils/flow';
 import { success, failed } from './response';
 import $ from '@/core/app';
@@ -137,14 +137,28 @@ function updateSubscription(req, res) {
         $.info(`正在更新订阅： ${name}`);
         // allow users to update the subscription name
         if (name !== sub.name) {
-            // we need to find out all collections refer to this name
-            const allCols = $.read(COLLECTIONS_KEY);
+            // update all collections refer to this name
+            const allCols = $.read(COLLECTIONS_KEY) || [];
             for (const collection of allCols) {
                 const idx = collection.subscriptions.indexOf(name);
                 if (idx !== -1) {
                     collection.subscriptions[idx] = sub.name;
                 }
             }
+
+            // update all artifacts referring this subscription
+            const allArtifacts = $.read(ARTIFACTS_KEY) || [];
+            for (const artifact of allArtifacts) {
+                if (
+                    artifact.type === 'subscription' &&
+                    artifact.source == name
+                ) {
+                    artifact.source = sub.name;
+                }
+            }
+
+            $.write(allCols, COLLECTIONS_KEY);
+            $.write(allArtifacts, ARTIFACTS_KEY);
         }
         updateByName(allSubs, name, newSub);
         $.write(allSubs, SUBS_KEY);

diff --git a/backend/sub-store.min.js b/backend/sub-store.min.js