downloading and extracting

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,