Revert "[Tech/UX] Allow for separate library refreshes (Heroic-Games-Launcher#1356)"

This reverts commit 37cdf7e.

Author: connercsbn

electron/main.ts

@@ -590,18 +590,10 @@ ipcMain.handle(
 
 /// IPC handlers begin here.
 
-ipcMain.handle('checkGameUpdates', async (event, library?: Runner) => {
-  switch (library) {
-    case 'legendary':
-      return LegendaryLibrary.get().listUpdateableGames()
-    case 'gog':
-      return GOGLibrary.get().listUpdateableGames()
-    default:
-      return [
-        ...(await LegendaryLibrary.get().listUpdateableGames()),
-        ...(await GOGLibrary.get().listUpdateableGames())
-      ]
-  }
+ipcMain.handle('checkGameUpdates', async () => {
+  const legendaryUpdates = await LegendaryLibrary.get().listUpdateableGames()
+  const gogUpdates = await GOGLibrary.get().listUpdateableGames()
+  return [...legendaryUpdates, ...gogUpdates]
 })
 
 ipcMain.handle('getEpicGamesStatus', async () => isEpicServiceOffline())
@@ -755,21 +747,11 @@ if (existsSync(installed)) {
   })
 }
 
-ipcMain.handle('refreshLibrary', async (e, fullRefresh, library?: Runner) => {
-  switch (library) {
-    case 'legendary':
-      await LegendaryLibrary.get().getGames('info', fullRefresh)
-      break
-    case 'gog':
-      await GOGLibrary.get().sync()
-      break
-    default:
-      await Promise.allSettled([
-        LegendaryLibrary.get().getGames('info', fullRefresh),
-        GOGLibrary.get().sync()
-      ])
-      break
-  }
+ipcMain.handle('refreshLibrary', async (e, fullRefresh) => {
+  await Promise.allSettled([
+    GOGLibrary.get().sync(),
+    LegendaryLibrary.get().getGames('info', fullRefresh)
+  ])
 })
 
 ipcMain.on('logError', (e, err) => logError(`${err}`, LogPrefix.Frontend))

src/components/UI/ActionIcons/index.tsx

@@ -15,18 +15,15 @@ import { useTranslation } from 'react-i18next'
 import ContextProvider from 'src/state/ContextProvider'
 import FormControl from '../FormControl'
 import './index.css'
-import { Runner } from 'src/types'
 
 interface Props {
   sortDescending: boolean
   sortInstalled: boolean
   toggleSortDescending: () => void
   toggleSortinstalled: () => void
-  library: Runner
 }
 
 export default function ActionIcons({
-  library,
   sortDescending,
   toggleSortDescending,
   sortInstalled,
@@ -88,8 +85,7 @@ export default function ActionIcons({
             refreshLibrary({
               checkForUpdates: true,
               fullRefresh: true,
-              runInBackground: false,
-              library
+              runInBackground: false
             })
           }
         >

src/screens/Game/GameSubMenu/index.tsx

@@ -79,7 +79,7 @@ export default function GamesSubmenu({
       })
       if (path) {
         await renderer.invoke('changeInstallPath', [appName, path, runner])
-        await refresh(runner)
+        await refresh()
       }
       return
     }

src/screens/Library/index.tsx

@@ -105,7 +105,6 @@ export default function Library(): JSX.Element {
           sortDescending={sortDescending}
           toggleSortDescending={() => handleSortDescending()}
           sortInstalled={sortInstalled}
-          library={category === 'epic' ? 'legendary' : 'gog'}
           toggleSortinstalled={() => handleSortInstalled()}
         />
       </div>

src/state/GlobalState.tsx

@@ -8,7 +8,6 @@ import {
   InstalledInfo,
   LibraryTopSectionOptions,
   RefreshOptions,
-  Runner,
   WineVersionInfo
 } from 'src/types'
 import { TFunction, withTranslation } from 'react-i18next'
@@ -233,13 +232,12 @@ export class GlobalState extends PureComponent<Props> {
     this.setState({ libraryTopSection: value })
   }
 
-  handleSuccessfulLogin = (runner: Runner) => {
+  handleSuccessfulLogin = (runner: 'epic' | 'gog') => {
     this.handleFilter('all')
     this.handleCategory(runner)
     this.refreshLibrary({
       fullRefresh: true,
-      runInBackground: false,
-      library: runner
+      runInBackground: false
     })
   }
 
@@ -255,7 +253,7 @@ export class GlobalState extends PureComponent<Props> {
         }
       })
 
-      this.handleSuccessfulLogin('legendery' as Runner)
+      this.handleSuccessfulLogin('epic')
     }
 
     return response.status
@@ -291,7 +289,7 @@ export class GlobalState extends PureComponent<Props> {
     window.location.reload()
   }
 
-  refresh = async (library?: Runner, checkUpdates?: boolean): Promise<void> => {
+  refresh = async (checkUpdates?: boolean): Promise<void> => {
     console.log('refreshing')
 
     let updates = this.state.gameUpdates
@@ -311,7 +309,7 @@ export class GlobalState extends PureComponent<Props> {
 
     try {
       updates = checkUpdates
-        ? await ipcRenderer.invoke('checkGameUpdates', library)
+        ? await ipcRenderer.invoke('checkGameUpdates')
         : this.state.gameUpdates
     } catch (error) {
       ipcRenderer.send('logError', error)
@@ -340,8 +338,7 @@ export class GlobalState extends PureComponent<Props> {
   refreshLibrary = async ({
     checkForUpdates,
     fullRefresh,
-    runInBackground = true,
-    library = undefined
+    runInBackground = true
   }: RefreshOptions): Promise<void> => {
     if (this.state.refreshing) return
 
@@ -351,11 +348,11 @@ export class GlobalState extends PureComponent<Props> {
     })
     ipcRenderer.send('logInfo', 'Refreshing Library')
     try {
-      await ipcRenderer.invoke('refreshLibrary', fullRefresh, library)
+      await ipcRenderer.invoke('refreshLibrary', fullRefresh)
     } catch (error) {
       ipcRenderer.send('logError', error)
     }
-    this.refresh(library, checkForUpdates)
+    this.refresh(checkForUpdates)
   }
 
   refreshWineVersionInfo = async (fetch: boolean): Promise<void> => {
@@ -410,8 +407,7 @@ export class GlobalState extends PureComponent<Props> {
     appName,
     status,
     folder,
-    progress,
-    runner
+    progress
   }: GameStatus) => {
     const { libraryStatus, gameUpdates } = this.state
     const currentApp = libraryStatus.filter(
@@ -444,8 +440,7 @@ export class GlobalState extends PureComponent<Props> {
         // This avoids calling legendary again before the previous process is killed when canceling
         this.refreshLibrary({
           checkForUpdates: true,
-          runInBackground: true,
-          library: runner
+          runInBackground: true
         })
 
         storage.setItem(
@@ -459,7 +454,7 @@ export class GlobalState extends PureComponent<Props> {
         })
       }
 
-      this.refreshLibrary({ runInBackground: true, library: runner })
+      this.refreshLibrary({ runInBackground: true })
       this.setState({ libraryStatus: newLibraryStatus })
     }
   }

src/types.ts

@@ -70,7 +70,7 @@ export interface ContextType {
   libraryTopSection: string
   handleLibraryTopSection: (value: LibraryTopSectionOptions) => void
   platform: NodeJS.Platform | string
-  refresh: (library: Runner, checkUpdates?: boolean) => Promise<void>
+  refresh: (checkUpdates?: boolean) => Promise<void>
   refreshLibrary: (options: RefreshOptions) => Promise<void>
   refreshWineVersionInfo: (fetch: boolean) => void
   refreshing: boolean
@@ -267,7 +267,6 @@ export interface Path {
 export type RefreshOptions = {
   checkForUpdates?: boolean
   fullRefresh?: boolean
-  library?: Runner
   runInBackground?: boolean
 }