[fix] no proxy used when downloading in viewer.

MarkPoloChina · Feb 8, 2024 · 85a3af5 · 85a3af5
1 parent f8488a5
commit 85a3af5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -316,8 +316,8 @@ function afterReady() {
     return await FS.loadStringFromFile(filename)
   })
 
-  ipcMain.handle('ds:download', async (event, url, filename, dir) => {
-    await DS.downloadAndSave(url, filename, dir)
+  ipcMain.handle('ds:download', async (event, url, filename, dir, isPixiv) => {
+    await DS.downloadAndSave(url, filename, dir, isPixiv)
   })
   ipcMain.handle('ds:downloadPixiv', async (event, illustObj, dir, page) => {
     await DS.downloadFromIllustObj(illustObj, dir, page)

diff --git a/src/main/node-processor/DownloadService.ts b/src/main/node-processor/DownloadService.ts
@@ -53,9 +53,10 @@ export class DS {
     url: string,
     filename: string,
     dir: string,
+    isPixiv?: boolean,
   ): Promise<void> {
     if (!await FS.isExists(path.join(dir, filename)))
-      await FS.saveArrayBufferTo(await this.downloadFromUrl(url), filename, dir)
+      await FS.saveArrayBufferTo(await this.downloadFromUrl(url, isPixiv), filename, dir)
   }
 
   public static async downloadFromIllustObj(

diff --git a/src/preload/index.d.ts b/src/preload/index.d.ts
@@ -17,7 +17,7 @@ declare global {
         params: any,
         body: any
       ): Promise<any>;
-      downloadTo(url: string, rename: string, dir: string): Promise<void>;
+      downloadTo(url: string, rename: string, dir: string, isPixiv?: boolean): Promise<void>;
       downloadPixivTo(illustObj: PixivIllust, dir: string, page?: number): Promise<void>;
       downloadPixivUgoiraTo(illustObj: PixivIllust, dir: string, meta: UgoiraMetaData): Promise<void>;
     };

diff --git a/src/preload/index.ts b/src/preload/index.ts
@@ -34,8 +34,8 @@ contextBridge.exposeInMainWorld('electron', {
   ): Promise<any> => ipcRenderer.invoke(`api:${method}${url}`, params, body),
 
   // downloader
-  downloadTo: (url: string, rename: string, dir: string): Promise<void> =>
-    ipcRenderer.invoke('ds:download', url, rename, dir),
+  downloadTo: (url: string, rename: string, dir: string, isPixiv = false): Promise<void> =>
+    ipcRenderer.invoke('ds:download', url, rename, dir, isPixiv),
 
   downloadPixivTo: (illustObj: PixivIllust, dir: string, page?: number): Promise<void> =>
     ipcRenderer.invoke('ds:downloadPixiv', illustObj, dir, page),

diff --git a/src/render/components/icxorViewer/viewerMain.vue b/src/render/components/icxorViewer/viewerMain.vue
@@ -291,6 +291,7 @@ async function handleDownload() {
         ? PathHelper.getBasename(url)
         : currentOperating.value.remote_endpoint,
       dir,
+      url.includes('i.pximg.net'),
     )
     ElMessage.success('下载完成')
   }
@@ -328,6 +329,7 @@ async function handleDownloadBatch() {
           ? PathHelper.getBasename(url)
           : obj.remote_endpoint,
         dir,
+        url.includes('i.pximg.net'),
       )
     }
     catch (err) {

diff --git a/src/render/ts/util/path.ts b/src/render/ts/util/path.ts
@@ -42,7 +42,7 @@ export class PathHelper {
 }
 
 export class UrlGenerator {
-  static getBlobUrl(obj: IllustObj, type: 'original' | 'medium' | 'large' | 'square_medium' | 's_large' = 'original') {
+  static getBlobUrl(obj: IllustObj, type: 'original' | 'medium' | 'large' | 'square_medium' | 's_large' = 'original'): string {
     if (!serverMode && obj.remote_base.type !== 'cos')
       return this.getBlobUrlLocal(obj, type)
     if (obj.remote_base.type === 'pixiv') {
@@ -100,7 +100,7 @@ export class UrlGenerator {
     }
   }
 
-  static getBlobUrlLocal(obj: IllustObj, type: 'original' | 'medium' | 'large' | 'square_medium' | 's_large' = 'original') {
+  static getBlobUrlLocal(obj: IllustObj, type: 'original' | 'medium' | 'large' | 'square_medium' | 's_large' = 'original'): string {
     if (obj.remote_base.type === 'pixiv') {
       if (type === 'original' || type === 's_large') {
         if (obj.remote_endpoint && local_base_map[obj.remote_base.name]?.original)