From a83743c8d515e6ff8b3dda33d06b86aadbf0c492 Mon Sep 17 00:00:00 2001
From: Flavio Lima <flavioislima@gmail.com>
Date: Thu, 28 Jan 2021 18:42:41 +0100
Subject: [PATCH] feat: added option to move games to another folder

---
 electron/main.ts                     | 38 ++++++++++++++++++++++++++--
 electron/utils.ts                    | 20 +++++++--------
 package-lock.json                    |  8 +++---
 package.json                         |  2 +-
 src/components/GamePage/GamePage.tsx | 38 +++++++++++++++++++++++-----
 src/components/UI/GameCard.tsx       |  7 +++--
 src/state/GlobalState.tsx            | 17 ++++++++++++-
 src/types.ts                         |  1 +
 8 files changed, 103 insertions(+), 28 deletions(-)

diff --git a/electron/main.ts b/electron/main.ts
index a5b306af08..ddbb97f2a2 100644
--- a/electron/main.ts
+++ b/electron/main.ts
@@ -56,7 +56,7 @@ import {
 } from 'electron'
 import { AppSettings, Game, InstalledInfo, KeyImage } from './types.js'
 
-const { showMessageBox, showErrorBox } = dialog
+const { showMessageBox, showErrorBox, showOpenDialog } = dialog
 let mainWindow: BrowserWindow = null
 
 function createWindow() {
@@ -406,6 +406,40 @@ ipcMain.on('getLog', (event, appName) =>
   spawn('xdg-open', [`${heroicGamesConfigPath}/${appName}-lastPlay.log`])
 )
 
+const installed = `${legendaryConfigPath}/installed.json`
+
+ipcMain.handle('moveInstall', async (event, appName: string) => {
+  const { filePaths } = await showOpenDialog({
+    title: 'Choose where you want to move',
+    buttonLabel: 'Choose',
+    properties: ['openDirectory'],
+  })
+
+  if (filePaths[0]) {
+    // @ts-ignore
+    const file = JSON.parse(readFileSync(installed))
+    const installedGames: Game[] = Object.values(file)
+    const { install_path } = installedGames.filter(
+      (game) => game.app_name === appName
+    )[0]
+
+    const splitPath = install_path.split('/')
+    const installFolder = splitPath[splitPath.length - 1]
+    const newPath = `${filePaths[0]}/${installFolder}`
+    const game: Game = { ...file[appName], install_path: newPath }
+    const modifiedInstall = { ...file, [appName]: game }
+    return await execAsync(`mv -f ${install_path} ${newPath}`)
+      .then(() => {
+        console.log('moved')
+        writeFile(installed, JSON.stringify(modifiedInstall, null, 2), () =>
+          console.log('file updated')
+        )
+      })
+      .catch(console.log)
+  }
+  return
+})
+
 ipcMain.handle('readFile', async (event, file) => {
   const loggedIn = isLoggedIn()
 
@@ -413,7 +447,6 @@ ipcMain.handle('readFile', async (event, file) => {
     return { user: { displayName: null }, library: [] }
   }
 
-  const installed = `${legendaryConfigPath}/installed.json`
   const files: any = {
     // @ts-ignore
     user: loggedIn ? JSON.parse(readFileSync(userInfo)) : { displayName: null },
@@ -468,6 +501,7 @@ ipcMain.handle('readFile', async (event, file) => {
             const art_square = gameBoxTall ? gameBoxTall.url : fallBackImage
 
             const installedGames: Game[] = Object.values(files.installed)
+
             const isInstalled = Boolean(
               installedGames.filter((game) => game.app_name === app_name).length
             )
diff --git a/electron/utils.ts b/electron/utils.ts
index afcfe3b58e..57c7227b60 100644
--- a/electron/utils.ts
+++ b/electron/utils.ts
@@ -139,15 +139,14 @@ const launchGame = async (appName: any) => {
   prefix = isProton ? '' : `--wine-prefix ${winePrefix}`
 
   const options = {
-    fps: showFps ? ` DXVK_HUD=fps` : '',
-    audio: audioFix ? ` PULSE_LATENCY_MSEC=60` : '',
-    showMangohud: showMangohud ? ` MANGOHUD=1` : '',
-    proton: isProton ? ` STEAM_COMPAT_DATA_PATH=${winePrefix}` : '',
+    other: otherOptions ? otherOptions : '',
+    fps: showFps ? `DXVK_HUD=fps` : '',
+    audio: audioFix ? `PULSE_LATENCY_MSEC=60` : '',
+    showMangohud: showMangohud ? `MANGOHUD=1` : '',
+    proton: isProton ? `STEAM_COMPAT_DATA_PATH=${winePrefix}` : '',
   }
 
-  envVars = otherOptions
-    .concat(Object.values(options).join(''))
-    .replace(' ', '')
+  envVars = Object.values(options).join(' ')
   if (isProton) {
     console.log(
       `\n You are using Proton, this can lead to some bugs, 
@@ -305,10 +304,11 @@ async function getLatestDxvk() {
     'https://api.github.com/repos/lutris/dxvk/releases/latest'
   )
   const current = assets[0]
-  const name = current.name.replace('.tar.gz', '')
+  const pkg = current.name
+  const name = pkg.replace('.tar.gz', '')
   const downloadUrl = current.browser_download_url
 
-  const dxvkLatest = `${heroicToolsPath}/DXVK/${name}`
+  const dxvkLatest = `${heroicToolsPath}/DXVK/${pkg}`
   const pastVersionCheck = `${heroicToolsPath}/DXVK/latest_dxvk`
   let pastVersion = ''
 
@@ -388,7 +388,7 @@ const handleExit = async () => {
   if (existsSync(`${heroicGamesConfigPath}/lock`)) {
     const { response } = await showMessageBox({
       title: 'Exit',
-      message: 'Games are being download, are you sure?',
+      message: 'There are pending operations, are you sure?',
       buttons: ['NO', 'YES'],
     })
 
diff --git a/package-lock.json b/package-lock.json
index 27745602eb..7306730158 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "heroic",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "1.2.2",
+      "version": "1.3.0",
       "license": "GPL-3.0-only",
       "dependencies": {
         "axios": "^0.21.1",
@@ -20522,7 +20522,6 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz",
       "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==",
-      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -38876,8 +38875,7 @@
     "typescript": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz",
-      "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==",
-      "dev": true
+      "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg=="
     },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
diff --git a/package.json b/package.json
index d4ce8db43f..e6784dd7ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "heroic",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "private": true,
   "main": "public/main.js",
   "homepage": "./",
diff --git a/src/components/GamePage/GamePage.tsx b/src/components/GamePage/GamePage.tsx
index ef51611f7e..5f168c9edd 100644
--- a/src/components/GamePage/GamePage.tsx
+++ b/src/components/GamePage/GamePage.tsx
@@ -58,6 +58,7 @@ export default function GamePage() {
   const isPlaying = status === 'playing'
   const isUpdating = status === 'updating'
   const isReparing = status === 'repairing'
+  const isMoving = status === 'moving'
 
   useEffect(() => {
     const updateConfig = async () => {
@@ -145,6 +146,12 @@ export default function GamePage() {
                     >
                       Verify and Repair
                     </span>{' '}
+                    <span
+                      onClick={() => handleMoveInstall()}
+                      className="hidden link"
+                    >
+                      Move Game
+                    </span>{' '}
                     <span
                       onClick={() => ipcRenderer.send('getLog', appName)}
                       className="hidden link"
@@ -229,7 +236,7 @@ export default function GamePage() {
                           isInstalled || isInstalling ? '#0BD58C' : '#BD0A0A',
                       }}
                     >
-                      {getInstallLabel(isInstalled, isUpdating)}
+                      {getInstallLabel(isInstalled)}
                     </p>
                   </div>
                   {!isInstalled && !isInstalling && (
@@ -247,7 +254,7 @@ export default function GamePage() {
                     {isInstalled && (
                       <>
                         <button
-                          disabled={isReparing}
+                          disabled={isReparing || isMoving}
                           onClick={handlePlay()}
                           className={`button ${getPlayBtnClass()}`}
                         >
@@ -257,7 +264,9 @@ export default function GamePage() {
                     )}
                     <button
                       onClick={handleInstall(isInstalled)}
-                      disabled={isPlaying || isUpdating || isReparing}
+                      disabled={
+                        isPlaying || isUpdating || isReparing || isMoving
+                      }
                       className={`button ${getButtonClass(isInstalled)}`}
                     >
                       {`${getButtonLabel(isInstalled)}`}
@@ -296,15 +305,16 @@ export default function GamePage() {
     return isPlaying ? 'Playing (Stop)' : 'Play Now'
   }
 
-  function getInstallLabel(
-    isInstalled: boolean,
-    isUpdating: boolean
-  ): React.ReactNode {
+  function getInstallLabel(isInstalled: boolean): React.ReactNode {
     const { eta, percent } = progress
     if (isReparing) {
       return `Repairing Game ${percent ? `${percent}` : '...'}`
     }
 
+    if (isMoving) {
+      return `Moving Installation, please wait.`
+    }
+
     if (isUpdating && isInstalling) {
       return `Updating ${percent ? `${percent} | ETA: ${eta}` : '...'}`
     }
@@ -444,6 +454,20 @@ export default function GamePage() {
     }
   }
 
+  async function handleMoveInstall() {
+    const { response } = await showMessageBox({
+      title: 'Move Game Installation',
+      message: 'This can take a long time, are you sure?',
+      buttons: ['YES', 'NO'],
+    })
+    if (response === 0) {
+      handleGameStatus({ appName, status: 'moving' })
+      await ipcRenderer.invoke('moveInstall', appName)
+      handleGameStatus({ appName, status: 'done' })
+    }
+    return
+  }
+
   async function handleRepair(appName: string) {
     const { response } = await showMessageBox({
       title: 'Verify and Repair',
diff --git a/src/components/UI/GameCard.tsx b/src/components/UI/GameCard.tsx
index 1dd972821f..ab1512953b 100644
--- a/src/components/UI/GameCard.tsx
+++ b/src/components/UI/GameCard.tsx
@@ -29,8 +29,9 @@ const GameCard = ({ cover, title, appName, isInstalled, logo }: Card) => {
   )[0]
 
   const { status } = gameStatus || {}
-  const isInstalling =
-    status === 'installing' || status === 'updating' || status === 'repairing'
+  const isInstalling = status === 'installing' || status === 'updating'
+  const isReparing = status === 'repairing'
+  const isMoving = status === 'moving'
 
   useEffect(() => {
     const progressInterval = setInterval(() => {
@@ -58,6 +59,8 @@ const GameCard = ({ cover, title, appName, isInstalled, logo }: Card) => {
       }}
     >
       {isInstalling && <span className="progress">{percent}</span>}
+      {isMoving && <span className="progress">Moving...</span>}
+      {isReparing && <span className="progress">Repairing...</span>}
       {logo && (
         <img
           alt="logo"
diff --git a/src/state/GlobalState.tsx b/src/state/GlobalState.tsx
index 911f7335c1..785ad35b1d 100644
--- a/src/state/GlobalState.tsx
+++ b/src/state/GlobalState.tsx
@@ -78,7 +78,8 @@ export class GlobalState extends PureComponent<Props> {
           return (
             currentApp.status === 'installing' ||
             currentApp.status === 'repairing' ||
-            currentApp.status === 'updating'
+            currentApp.status === 'updating' ||
+            currentApp.status === 'moving'
           )
         })
       default:
@@ -191,6 +192,20 @@ export class GlobalState extends PureComponent<Props> {
       return currentWindow.reload()
     }
 
+    if (currentApp && currentApp.status === 'moving' && status === 'done') {
+      const updatedLibraryStatus = libraryStatus.filter(
+        (game) => game.appName !== appName
+      )
+      this.setState({ libraryStatus: updatedLibraryStatus })
+      notify([title, 'Finished Moving Installation'])
+
+      if (windowIsVisible) {
+        return this.refresh()
+      }
+
+      return currentWindow.reload()
+    }
+
     if (status === 'done') {
       const updatedLibraryStatus = libraryStatus.filter(
         (game) => game.appName !== appName
diff --git a/src/types.ts b/src/types.ts
index 0edbcfde3e..8aab42be3f 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -60,6 +60,7 @@ export interface GameStatus {
     | 'repairing'
     | 'done'
     | 'canceled'
+    | 'moving'
   progress?: number | null
 }