downloading and extracting

src/ui/Mods.css

@@ -3,3 +3,17 @@
   height: 90%;
   width: 100%;
 }
+
+/* Stuff for the top bar progress bar */
+.TopDownloads {
+  position: absolute;
+  top: 10px;
+  left: 35.5%;
+
+  width: 30%;
+}
+
+.TopDownloads .ProgressBar {
+  width: 100%;
+  height: 10px;
+}

src/ui/Mods.tsx

@@ -1,6 +1,9 @@
 import React from 'react'
 import DownloadHandler from '../utils/download'
-import { ModData } from '../utils/gamebanana'
+import { getModDownload, ModData } from '../utils/gamebanana'
+import { getModsFolder } from '../utils/mods'
+import { unzip } from '../utils/zipUtils'
+import ProgressBar from './components/common/MainProgressBar'
 import { ModHeader } from './components/mods/ModHeader'
 import { ModList } from './components/mods/ModList'
 import TopBar from './components/TopBar'
@@ -40,7 +43,12 @@ export class Mods extends React.Component<IProps, IState> {
       category: '',
     }
 
+    setInterval(() => {
+      console.log(this.props.downloadHandler.downloads)
+    }, 5000)
+
     this.setCategory = this.setCategory.bind(this)
+    this.addDownload = this.addDownload.bind(this)
   }
 
   async componentDidMount() {
@@ -49,6 +57,22 @@ export class Mods extends React.Component<IProps, IState> {
 
   async addDownload(mod: ModData) {
     console.log('Downloading:', mod.name)
+
+    const modFolder = await getModsFolder()
+    const modPath = `${modFolder}${mod.id}.zip`
+    const dlLinks = await getModDownload(String(mod.id))
+
+    if (!modFolder || dlLinks.length === 0) return
+
+    // Not gonna bother allowing sorting for now
+    const firstLink = dlLinks[0].downloadUrl
+
+    this.props.downloadHandler.addDownload(firstLink, modPath, async () => {
+      console.log('Unzipping:', mod.name)
+      unzip(modPath, modFolder, false, () => {
+        console.log('DONE MOD DOWNLOAD')
+      })
+    })
   }
 
   async setCategory(value: string) {
@@ -65,6 +89,10 @@ export class Mods extends React.Component<IProps, IState> {
       <div className="Mods">
         <TopBar />
 
+        <div className="TopDownloads">
+          <ProgressBar downloadManager={this.props.downloadHandler} />
+        </div>
+
         <ModHeader onChange={this.setCategory} headers={headers} defaultHeader={'ripe'} />
 
         <ModList key={this.state.category} mode={this.state.category} addDownload={this.addDownload} />

src/ui/components/TopBar.tsx

@@ -1,13 +1,12 @@
 import React from 'react'
 import { app } from '@tauri-apps/api'
 import { appWindow } from '@tauri-apps/api/window'
-import closeIcon from '../../resources/icons/close.svg'
-import minIcon from '../../resources/icons/min.svg'
-
+import { getConfig, setConfigOption } from '../../utils/configuration'
 import Tr from '../../utils/language'
 
 import './TopBar.css'
-import { getConfig, setConfigOption } from '../../utils/configuration'
+import closeIcon from '../../resources/icons/close.svg'
+import minIcon from '../../resources/icons/min.svg'
 
 interface IProps {
   children?: React.ReactNode[]

src/ui/components/common/MainProgressBar.tsx

@@ -5,6 +5,7 @@ import './ProgressBar.css'
 
 interface IProps {
   downloadManager: DownloadHandler
+  withStats?: boolean
 }
 
 interface IState {
@@ -70,11 +71,13 @@ export default class ProgressBar extends React.Component<IProps, IState> {
           ></div>
         </div>
 
-        <div className="MainProgressText">
-          <Tr text="main.files_downloading" /> {this.state.files} ({this.state.speed})
-          <br />
-          <Tr text="main.files_extracting" /> {this.state.extracting}
-        </div>
+        {this.props.withStats && (
+          <div className="MainProgressText">
+            <Tr text="main.files_downloading" /> {this.state.files} ({this.state.speed})
+            <br />
+            <Tr text="main.files_extracting" /> {this.state.extracting}
+          </div>
+        )}
       </div>
     )
   }

src/ui/components/menu/Downloads.tsx

@@ -112,7 +112,7 @@ export default class Downloads extends React.Component<IProps, IState> {
   async downloadGrasscutterStableRepo() {
     const folder = await this.getGrasscutterFolder()
     this.props.downloadManager.addDownload(STABLE_REPO_DOWNLOAD, folder + '\\grasscutter_repo.zip', () => {
-      unzip(folder + '\\grasscutter_repo.zip', folder + '\\', this.toggleButtons)
+      unzip(folder + '\\grasscutter_repo.zip', folder + '\\', true, this.toggleButtons)
     })
 
     this.toggleButtons()
@@ -121,7 +121,7 @@ export default class Downloads extends React.Component<IProps, IState> {
   async downloadGrasscutterDevRepo() {
     const folder = await this.getGrasscutterFolder()
     this.props.downloadManager.addDownload(DEV_REPO_DOWNLOAD, folder + '\\grasscutter_repo.zip', () => {
-      unzip(folder + '\\grasscutter_repo.zip', folder + '\\', this.toggleButtons)
+      unzip(folder + '\\grasscutter_repo.zip', folder + '\\', true, this.toggleButtons)
     })
 
     this.toggleButtons()
@@ -130,7 +130,7 @@ export default class Downloads extends React.Component<IProps, IState> {
   async downloadGrasscutterStable() {
     const folder = await this.getGrasscutterFolder()
     this.props.downloadManager.addDownload(STABLE_DOWNLOAD, folder + '\\grasscutter.zip', () => {
-      unzip(folder + '\\grasscutter.zip', folder + '\\', this.toggleButtons)
+      unzip(folder + '\\grasscutter.zip', folder + '\\', true, this.toggleButtons)
     })
 
     // Also add repo download
@@ -142,7 +142,7 @@ export default class Downloads extends React.Component<IProps, IState> {
   async downloadGrasscutterLatest() {
     const folder = await this.getGrasscutterFolder()
     this.props.downloadManager.addDownload(DEV_DOWNLOAD, folder + '\\grasscutter.zip', () => {
-      unzip(folder + '\\grasscutter.zip', folder + '\\', this.toggleButtons)
+      unzip(folder + '\\grasscutter.zip', folder + '\\', true, this.toggleButtons)
     })
 
     // Also add repo download
@@ -165,7 +165,7 @@ export default class Downloads extends React.Component<IProps, IState> {
         })
       }
 
-      await unzip(folder + '\\resources.zip', folder + '\\', () => {
+      await unzip(folder + '\\resources.zip', folder + '\\', true, () => {
         // Rename folder to resources
         invoke('rename', {
           path: folder + '\\Resources',

src/ui/components/menu/Game.tsx

@@ -46,7 +46,7 @@ export default class Downloads extends React.Component<IProps, IState> {
   async downloadGame() {
     const folder = this.state.gameDownloadFolder
     this.props.downloadManager.addDownload(GAME_DOWNLOAD, folder + '\\game.zip', () => {
-      unzip(folder + '\\game.zip', folder + '\\', () => {
+      unzip(folder + '\\game.zip', folder + '\\', true, () => {
         this.setState({
           gameDownloading: false,
         })

src/ui/components/mods/ModList.tsx

@@ -24,8 +24,6 @@ export class ModList extends React.Component<IProps, IState> {
   constructor(props: IProps) {
     super(props)
 
-    console.log('Getting')
-
     this.state = {
       modList: null,
       installedList: null,