restore generator state when navigating back

Author: SilvVF

frontend/src/components/app-sidebar.tsx

@@ -13,7 +13,6 @@ import {
   SettingsIcon,
   SparkleIcon,
   Sun,
-  SwordIcon,
   TrainIcon,
   TrashIcon,
   WavesIcon,

frontend/src/screens/GameScreen.tsx

@@ -4,7 +4,7 @@ import { syncCharacters, SyncType } from "../data/sync";
 import { cn, useStateProducer } from "../lib/utils";
 import { type Pair } from "@/lib/tsutils";
 import { types } from "wailsjs/go/models";
-import { Reload } from "../../wailsjs/go/core/Generator";
+import * as Generator from "../../wailsjs/go/core/Generator";
 import * as Downloader from "../../wailsjs/go/core/Downloader";
 import {
   DisableAllModsByGame,
@@ -79,13 +79,8 @@ function GameScreen(props: { dataApi: DataApi; game: number }) {
     useMemo(() => getElementPref(props.game), [props.game])
   );
   const running = useDownloadStore(useShallow((state) => state.running));
-
   const refreshCharacters = () => setRefreshTrigger((prev) => prev + 1);
 
-  useEffect(() => {
-    refreshCharacters();
-  }, [running, updates]);
-
   const elements = useStateProducer<string[]>(
     [],
     async (update) => {
@@ -99,7 +94,7 @@ function GameScreen(props: { dataApi: DataApi; game: number }) {
     async (update) => {
       update(await props.dataApi.charactersWithModsAndTags());
     },
-    [props.dataApi, refreshTrigger]
+    [props.dataApi, running, updates, refreshTrigger]
   );
 
   const filteredCharacters = useMemo(() => {
@@ -323,11 +318,25 @@ function OverlayOptions({
 }: {
   dataApi: DataApi;
   dialog: GameDialog | undefined;
-  setDialog: (dialgo: GameDialog | undefined) => void;
+  setDialog: (dialog: GameDialog | undefined) => void;
   refreshCharacters: () => void;
 }) {
   const [reloading, setReloading] = useState(false);
   const [syncing, setSyncing] = useState(false);
+  // lazy way to restore the state of generating job TODO: maybe use events 
+  useEffect(() => {
+    dataApi.game().then((game) => {
+      Generator.IsRunning(game)
+        .then((reloading) => {
+          setReloading(reloading)
+          if (reloading) {
+            Generator
+              .AwaitCurrentJob(game)
+              .finally(() => setReloading(false))
+          }
+        })
+    })
+  }, [])
 
   const sync = (type: SyncType) => {
     setSyncing(true);
@@ -338,7 +347,7 @@ function OverlayOptions({
 
   const reload = async () => {
     setReloading(true);
-    Reload(await dataApi.game())
+    Generator.Reload(await dataApi.game())
       .finally(() => setReloading(false))
       .catch();
   };

frontend/wailsjs/go/core/Generator.d.ts

@@ -2,4 +2,8 @@
 // This file is automatically generated. DO NOT EDIT
 import {types} from '../models';
 
+export function AwaitCurrentJob(arg1:types.Game):Promise<void>;
+
+export function IsRunning(arg1:types.Game):Promise<boolean>;
+
 export function Reload(arg1:types.Game):Promise<void>;

frontend/wailsjs/go/core/Generator.js

@@ -2,6 +2,14 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT
 
+export function AwaitCurrentJob(arg1) {
+  return window['go']['core']['Generator']['AwaitCurrentJob'](arg1);
+}
+
+export function IsRunning(arg1) {
+  return window['go']['core']['Generator']['IsRunning'](arg1);
+}
+
 export function Reload(arg1) {
   return window['go']['core']['Generator']['Reload'](arg1);
 }

pkg/api/dapi.go

@@ -59,7 +59,7 @@ func CleanCache() {
 
 		log.LogDebug("keeping in httpcache: " + info.Name() + " " + info.ModTime().String())
 		remaining -= info.Size()
-		cf = append(cf, types.Pair[string, time.Time]{X: filePath, Y: info.ModTime()})
+		cf = append(cf, types.PairOf(filePath, info.ModTime()))
 
 		return nil
 	})

pkg/core/generator.go

@@ -23,7 +23,7 @@ import (
 type Generator struct {
 	db         *DbHelper
 	poolSize   int
-	cancelFns  map[types.Game]context.CancelFunc
+	cancelFns  map[types.Game]types.Pair[context.Context, context.CancelFunc]
 	wgMap      map[types.Game]*sync.WaitGroup
 	mutexMap   map[types.Game]*sync.Mutex
 	outputDirs map[types.Game]pref.Preference[string]
@@ -41,11 +41,11 @@ func NewGenerator(
 	return &Generator{
 		db:       db,
 		poolSize: 4,
-		cancelFns: map[types.Game]context.CancelFunc{
-			types.Genshin:  func() {},
-			types.StarRail: func() {},
-			types.ZZZ:      func() {},
-			types.WuWa:     func() {},
+		cancelFns: map[types.Game]types.Pair[context.Context, context.CancelFunc]{
+			types.Genshin:  {},
+			types.StarRail: {},
+			types.ZZZ:      {},
+			types.WuWa:     {},
 		},
 		wgMap: map[types.Game]*sync.WaitGroup{
 			types.Genshin:  {},
@@ -76,6 +76,22 @@ func areModsSame(parts []string) func(m types.Mod) bool {
 	}
 }
 
+func (g *Generator) AwaitCurrentJob(game types.Game) {
+	wg, ok := g.wgMap[game]
+	if !ok {
+		return
+	}
+	wg.Wait()
+}
+
+func (g *Generator) IsRunning(game types.Game) bool {
+	ctx, cancel := g.cancelFns[game].Pair()
+	if ctx == nil || cancel == nil {
+		return false
+	}
+	return ctx.Err() == nil
+}
+
 // unzips mod folders into export dir for given game deleting any
 // previous mod files
 func (g *Generator) Reload(game types.Game) error {
@@ -89,14 +105,16 @@ func (g *Generator) Reload(game types.Game) error {
 		g.mutexMap[game].Lock()
 		defer g.mutexMap[game].Unlock()
 
-		if g.cancelFns[game] != nil {
-			g.cancelFns[game]()
+		_, cancel := g.cancelFns[game].Pair()
+
+		if cancel != nil {
+			cancel()
 			g.wgMap[game].Wait()
 		}
 
 		ctx, cancel := context.WithCancel(context.Background())
 
-		g.cancelFns[game] = cancel
+		g.cancelFns[game] = types.PairOf(ctx, cancel)
 		errCh := make(chan error, 1)
 
 		g.wgMap[game].Add(1)

pkg/types/types.go

@@ -21,6 +21,14 @@ type Pair[X any, Y any] struct {
 	Y Y
 }
 
+func PairOf[X any, Y any](x X, y Y) Pair[X, Y] {
+	return Pair[X, Y]{X: x, Y: y}
+}
+
+func (p Pair[X, Y]) Pair() (X, Y) {
+	return p.X, p.Y
+}
+
 func (g Game) Int64() int64 {
 	switch g {
 	case Genshin: