CHANGELOG.md

@@ -1,13 +1,3 @@
-## 0.4.17
-
-feat: update `WEB_VIEW_VERSION` and `NSOAPP_VERSION`
-
-## 0.4.16
-
-fix: `The stream is already locked` in monitor mode
-
-feat: add Fresh Season 2024
-
 ## 0.4.15
 
 feat: add znca headers ([#95](https://github.com/spacemeowx2/s3si.ts/issues/95))

gui/src-tauri/tauri.conf.json

@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "s3si-ts",
-    "version": "0.4.17"
+    "version": "0.4.15"
   },
   "tauri": {
     "allowlist": {

src/VersionData.ts

@@ -42,12 +42,6 @@ export const SEASONS: Season[] = [
     start: new Date("2023-12-01T00:00:00+00:00"),
     end: new Date("2024-03-01T00:00:00+00:00"),
   },
-  {
-    id: "season202403",
-    name: "Fresh Season 2024",
-    start: new Date("2024-03-01T00:00:00+00:00"),
-    end: new Date("2024-06-01T00:00:00+00:00"),
-  },
 ];
 
 export const getSeason = (date: Date): Season | undefined => {

src/app.ts

@@ -275,13 +275,11 @@ export class App {
         );
       }
     };
-    const end = () => bar?.end();
+    const endBar = () => {
-
+      bar?.end();
-    return {
-      redraw,
-      end,
-      [Symbol.dispose]: end,
     };
+
+    return { redraw, endBar };
   }
   private async exportOnce() {
     const splatnet = new Splatnet3({ profile: this.profile, env: this.env });
@@ -302,7 +300,7 @@ export class App {
         splatnet,
       );
 
-      using bar1 = this.exporterProgress("Export vs games");
+      const { redraw, endBar } = this.exporterProgress("Export vs games");
       const fetcher = new GameFetcher({
         cache: this.opts.cache ?? new FileCache(this.profile.state.cacheDir),
         state: this.profile.state,
@@ -322,7 +320,7 @@ export class App {
               gameListFetcher,
               stepProgress: stats[e.name],
               onStep: () => {
-                bar1.redraw(e.name, progress(stats[e.name]));
+                redraw(e.name, progress(stats[e.name]));
               },
             }),
           )
@@ -333,7 +331,7 @@ export class App {
         ),
       );
 
-      await bar1.end();
+      endBar();
 
       this.printStats(stats);
       if (errors.length > 0) {
@@ -355,7 +353,7 @@ export class App {
     } else {
       const gameListFetcher = new CoopListFetcher(splatnet);
 
-      using bar2 = this.exporterProgress("Export coop games");
+      const { redraw, endBar } = this.exporterProgress("Export coop games");
       const fetcher = new GameFetcher({
         cache: this.opts.cache ?? new FileCache(this.profile.state.cacheDir),
         state: this.profile.state,
@@ -373,7 +371,7 @@ export class App {
               gameListFetcher,
               stepProgress: stats[e.name],
               onStep: () => {
-                bar2.redraw(e.name, progress(stats[e.name]));
+                redraw(e.name, progress(stats[e.name]));
               },
             }),
           )
@@ -384,7 +382,7 @@ export class App {
         ),
       );
 
-      await bar2.end();
+      endBar();
 
       this.printStats(stats);
       if (errors.length > 0) {
@@ -468,17 +466,14 @@ export class App {
         display: "[:bar] :completed/:total",
       })
       : undefined;
-    try {
+    for (const i of Array(sec).keys()) {
-      for (const i of Array(sec).keys()) {
+      bar?.render([{
-        bar?.render([{
+        completed: i,
-          completed: i,
+        total: sec,
-          total: sec,
+      }]);
-        }]);
+      await delay(1000);
-        await delay(1000);
-      }
-    } finally {
-      await bar?.end();
     }
+    bar?.end();
   }
   async run() {
     await this.profile.readState();
@@ -565,7 +560,7 @@ export class App {
   }
   printStats(stats: Record<string, StepProgress>) {
     this.env.logger.log(
-      `\nExported ${
+      `Exported ${
         Object.entries(stats)
           .map(([name, { exported }]) => `${name}: ${exported}`)
           .join(", ")

src/constant.ts

@@ -1,9 +1,9 @@
 import type { StatInkPostBody, VsHistoryDetail } from "./types.ts";
 
 export const AGENT_NAME = "s3si.ts";
-export const S3SI_VERSION = "0.4.17";
+export const S3SI_VERSION = "0.4.15";
-export const NSOAPP_VERSION = "2.10.0";
+export const NSOAPP_VERSION = "2.9.0";
-export const WEB_VIEW_VERSION = "6.0.0-2ba8cb04";
+export const WEB_VIEW_VERSION = "6.0.0-eb33aadc";
 export enum Queries {
   HomeQuery =
     "51fc56bbf006caf37728914aa8bc0e2c86a80cf195b4d4027d6822a3623098a8",