Merge branch 'dev' of github.com:allanpk716/ChineseSubFinder into dev

frontend/package-lock.json

@@ -19,7 +19,7 @@
         "hls.js": "^0.14.7",
         "js-base64": "^3.7.2",
         "markdown": "^0.5.0",
-        "quasar": "^2.6.0",
+        "quasar": "^2.11.5",
         "util": "^0.12.4",
         "vue": "^3.2.22",
         "vue-router": "^4.0.0",
@@ -11968,9 +11968,9 @@
       }
     },
     "node_modules/quasar": {
-      "version": "2.11.3",
-      "resolved": "https://registry.npmmirror.com/quasar/-/quasar-2.11.3.tgz",
-      "integrity": "sha512-a+PApE126fwtCsuPvbDLuSSgcFUy5bGu9WjqvVRP3z0xw+7pH93Hva2M+QQLMsYs4a5tpT4N/qXlsI591nxuxA==",
+      "version": "2.11.5",
+      "resolved": "https://registry.npmmirror.com/quasar/-/quasar-2.11.5.tgz",
+      "integrity": "sha512-rX4Rwp9wlCeB9A6RQUxEx/q84LMBVVm6WTECkoq8r/+NBgl9aHVexzZQBnRn2i61D0BJpdX5VcnMxAnJkTx/kA==",
       "engines": {
         "node": ">= 10.18.1",
         "npm": ">= 6.13.4",
@@ -24389,9 +24389,9 @@
       }
     },
     "quasar": {
-      "version": "2.11.3",
-      "resolved": "https://registry.npmmirror.com/quasar/-/quasar-2.11.3.tgz",
-      "integrity": "sha512-a+PApE126fwtCsuPvbDLuSSgcFUy5bGu9WjqvVRP3z0xw+7pH93Hva2M+QQLMsYs4a5tpT4N/qXlsI591nxuxA=="
+      "version": "2.11.5",
+      "resolved": "https://registry.npmmirror.com/quasar/-/quasar-2.11.5.tgz",
+      "integrity": "sha512-rX4Rwp9wlCeB9A6RQUxEx/q84LMBVVm6WTECkoq8r/+NBgl9aHVexzZQBnRn2i61D0BJpdX5VcnMxAnJkTx/kA=="
     },
     "queue-microtask": {
       "version": "1.2.3",

frontend/package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "@quasar/extras": "^1.0.0",
     "core-js": "^3.6.5",
-    "quasar": "^2.6.0",
+    "quasar": "^2.11.5",
     "vue-router": "^4.0.0",
     "@vueuse/core": "^4.11.2",
     "artplayer": "^4.5.9",

frontend/src/pages/library/SearchPanelCsfApi.vue

@@ -39,7 +39,6 @@ import { LocalStorage } from 'quasar';
 
 const props = defineProps({
   path: String,
-  imdbId: String,
   isMovie: {
     type: Boolean,
     default: false,
@@ -85,6 +84,8 @@ const loading = ref(false);
 const csfSearchResult = ref(null);
 const selectedSubBlob = ref(null);
 const selectedItem = ref(null);
+const imdbId = ref(null);
+
 // blob缓存
 const cacheBlob = new Map();
 const selectedSubUrl = computed(() => {
@@ -105,12 +106,11 @@ const searchCsf = async () => {
     loading.value = false;
     return;
   }
-  console.log(d);
-  const imdbId = d?.ImdbId;
+  imdbId.value = d?.ImdbId;
   await waitRequestReady();
   if (props.isMovie) {
     const [data, err] = await CsfSubtitlesApi.searchMovie({
-      imdb_id: imdbId,
+      imdb_id: imdbId.value,
     });
     if (err !== null) {
       SystemMessage.error(err.message);
@@ -119,7 +119,7 @@ const searchCsf = async () => {
     }
   } else if (!props.searchPackage) {
     const [data, err] = await CsfSubtitlesApi.searchTvEps({
-      imdb_id: imdbId,
+      imdb_id: imdbId.value,
       season: props.season,
       episode: props.episode,
     });
@@ -145,8 +145,8 @@ const fetchSubtitleBlob = async (item) => {
   await waitRequestReady();
 
   const [data, err] = await CsfSubtitlesApi.getDownloadUrl({
-    token: item.token,
-    sub_sha256: item.sub_sha256,
+    ...item,
+    imdb_id: imdbId.value,
   });
   if (err !== null) {
     SystemMessage.error(err.message);