From e5a81efad54214262854ba952b1862638096e83e Mon Sep 17 00:00:00 2001
From: Rewrite0 <y747556795@gmail.com>
Date: Thu, 10 Aug 2023 09:19:35 +0800
Subject: [PATCH 1/8] feat: clean types

---
 webui/src/api/bangumi.ts |  2 +-
 webui/types/bangumi.ts   | 21 ---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/webui/src/api/bangumi.ts b/webui/src/api/bangumi.ts
index 07432309..06c27c52 100644
--- a/webui/src/api/bangumi.ts
+++ b/webui/src/api/bangumi.ts
@@ -1,4 +1,4 @@
-import type { BangumiRule, BangumiUpdate } from '#/bangumi';
+import type { BangumiRule } from '#/bangumi';
 import type { ApiSuccess } from '#/api';
 
 export const apiBangumi = {
diff --git a/webui/types/bangumi.ts b/webui/types/bangumi.ts
index 17c56924..eeed433d 100644
--- a/webui/types/bangumi.ts
+++ b/webui/types/bangumi.ts
@@ -19,24 +19,3 @@ export interface BangumiRule {
   title_raw: string;
   year: string | null;
 }
-
-export interface BangumiUpdate {
-  added: boolean;
-  deleted: boolean;
-  dpi: string;
-  eps_collect: boolean;
-  filter: string;
-  group_name: string;
-  official_title: string;
-  offset: number;
-  poster_link: string | null;
-  rss_link: string;
-  rule_name: string;
-  save_path: string;
-  season: number;
-  season_raw: string;
-  source: string | null;
-  subtitle: string;
-  title_raw: string;
-  year: string | null;
-}

From d68c8b1ac4ce56de2e66842d2b3aafeb3e2be7cb Mon Sep 17 00:00:00 2001
From: Rewrite0 <y747556795@gmail.com>
Date: Thu, 10 Aug 2023 09:21:12 +0800
Subject: [PATCH 2/8] fix: fix eslint dependencies error

---
 webui/.npmrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webui/.npmrc b/webui/.npmrc
index 13e14bcc..dbed7938 100644
--- a/webui/.npmrc
+++ b/webui/.npmrc
@@ -1 +1,3 @@
 public-hoist-pattern[]=@vue/runtime-core
+public-hoist-pattern[]=*eslint*
+public-hoist-pattern[]=*prettier*

From 34a065f05ed8c33687b30028518f8b2291312b1b Mon Sep 17 00:00:00 2001
From: Rewrite0 <y747556795@gmail.com>
Date: Thu, 10 Aug 2023 10:13:06 +0800
Subject: [PATCH 3/8] refactor: analysis fn

---
 webui/src/api/download.ts               | 32 +++++++--------------
 webui/src/components/ab-add-bangumi.vue | 38 ++++++++++++-------------
 webui/src/hooks/useApi.ts               |  3 ++
 3 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/webui/src/api/download.ts b/webui/src/api/download.ts
index 51b7028b..52f25310 100644
--- a/webui/src/api/download.ts
+++ b/webui/src/api/download.ts
@@ -4,35 +4,25 @@ interface Status {
   status: 'Success';
 }
 
-interface AnalysisError {
-  status: 'Failed to parse link';
-}
-
 export const apiDownload = {
   /**
    * 解析 RSS 链接
    * @param rss_link - RSS 链接
    */
   async analysis(rss_link: string) {
-    const fetchResult = createEventHook<BangumiRule>();
-    const fetchError = createEventHook<AnalysisError>();
-
-    axios
-      .post<any>('api/v1/download/analysis', {
+    const { data } = await axios.post<BangumiRule & { status?: string }>(
+      'api/v1/download/analysis',
+      {
         rss_link,
-      })
-      .then(({ data }) => {
-        if (data.status) {
-          fetchError.trigger(data as AnalysisError);
-        } else {
-          fetchResult.trigger(data as BangumiRule);
-        }
-      });
+      }
+    );
 
-    return {
-      onResult: fetchResult.on,
-      onError: fetchError.on,
-    };
+    // 解析失败抛出错误
+    if (data.status) {
+      throw data;
+    }
+
+    return data;
   },
 
   /**
diff --git a/webui/src/components/ab-add-bangumi.vue b/webui/src/components/ab-add-bangumi.vue
index 77a73ebb..cd265196 100644
--- a/webui/src/components/ab-add-bangumi.vue
+++ b/webui/src/components/ab-add-bangumi.vue
@@ -47,28 +47,24 @@ watch(show, (val) => {
   }
 });
 
-async function analyser() {
+async function analysisRss() {
   if (rss.value === '') {
     message.error('Please enter the RSS link!');
   } else {
-    try {
-      analysis.loading = true;
-      const { onError, onResult } = await apiDownload.analysis(rss.value);
-      onResult((data) => {
-        rule.value = data;
-        analysis.loading = false;
-        analysis.next = true;
-        console.log('rule', data);
-      });
+    analysis.loading = true;
 
-      onError((err) => {
-        message.error(err.status);
-        analysis.loading = false;
-        console.log('error', err);
-      });
+    try {
+      const data = await apiDownload.analysis(rss.value);
+      rule.value = data;
+      analysis.next = true;
+      console.log('rule', data);
     } catch (error) {
-      message.error('Failed to analyser!');
+      const err = error as { status: string };
+      message.error(err.status);
+      console.log('error', err);
     }
+
+    analysis.loading = false;
   }
 }
 
@@ -90,6 +86,7 @@ async function collect() {
     }
   }
 }
+
 async function subscribe() {
   if (rule.value) {
     try {
@@ -124,9 +121,12 @@ async function subscribe() {
       ></ab-setting>
 
       <div flex="~ justify-end">
-        <ab-button size="small" :loading="analysis.loading" @click="analyser">{{
-          $t('topbar.add.analyse')
-        }}</ab-button>
+        <ab-button
+          size="small"
+          :loading="analysis.loading"
+          @click="analysisRss"
+          >{{ $t('topbar.add.analyse') }}</ab-button
+        >
       </div>
     </div>
 
diff --git a/webui/src/hooks/useApi.ts b/webui/src/hooks/useApi.ts
index ca099d74..ad2bfe78 100644
--- a/webui/src/hooks/useApi.ts
+++ b/webui/src/hooks/useApi.ts
@@ -20,6 +20,7 @@ export function useApi<
 
   const fetchResult = createEventHook<TData>();
   const fetchError = createEventHook<TError>();
+  const fetchFinally = createEventHook();
   const message = useMessage();
 
   function execute(...params: Parameters<TApi>) {
@@ -43,6 +44,7 @@ export function useApi<
       })
       .finally(() => {
         isLoading.value = false;
+        fetchFinally.trigger('');
       });
   }
 
@@ -53,5 +55,6 @@ export function useApi<
     execute,
     onResult: fetchResult.on,
     onError: fetchError.on,
+    onFinally: fetchFinally.on,
   };
 }

From 6339b26d99923951660a983bdd7aa2bd552dd0d9 Mon Sep 17 00:00:00 2001
From: Rewrite0 <y747556795@gmail.com>
Date: Thu, 10 Aug 2023 10:16:46 +0800
Subject: [PATCH 4/8] refactor: rule template

---
 webui/src/components/ab-add-bangumi.vue | 23 ++---------------------
 webui/src/pages/index/bangumi.vue       | 23 ++---------------------
 webui/types/bangumi.ts                  | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/webui/src/components/ab-add-bangumi.vue b/webui/src/components/ab-add-bangumi.vue
index cd265196..31b1c506 100644
--- a/webui/src/components/ab-add-bangumi.vue
+++ b/webui/src/components/ab-add-bangumi.vue
@@ -1,33 +1,14 @@
 <script lang="ts" setup>
 import { useMessage } from 'naive-ui';
 import type { BangumiRule } from '#/bangumi';
+import { ruleTemplate } from '#/bangumi';
 
 const { getAll } = useBangumiStore();
 const show = defineModel('show', { default: false });
 
 const rss = ref('');
 const message = useMessage();
-const rule = ref<BangumiRule>({
-  added: false,
-  deleted: false,
-  dpi: '',
-  eps_collect: false,
-  filter: [],
-  group_name: '',
-  id: 0,
-  official_title: '',
-  offset: 0,
-  poster_link: '',
-  rss_link: [],
-  rule_name: '',
-  save_path: '',
-  season: 1,
-  season_raw: '',
-  source: null,
-  subtitle: '',
-  title_raw: '',
-  year: null,
-});
+const rule = ref<BangumiRule>(ruleTemplate);
 const analysis = reactive({
   loading: false,
   next: false,
diff --git a/webui/src/pages/index/bangumi.vue b/webui/src/pages/index/bangumi.vue
index 2cd85673..a7bc0493 100644
--- a/webui/src/pages/index/bangumi.vue
+++ b/webui/src/pages/index/bangumi.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import type { BangumiRule } from '#/bangumi';
+import { ruleTemplate } from '#/bangumi';
 
 const { data } = storeToRefs(useBangumiStore());
 const { getAll, useUpdateRule, useDisableRule, useEnableRule, useDeleteRule } =
@@ -10,27 +11,7 @@ const editRule = reactive<{
   item: BangumiRule;
 }>({
   show: false,
-  item: {
-    added: false,
-    deleted: false,
-    dpi: '',
-    eps_collect: false,
-    filter: [],
-    group_name: '',
-    id: 0,
-    official_title: '',
-    offset: 0,
-    poster_link: '',
-    rss_link: [],
-    rule_name: '',
-    save_path: '',
-    season: 1,
-    season_raw: '',
-    source: null,
-    subtitle: '',
-    title_raw: '',
-    year: null,
-  },
+  item: ruleTemplate,
 });
 
 function open(data: BangumiRule) {
diff --git a/webui/types/bangumi.ts b/webui/types/bangumi.ts
index eeed433d..933522f3 100644
--- a/webui/types/bangumi.ts
+++ b/webui/types/bangumi.ts
@@ -19,3 +19,25 @@ export interface BangumiRule {
   title_raw: string;
   year: string | null;
 }
+
+export const ruleTemplate: BangumiRule = {
+  added: false,
+  deleted: false,
+  dpi: '',
+  eps_collect: false,
+  filter: [],
+  group_name: '',
+  id: 0,
+  official_title: '',
+  offset: 0,
+  poster_link: '',
+  rss_link: [],
+  rule_name: '',
+  save_path: '',
+  season: 1,
+  season_raw: '',
+  source: null,
+  subtitle: '',
+  title_raw: '',
+  year: null,
+};

From 506ad144d55c9d394756bfee2d2ee3635a342fd4 Mon Sep 17 00:00:00 2001
From: Rewrite0 <y747556795@gmail.com>
Date: Thu, 10 Aug 2023 10:47:14 +0800
Subject: [PATCH 5/8] refactor: bangumi page

---
 webui/src/pages/index/bangumi.vue |  69 ++-----------------
 webui/src/store/bangumi.ts        | 110 ++++++++++++++++++------------
 2 files changed, 69 insertions(+), 110 deletions(-)

diff --git a/webui/src/pages/index/bangumi.vue b/webui/src/pages/index/bangumi.vue
index a7bc0493..5d3f3f84 100644
--- a/webui/src/pages/index/bangumi.vue
+++ b/webui/src/pages/index/bangumi.vue
@@ -1,73 +1,12 @@
 <script lang="ts" setup>
-import type { BangumiRule } from '#/bangumi';
-import { ruleTemplate } from '#/bangumi';
-
-const { data } = storeToRefs(useBangumiStore());
-const { getAll, useUpdateRule, useDisableRule, useEnableRule, useDeleteRule } =
+const { bangumi, editRule } = storeToRefs(useBangumiStore());
+const { getAll, updateRule, enableRule, openEditPopup, ruleManage } =
   useBangumiStore();
 
-const editRule = reactive<{
-  show: boolean;
-  item: BangumiRule;
-}>({
-  show: false,
-  item: ruleTemplate,
-});
-
-function open(data: BangumiRule) {
-  editRule.show = true;
-  editRule.item = data;
-}
-
-function refresh() {
-  editRule.show = false;
-  getAll();
-}
-
-const { execute: updateRule, onResult: onUpdateRuleResult } = useUpdateRule();
-const { execute: enableRule, onResult: onEnableRuleResult } = useEnableRule();
-const { execute: disableRule, onResult: onDisableRuleResult } =
-  useDisableRule();
-const { execute: deleteRule, onResult: onDeleteRuleResult } = useDeleteRule();
-const message = useMessage();
-
-onUpdateRuleResult(({ msg }) => {
-  message.success(msg);
-  refresh();
-});
-
-onDisableRuleResult(({ msg }) => {
-  message.success(msg);
-  refresh();
-});
-
-onEnableRuleResult(({ msg }) => {
-  message.success(msg);
-  refresh();
-});
-
-onDeleteRuleResult(({ msg }) => {
-  message.success(msg);
-  refresh();
-});
-
 onActivated(() => {
   getAll();
 });
 
-function ruleManage(
-  type: 'disable' | 'delete',
-  id: number,
-  deleteFile: boolean
-) {
-  if (type === 'disable') {
-    disableRule(id, deleteFile);
-  }
-  if (type === 'delete') {
-    deleteRule(id, deleteFile);
-  }
-}
-
 definePage({
   name: 'Bangumi List',
 });
@@ -77,13 +16,13 @@ definePage({
   <div overflow-auto mt-12px flex-grow>
     <div flex="~ wrap" gap-y-12px gap-x-50px>
       <ab-bangumi-card
-        v-for="i in data"
+        v-for="i in bangumi"
         :key="i.id"
         :class="[i.deleted && 'grayscale']"
         :poster="i.poster_link ?? ''"
         :name="i.official_title"
         :season="i.season"
-        @click="() => open(i)"
+        @click="() => openEditPopup(i)"
       ></ab-bangumi-card>
 
       <ab-edit-rule
diff --git a/webui/src/store/bangumi.ts b/webui/src/store/bangumi.ts
index dc59833b..a4138310 100644
--- a/webui/src/store/bangumi.ts
+++ b/webui/src/store/bangumi.ts
@@ -1,67 +1,87 @@
 import type { BangumiRule } from '#/bangumi';
+import { ruleTemplate } from '#/bangumi';
 
 export const useBangumiStore = defineStore('bangumi', () => {
-  const data = ref<BangumiRule[]>();
+  const message = useMessage();
 
-  function getAll() {
-    const { execute, onResult } = useApi(apiBangumi.getAll);
+  const bangumi = ref<BangumiRule[]>();
+  const editRule = reactive<{
+    show: boolean;
+    item: BangumiRule;
+  }>({
+    show: false,
+    item: ruleTemplate,
+  });
 
+  const { execute: getAll, onResult: onBangumiResult } = useApi(
+    apiBangumi.getAll
+  );
+  const { execute: updateRule, onResult: onUpdateRuleResult } = useApi(
+    apiBangumi.updateRule
+  );
+  const { execute: enableRule, onResult: onEnableRuleResult } = useApi(
+    apiBangumi.enableRule
+  );
+  const { execute: disableRule, onResult: onDisableRuleResult } = useApi(
+    apiBangumi.disableRule
+  );
+  const { execute: deleteRule, onResult: onDeleteRuleResult } = useApi(
+    apiBangumi.deleteRule
+  );
+
+  onBangumiResult((res) => {
     function sort(arr: BangumiRule[]) {
       return arr.sort((a, b) => b.id - a.id);
     }
 
-    onResult((res) => {
-      const enabled = sort(res.filter((e) => !e.deleted));
-      const disabled = sort(res.filter((e) => e.deleted));
+    const enabled = sort(res.filter((e) => !e.deleted));
+    const disabled = sort(res.filter((e) => e.deleted));
 
-      data.value = [...enabled, ...disabled];
-    });
+    bangumi.value = [...enabled, ...disabled];
+  });
 
-    execute();
+  function refresh() {
+    editRule.show = false;
+    getAll();
   }
 
-  function useUpdateRule() {
-    const { execute, onResult } = useApi(apiBangumi.updateRule);
+  function actionSuccess({ msg }) {
+    message.success(msg);
+    refresh();
+  }
+  onUpdateRuleResult(actionSuccess);
+  onDisableRuleResult(actionSuccess);
+  onEnableRuleResult(actionSuccess);
+  onDeleteRuleResult(actionSuccess);
 
-    return {
-      execute,
-      onResult,
-    };
+  function openEditPopup(data: BangumiRule) {
+    editRule.show = true;
+    editRule.item = data;
   }
 
-  function useDisableRule() {
-    const { execute, onResult } = useApi(apiBangumi.disableRule);
-
-    return {
-      execute,
-      onResult,
-    };
-  }
-
-  function useEnableRule() {
-    const { execute, onResult } = useApi(apiBangumi.enableRule);
-
-    return {
-      execute,
-      onResult,
-    };
-  }
-
-  function useDeleteRule() {
-    const { execute, onResult } = useApi(apiBangumi.deleteRule);
-
-    return {
-      execute,
-      onResult,
-    };
+  function ruleManage(
+    type: 'disable' | 'delete',
+    id: number,
+    deleteFile: boolean
+  ) {
+    if (type === 'disable') {
+      disableRule(id, deleteFile);
+    }
+    if (type === 'delete') {
+      deleteRule(id, deleteFile);
+    }
   }
 
   return {
-    data,
+    bangumi,
+    editRule,
+
     getAll,
-    useUpdateRule,
-    useDisableRule,
-    useEnableRule,
-    useDeleteRule,
+    updateRule,
+    enableRule,
+    disableRule,
+    deleteRule,
+    openEditPopup,
+    ruleManage,
   };
 });

From 9e03735074e026048ee7d67f8f745451aaca3a33 Mon Sep 17 00:00:00 2001
From: Rewrite0 <y747556795@gmail.com>
Date: Thu, 10 Aug 2023 10:57:37 +0800
Subject: [PATCH 6/8] style: code style change

---
 webui/src/components/ab-add-bangumi.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/webui/src/components/ab-add-bangumi.vue b/webui/src/components/ab-add-bangumi.vue
index 31b1c506..9a0e57f7 100644
--- a/webui/src/components/ab-add-bangumi.vue
+++ b/webui/src/components/ab-add-bangumi.vue
@@ -3,17 +3,19 @@ import { useMessage } from 'naive-ui';
 import type { BangumiRule } from '#/bangumi';
 import { ruleTemplate } from '#/bangumi';
 
-const { getAll } = useBangumiStore();
+/** v-model show */
 const show = defineModel('show', { default: false });
 
-const rss = ref('');
 const message = useMessage();
+const { getAll } = useBangumiStore();
+
+const rss = ref('');
 const rule = ref<BangumiRule>(ruleTemplate);
+
 const analysis = reactive({
   loading: false,
   next: false,
 });
-
 const loading = reactive({
   collect: false,
   subscribe: false,
@@ -32,10 +34,11 @@ async function analysisRss() {
   if (rss.value === '') {
     message.error('Please enter the RSS link!');
   } else {
-    analysis.loading = true;
-
     try {
+      analysis.loading = true;
       const data = await apiDownload.analysis(rss.value);
+      analysis.loading = false;
+
       rule.value = data;
       analysis.next = true;
       console.log('rule', data);
@@ -44,8 +47,6 @@ async function analysisRss() {
       message.error(err.status);
       console.log('error', err);
     }
-
-    analysis.loading = false;
   }
 }
 
@@ -55,6 +56,7 @@ async function collect() {
       loading.collect = true;
       const res = await apiDownload.collection(rule.value);
       loading.collect = false;
+
       if (res) {
         message.success('Collect Success!');
         getAll();

From 74f8dcdf8351a30e4581572ad8d5a49f83e0843d Mon Sep 17 00:00:00 2001
From: Rewrite0 <y747556795@gmail.com>
Date: Thu, 10 Aug 2023 12:13:04 +0800
Subject: [PATCH 7/8] feat: omit function

---
 webui/src/utils/omit.test.ts | 22 ++++++++++++++++++++++
 webui/src/utils/omit.ts      | 12 ++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 webui/src/utils/omit.test.ts
 create mode 100644 webui/src/utils/omit.ts

diff --git a/webui/src/utils/omit.test.ts b/webui/src/utils/omit.test.ts
new file mode 100644
index 00000000..7748deaf
--- /dev/null
+++ b/webui/src/utils/omit.test.ts
@@ -0,0 +1,22 @@
+import { expect, it } from 'vitest';
+import { omit } from './omit';
+
+it('test omit', () => {
+  const obj = {
+    a: 1,
+    b: 2,
+    c: 3,
+    d: 4,
+  };
+
+  expect(omit(obj, ['a'])).toStrictEqual({
+    b: 2,
+    c: 3,
+    d: 4,
+  });
+
+  expect(omit(obj, ['b', 'c'])).toStrictEqual({
+    a: 1,
+    d: 4,
+  });
+});
diff --git a/webui/src/utils/omit.ts b/webui/src/utils/omit.ts
new file mode 100644
index 00000000..63d0b180
--- /dev/null
+++ b/webui/src/utils/omit.ts
@@ -0,0 +1,12 @@
+export function omit<T extends { [k: string]: any }>(
+  obj: T,
+  omitKeys: Array<keyof T>
+) {
+  return Object.keys(obj).reduce((acc, key) => {
+    if (omitKeys.includes(key)) {
+      return acc;
+    } else {
+      return { ...acc, [key]: obj[key] };
+    }
+  }, {});
+}

From 830ed99dfabaf3f08a92d926c0419e75812850e1 Mon Sep 17 00:00:00 2001
From: Rewrite0 <y747556795@gmail.com>
Date: Thu, 10 Aug 2023 12:15:45 +0800
Subject: [PATCH 8/8] feat: updateRule omit 'id'

---
 webui/src/api/bangumi.ts          | 6 ++++--
 webui/types/bangumi.ts            | 2 ++
 webui/types/dts/auto-imports.d.ts | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/webui/src/api/bangumi.ts b/webui/src/api/bangumi.ts
index 06c27c52..a5498ef6 100644
--- a/webui/src/api/bangumi.ts
+++ b/webui/src/api/bangumi.ts
@@ -1,4 +1,4 @@
-import type { BangumiRule } from '#/bangumi';
+import type { BangumiRule, BangumiUpdate } from '#/bangumi';
 import type { ApiSuccess } from '#/api';
 
 export const apiBangumi = {
@@ -32,9 +32,11 @@ export const apiBangumi = {
    * @returns axios 请求返回的数据
    */
   async updateRule(bangumiId: number, bangumiRule: BangumiRule) {
+    const rule = omit(bangumiRule, ['id']);
+
     const { data } = await axios.patch<ApiSuccess>(
       `api/v1/bangumi/update/${bangumiId}`,
-      bangumiRule
+      rule
     );
     return data;
   },
diff --git a/webui/types/bangumi.ts b/webui/types/bangumi.ts
index 933522f3..4ef32c7b 100644
--- a/webui/types/bangumi.ts
+++ b/webui/types/bangumi.ts
@@ -20,6 +20,8 @@ export interface BangumiRule {
   year: string | null;
 }
 
+export type BangumiUpdate = Omit<BangumiRule, 'id'>;
+
 export const ruleTemplate: BangumiRule = {
   added: false,
   deleted: false,
diff --git a/webui/types/dts/auto-imports.d.ts b/webui/types/dts/auto-imports.d.ts
index 3c5fa500..4fb511a6 100644
--- a/webui/types/dts/auto-imports.d.ts
+++ b/webui/types/dts/auto-imports.d.ts
@@ -70,6 +70,7 @@ declare global {
   const mapWritableState: typeof import('pinia')['mapWritableState']
   const markRaw: typeof import('vue')['markRaw']
   const nextTick: typeof import('vue')['nextTick']
+  const omit: typeof import('../../src/utils/omit')['omit']
   const onActivated: typeof import('vue')['onActivated']
   const onBeforeMount: typeof import('vue')['onBeforeMount']
   const onBeforeRouteLeave: typeof import('vue-router/auto')['onBeforeRouteLeave']