[UX] Improve Download Toast

src/backend/__tests__/utils.test.ts

@@ -1,18 +1,8 @@
 import axios from 'axios'
 import { app } from 'electron'
-import { extractZip } from '../../backend/utils'
-import { logError } from '../logger/logger'
 import * as utils from '../utils'
 import { test_data } from './test_data/github-api-heroic-test-data.json'
-import path from 'path'
-import {
-  copyFileSync,
-  existsSync,
-  readFileSync,
-  rmSync,
-  rmdirSync,
-  renameSync
-} from 'graceful-fs'
+import { logError } from '../logger/logger'
 
 jest.mock('electron')
 jest.mock('../logger/logger')
@@ -257,59 +247,4 @@ describe('backend/utils.ts', () => {
       expect(utils.bytesToSize(2059 * 1024 * 3045 * 4000)).toEqual('23.36 TB')
     })
   })
-
-  describe('extractZip', () => {
-    let testCopyZipPath: string
-    let destFilePath: string
-
-    beforeEach(() => {
-      const testZipPath = path.resolve('./src/backend/__mocks__/test.zip')
-      //copy zip because extract will delete it
-      testCopyZipPath = path.resolve('./src/backend/__mocks__/test2.zip')
-      copyFileSync(testZipPath, testCopyZipPath)
-      destFilePath = path.resolve('./src/backend/__mocks__/test')
-    })
-
-    afterEach(async () => {
-      const extractPromise = utils.extractZip(testCopyZipPath, destFilePath)
-      await extractPromise
-      expect(extractPromise).resolves
-
-      const testTxtFilePath = path.resolve(destFilePath, './test.txt')
-      console.log('checking dest file path ', testTxtFilePath)
-      expect(existsSync(testTxtFilePath)).toBe(true)
-
-      const testMessage = readFileSync(testTxtFilePath).toString()
-      console.log('unzipped file contents: ', testMessage)
-      expect(testMessage).toEqual('this is a test message')
-
-      //extract deletes the zip file used to extract async so we wait and then check
-      await utils.wait(100)
-      expect(existsSync(testCopyZipPath)).toBe(false)
-
-      //clean up test
-      rmSync(testTxtFilePath)
-      rmdirSync(destFilePath)
-      expect(existsSync(testTxtFilePath)).toBe(false)
-      expect(existsSync(destFilePath)).toBe(false)
-    })
-
-    test('extract a normal test zip', async () => {
-      console.log('extracting test.zip')
-    })
-
-    test('extract a test zip with non ascii characters', async () => {
-      const renamedZipFilePath = path.resolve(
-        './src/backend/__mocks__/谷���新道ひばりヶ�.zip'
-      )
-      renameSync(testCopyZipPath, renamedZipFilePath)
-      testCopyZipPath = renamedZipFilePath
-    })
-
-    it('should throw an error if the zip file does not exist', async () => {
-      await expect(
-        extractZip('nonexistent.zip', destFilePath)
-      ).rejects.toThrow()
-    })
-  })
 })

src/backend/api/downloadmanager.ts

@@ -78,6 +78,9 @@ export const handleDMQueueInformation = (
 export const cancelDownload = (removeDownloaded: boolean) =>
   ipcRenderer.send('cancelDownload', removeDownloaded)
 
+export const cancelExtraction = (appName: string) =>
+  ipcRenderer.send('cancelExtraction', appName)
+
 export const resumeCurrentDownload = () =>
   ipcRenderer.send('resumeCurrentDownload')
 

src/backend/downloadmanager/downloadqueue.ts

@@ -188,6 +188,23 @@ function getQueueInformation() {
   return { elements, finished, state: queueState }
 }
 
+function cancelQueueExtraction() {
+  if (currentElement) {
+    if (Array.isArray(currentElement.params.installDlcs)) {
+      const dlcsToRemove = currentElement.params.installDlcs
+      for (const dlc of dlcsToRemove) {
+        removeFromQueue(dlc)
+      }
+    }
+    if (isRunning()) {
+      stopCurrentDownload()
+    }
+    removeFromQueue(currentElement.params.appName)
+
+    currentElement = null
+  }
+}
+
 function cancelCurrentDownload({ removeDownloaded = false }) {
   if (currentElement) {
     if (Array.isArray(currentElement.params.installDlcs)) {
@@ -255,8 +272,6 @@ function processNotification(element: DMQueueElement, status: DMStatus) {
     element.params.appName
   )
 
-  console.log('processNotification', status)
-
   if (status === 'abort') {
     if (isPaused()) {
       logWarning(
@@ -320,6 +335,7 @@ export {
   removeFromQueue,
   getQueueInformation,
   cancelCurrentDownload,
+  cancelQueueExtraction,
   pauseCurrentDownload,
   resumeCurrentDownload,
   getFirstQueueElement

src/backend/downloadmanager/ipc_handler.ts

@@ -7,6 +7,7 @@ import {
   removeFromQueue,
   resumeCurrentDownload
 } from './downloadqueue'
+import { cancelExtraction } from 'backend/storeManagers/hyperplay/games'
 
 ipcMain.handle('addToDMQueue', async (e, element) => {
   await addToQueue(element)
@@ -26,4 +27,8 @@ ipcMain.on('cancelDownload', (e, removeDownloaded) => {
   cancelCurrentDownload({ removeDownloaded })
 })
 
+ipcMain.on('cancelExtraction', (e, appName: string) => {
+  cancelExtraction(appName)
+})
+
 ipcMain.handle('getDMQueueInformation', getQueueInformation)