fix: error for href in /s/

dotennin · Jul 25, 2020 · 2cd2f90 · 2cd2f90
1 parent 114aff3
commit 2cd2f90
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 13 deletions.
diff --git a/dist/bundle.user.js b/dist/bundle.user.js
diff --git a/dist/react-userscripts-dev.user.js b/dist/react-userscripts-dev.user.js
@@ -13,6 +13,7 @@
 // @include https://yun.baidu.com/disk/*
 // @include https://pan.baidu.com/s/*
 // @include https://yun.baidu.com/s/*
+// @include https://pan.baidu.com/share/*
 // @connect baidu.com
 // @connect localhost
 // @connect qdall01.baidupcs.com

diff --git a/src/containers/FloatingButtons.tsx b/src/containers/FloatingButtons.tsx
@@ -15,6 +15,9 @@ const mapStoreToProps = (store: IStoreState) => ({
 const FloatingButtons: React.FC<ReturnType<typeof mapStoreToProps>> = ({ autoStart, downloadable }) => {
   const dispatch = useDispatch()
   const { downloadItems } = useSelector((state: IStoreState) => state.download)
+  if (/pan.baidu.com\/share/.test(window.location.href)) {
+    return null
+  }
   return (
     <div id="container-floating">
       <div

diff --git a/src/modules/downloadModule.ts b/src/modules/downloadModule.ts
@@ -87,7 +87,7 @@ export const fetchItem = (item: ItemProxy): AppThunk => async (dispatch, getStat
     dispatch(addNextDownloadRequest())
   } catch (err) {
     dispatch(downloadModule.actions.failureDownload())
-    dispatch(interfaceModule.actions.setError(err))
+    dispatch(interfaceModule.actions.setError(err instanceof Error ? err : new Error(JSON.stringify(err))))
     dispatch(addNextDownloadRequest())
   }
 }

diff --git a/src/services/InstaceForSystem.ts b/src/services/InstaceForSystem.ts
@@ -15,10 +15,14 @@ const InstanceForSystem = {
     eval(`require('base:widget/tools/service/tools.format.js').toFriendlyFileSize(${size})`),
   maxDownloadCount: 2,
   allDownloads: {} as ItemObject,
-  fileManagerApi: eval(
-    `require("disk-system:widget/system/fileService/fileManagerApi/fileManagerApi.js")`
-  ) as IInstance['fileManagerApi'],
-  listInit: eval(`require("disk-system:widget/pageModule/list/listInit.js")`) as IInstance['listInit'],
+  fileManagerApi:
+    /pan.baidu.com\/disk/.test(window.location.href) &&
+    (eval(
+      `require("disk-system:widget/system/fileService/fileManagerApi/fileManagerApi.js")`
+    ) as IInstance['fileManagerApi']),
+  listInit:
+    /pan.baidu.com\/disk/.test(window.location.href) &&
+    (eval(`require("disk-system:widget/pageModule/list/listInit.js")`) as IInstance['listInit']),
   listInstance: eval(
     `require("system-core:context/context.js").instanceForSystem.listInstance`
   ) as IInstance['listInstance'],

diff --git a/src/services/api.ts b/src/services/api.ts
@@ -109,8 +109,9 @@ export function createPrivateShareLink<
     shareid: number
     shorturl: string
   }
->(): Promise<R> {
-  const { list, jquery } = InstanceForSystem
+>(fidList: ItemProxy['fsId'][]): Promise<R> {
+  const { jquery } = InstanceForSystem
+  // fidList = InstanceForSystem.list.getSelected().map((l) => l.fs_id)
   return new Promise((resolve, reject) => {
     jquery
       .post(
@@ -120,7 +121,7 @@ export function createPrivateShareLink<
           channel_list: '[]',
           period: 7,
           pwd: 'qqqq',
-          fid_list: jquery.stringify(list.getSelected().map((l) => l.fs_id)),
+          fid_list: jquery.stringify(fidList),
         },
         function(r: R) {
           resolve(r)
@@ -133,7 +134,7 @@ export function createPrivateShareLink<
 }
 
 export async function getDirectLink() {
-  const shareLinkRes = await createPrivateShareLink()
+  const shareLinkRes = await createPrivateShareLink([])
   return await (
     await fetch(
       `https://pan.dotennin.net/?link=${encodeURI(shareLinkRes.shorturl)}%20%E6%8F%90%E5%8F%96%E7%A0%81:%20qqqq`

diff --git a/user-script.js b/user-script.js
@@ -15,6 +15,7 @@ module.exports = `// ==UserScript==
 // @include https://yun.baidu.com/disk/*
 // @include https://pan.baidu.com/s/*
 // @include https://yun.baidu.com/s/*
+// @include https://pan.baidu.com/share/*
 // @connect baidu.com
 // @connect qdall01.baidupcs.com
 // @grant GM_xmlhttpRequest