fix(monkey): 可以选择不导出关注列表

Chilfish · Apr 21, 2024 · 05b9345 · 05b9345
1 parent 8a7f683
commit 05b9345
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 25 deletions.
diff --git a/apps/cli/src/config.ts b/apps/cli/src/config.ts
@@ -18,10 +18,6 @@ export type Config = Omit<FetchOptions, 'name'> & {
    * @default ~/weibo-archiver/
    */
   savePath: string
-  /**
-   * 只爬取微博
-   */
-  weiboOnly: boolean
 }
 
 export async function getConfig(

diff --git a/apps/monkey/src/Config.vue b/apps/monkey/src/Config.vue
@@ -80,11 +80,22 @@ const dateRange = computed({
         重置为所有微博
       </button>
     </div>
-    <n-checkbox
-      v-model:checked="config.followingsOnly"
-      label="只导出关注列表"
-      size="small"
-    />
+
+    <div>
+      <n-checkbox
+        v-if="!config.weiboOnly"
+        v-model:checked="config.followingsOnly"
+        label="只导出关注列表"
+        size="small"
+      />
+      <n-checkbox
+        v-if="!config.followingsOnly"
+        v-model:checked="config.weiboOnly"
+        label="只导出微博"
+        size="small"
+      />
+    </div>
+
     <div
       v-show="config.hasComment"
       class="flex items-center gap-4"

diff --git a/apps/monkey/src/Ctrl.vue b/apps/monkey/src/Ctrl.vue
@@ -28,12 +28,15 @@ const { pause, start } = fetchPosts({
   }),
   setTotal: total => postStore.total = total,
   onFinish: async () => {
-    message.success('获取完毕~，正在获取关注列表')
-    isFetchingFollowings.value = true
-    await fetchFollowings(
-      config.value.uid,
-      async data => postStore.addFollowings(data),
-    )
+    if (!config.value.weiboOnly) {
+      message.success('获取完毕~，正在获取关注列表')
+      isFetchingFollowings.value = true
+      await fetchFollowings(
+        config.value.uid,
+        async data => postStore.addFollowings(data),
+      )
+    }
+
     await postStore.exportDatas()
 
     isStart.value = false

diff --git a/apps/monkey/src/stores/configStore.ts b/apps/monkey/src/stores/configStore.ts
@@ -27,6 +27,7 @@ export const useConfigStore = defineStore('config', () => {
     hasFavorite: true,
     commentCount: 6,
     followingsOnly: false,
+    weiboOnly: false,
     startAt: now,
     endAt: now,
   }

diff --git a/apps/monkey/src/stores/postStore.ts b/apps/monkey/src/stores/postStore.ts
@@ -105,13 +105,15 @@ export const usePostStore = defineStore('post', () => {
     const posts = await getAll()
     console.log('导出的数量：', posts.length)
 
-    const followings = await idb.value.getFollowings()
+    const followings = config.value.weiboOnly
+      ? []
+      : await idb.value.getFollowings()
 
     const res = await exportData(posts, userInfo.value, followings)
     if (!res)
       return
     const scripts = 'https://github.com/Chilfish/Weibo-archiver/raw/monkey/scripts.zip'
-    saveAs(scripts, 'scripts.zip')
+    saveAs(scripts, 'weibo-archiver-scripts.zip')
   }
 
   return {

diff --git a/packages/shared/src/services/userService.ts b/packages/shared/src/services/userService.ts
@@ -95,14 +95,20 @@ export async function getMyFollowings(
 }
 
 export async function isMe(uid: string) {
-  const [withoutUid, withUid] = await Promise.all([
-    weiFetch('/profile/detail'),
-    weiFetch('/profile/detail', {
-      params: { uid },
-    }),
-  ])
-
-  return withUid.data.created_at === withoutUid.data.created_at
+  try {
+    const [withoutUid, withUid] = await Promise.all([
+      weiFetch('/profile/detail'),
+      weiFetch('/profile/detail', {
+        params: { uid },
+      }),
+    ])
+
+    return withUid.data.created_at === withoutUid.data.created_at
+  }
+  catch (e) {
+    console.error('isMe error', e)
+    return false
+  }
 }
 
 export async function fetchFollowings(

diff --git a/packages/shared/src/types/config.ts b/packages/shared/src/types/config.ts
@@ -71,6 +71,11 @@ export interface FetchOptions {
    */
   cookie?: string
 
+  /**
+   * 只爬取微博
+   */
+  weiboOnly: boolean
+
   /**
    * 保存帖子
    */