Add version text to the menu, add format & location to export page

Author: chopikus

app.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"context"
+	_ "embed"
+	"encoding/json"
 	"rm-exporter/backend"
 	"slices"
 	"time"
@@ -20,6 +22,9 @@ type App struct {
 	export_from int
 }
 
+//go:embed wails.json
+var wailsJSON string
+
 // NewApp creates a new App application struct
 func NewApp() *App {
 	return &App{}
@@ -32,6 +37,15 @@ func (a *App) startup(ctx context.Context) {
 	a.export_from = -1
 }
 
+func (a *App) GetAppVersion() string {
+	m := make(map[string]interface{})
+	err := json.Unmarshal([]byte(wailsJSON), &m)
+	if err != nil {
+		return "0.0.0"
+	}
+	return m["info"].(map[string]interface{})["productVersion"].(string)
+}
+
 func (a *App) ReadTabletDocs(tablet_addr string) error {
 	a.tablet_addr = tablet_addr
 
@@ -60,6 +74,10 @@ func (a *App) SetExportOptions(export backend.RmExport) {
 	a.rm_export = export
 }
 
+func (a *App) GetExportOptions() backend.RmExport {
+	return a.rm_export
+}
+
 func (a *App) Export() {
 	files := a.GetCheckedFiles()
 	if a.export_from == -1 {

frontend/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "frontend",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.1.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

frontend/package.json

@@ -1 +1 @@
-6f70e2e44a9cfb36d4078361ae189b46
+9eb8833ac8cf20917d1b6079bf98b5ff

frontend/package.json.md5

@@ -1,13 +1,14 @@
 <script lang="ts">
     import { Alert, Button, Listgroup, Navbar, P, Spinner } from "flowbite-svelte";
-    import { Export, GetCheckedFiles} from '../../wailsjs/go/main/App.js';
+    import { Export, GetCheckedFiles, GetExportOptions } from '../../wailsjs/go/main/App.js';
     import { CheckOutline, ExclamationCircleOutline, FileLinesSolid, InfoCircleSolid } from "flowbite-svelte-icons";
     import { EventsOn } from "../../wailsjs/runtime/runtime.js";
     import { backend } from "../../wailsjs/go/models.js";
     type DocInfo = backend.DocInfo;
 
     let exportItems: DocInfo[] = $state([]);
     let exportItemState: {[key: string]: string;} = $state({});
+    let exportOptions: backend.RmExport = $state({});
 
     let errorMessage: string = $state("hello");
     let showError: boolean = $state(false);
@@ -18,6 +19,11 @@
             exportItems = result;
         });
     
+    GetExportOptions()
+        .then((result: backend.RmExport) => {
+            exportOptions = result;
+        });
+
     Export();
 
     const onRetry = () => {
@@ -64,9 +70,13 @@
     <Navbar color="blue" class="sticky top-0">
         <h1 class="font-bold m-auto">{finishedAllItems() ? "Success!" : "Export"}</h1>
     </Navbar>
-
+    
     <main class="pr-7 pl-7 mt-3 w-full">
-    {#if exportItems.length > 0}
+    
+        <h2 class="text-md">Format: {exportOptions["Format"]}</h2>
+        <h2 class="text-md mb-3">Location: {exportOptions["Location"]}</h2>
+    
+        {#if exportItems.length > 0}
         <Listgroup items={exportItems} let:item active={false}>
             <div class="flex flex-row justify-start items-center w-full">
                 <FileLinesSolid class="mr-1" size="lg" />

frontend/src/pages/Export.svelte

@@ -1,9 +1,17 @@
 <script lang="ts">
-  import { Alert, Button, P, Input, Label, Spinner} from 'flowbite-svelte';
+  import { Alert, Button, P, Input, Label, Spinner, Footer, A} from 'flowbite-svelte';
   import { ArrowRightOutline, InfoCircleSolid, TabletSolid, CloseOutline } from 'flowbite-svelte-icons';
-  import { ReadTabletDocs, IsIpValid} from '../../wailsjs/go/main/App.js';
+  import { ReadTabletDocs, IsIpValid, GetAppVersion } from '../../wailsjs/go/main/App.js';
   import { push } from 'svelte-spa-router';
+  import { BrowserOpenURL } from '../../wailsjs/runtime/runtime.js';
 
+  const source = "https://github.com/chopikus/rm-exporter";
+  let version = $state("");
+
+  GetAppVersion().then((v: string) => {
+    version = v;
+  });
+  
   let rmIp: string = $state("10.11.99.1");
   let isRmIpValid: boolean = $state(true);
   let loading: boolean = $state(false);
@@ -34,6 +42,10 @@
       });
   }
 
+  const onSourceClick = () => {
+    BrowserOpenURL(source)
+  };
+
 </script>
 
 {#key show_error}
@@ -68,3 +80,6 @@
     </Button>
   </div>
 </main>
+<Footer class="absolute bottom-0">
+  <P size="sm">Version {version}. Source available at <A onclick={onSourceClick}>{source}</A></P>
+</Footer>

frontend/src/pages/Menu.svelte

@@ -6,10 +6,14 @@ export function DirectoryDialog():Promise<string>;
 
 export function Export():Promise<void>;
 
+export function GetAppVersion():Promise<string>;
+
 export function GetCheckedFiles():Promise<Array<backend.DocInfo>>;
 
 export function GetCheckedFilesCount():Promise<number>;
 
+export function GetExportOptions():Promise<backend.RmExport>;
+
 export function GetPaths(arg1:Array<string>):Promise<Array<string>>;
 
 export function GetTabletFolder(arg1:string):Promise<Array<backend.DocInfo>>;

frontend/wailsjs/go/main/App.d.ts

@@ -10,6 +10,10 @@ export function Export() {
   return window['go']['main']['App']['Export']();
 }
 
+export function GetAppVersion() {
+  return window['go']['main']['App']['GetAppVersion']();
+}
+
 export function GetCheckedFiles() {
   return window['go']['main']['App']['GetCheckedFiles']();
 }
@@ -18,6 +22,10 @@ export function GetCheckedFilesCount() {
   return window['go']['main']['App']['GetCheckedFilesCount']();
 }
 
+export function GetExportOptions() {
+  return window['go']['main']['App']['GetExportOptions']();
+}
+
 export function GetPaths(arg1) {
   return window['go']['main']['App']['GetPaths'](arg1);
 }

frontend/wailsjs/go/main/App.js

@@ -8,5 +8,8 @@
   "frontend:dev:serverUrl": "auto",
   "author": {
     "name": "Igor Chovpan"
+  },
+  "info": {
+    "productVersion": "0.1.0"
   }
 }