diff --git a/app/app.go b/app/app.go
index 1027559..1efb45b 100644
--- a/app/app.go
+++ b/app/app.go
@@ -34,37 +34,19 @@ type App struct {
titleTemplate *template.Template
Series dalle.Series `json:"series"`
names []types.Name
- dallesCache map[string]*dalle.DalleDress
+ dalleCache map[string]*dalle.DalleDress
}
func NewApp() *App {
a := App{
- databases: make(map[string][]string),
+ databases: make(map[string][]string),
+ dalleCache: make(map[string]*dalle.DalleDress),
}
// it's okay if it's not found
_ = a.session.Load()
var err error
- if a.Series, err = a.LoadSeries(); err != nil {
- logger.Fatal(err)
- }
- logger.Info("Loaded series:", a.Series.Suffix)
-
- for _, db := range dalle.DatabaseNames {
- if a.databases[db] == nil {
- if lines, err := a.toLines(db); err != nil {
- logger.Fatal(err)
- } else {
- a.databases[db] = lines
- for i := 0; i < len(a.databases[db]); i++ {
- a.databases[db][i] = strings.Replace(a.databases[db][i], "v0.1.0,", "", -1)
- }
- }
- }
- }
- logger.Info("Loaded", len(dalle.DatabaseNames), "databases")
-
if a.promptTemplate, err = template.New("prompt").Parse(promptTemplate); err != nil {
logger.Fatal("could not create prompt template:", err)
}
@@ -82,6 +64,8 @@ func NewApp() *App {
}
logger.Info("Compiled templates")
+ a.ReloadDatabases()
+
return &a
}
@@ -90,9 +74,35 @@ func (a App) String() string {
return string(bytes)
}
+func (a *App) ReloadDatabases() {
+ a.Series = dalle.Series{}
+ a.databases = make(map[string][]string)
+
+ var err error
+ if a.Series, err = a.LoadSeries(); err != nil {
+ logger.Fatal(err)
+ }
+ logger.Info("Loaded series:", a.Series.Suffix)
+
+ for _, db := range dalle.DatabaseNames {
+ if a.databases[db] == nil {
+ if lines, err := a.toLines(db); err != nil {
+ logger.Fatal(err)
+ } else {
+ a.databases[db] = lines
+ for i := 0; i < len(a.databases[db]); i++ {
+ a.databases[db][i] = strings.Replace(a.databases[db][i], "v0.1.0,", "", -1)
+ }
+ }
+ }
+ }
+ logger.Info("Loaded", len(dalle.DatabaseNames), "databases")
+}
+
func (a *App) toLines(db string) ([]string, error) {
filename := "./databases/" + db + ".csv"
lines := file.AsciiFileToLines(filename)
+ lines = lines[1:] // skip header
var err error
if len(lines) == 0 {
err = fmt.Errorf("could not load %s", filename)
@@ -201,7 +211,7 @@ func (a *App) HandleLines() {
// msg := fmt.Sprintf("Content policy violation, skipping retry for address: %s Error: %s", address, err)
// logger.Error(msg)
// return
- // } else
+ // } else
if strings.Contains(err.Error(), "seed length is less than 66") {
msg := fmt.Sprintf("Invalid address, skipping retry for address: %s Error: %s", address, err)
logger.Error(msg)
@@ -247,7 +257,7 @@ func (a *App) LoadSeries() (dalle.Series, error) {
return dalle.Series{}, err
}
- s.Suffix = strings.ReplaceAll(s.Suffix, " ", "-")
+ s.Suffix = strings.Trim(strings.ReplaceAll(s.Suffix, " ", "-"), "-")
s.SaveSeries(filepath.Join("./output/series", s.Suffix+".json"), 0)
return s, nil
}
diff --git a/app/app_state.go b/app/app_state.go
index 09602e2..e3ac80b 100644
--- a/app/app_state.go
+++ b/app/app_state.go
@@ -1,37 +1,34 @@
package app
-func (a *App) GetLastRoute() string {
- return a.GetSession().LastRoute
-}
-
-func (a *App) GetLastTab() string {
- return a.GetSession().LastTab
-}
-
-func (a *App) GetLastAddress() string {
- return a.GetSession().LastAddress
-}
-
-func (a *App) GetLastSeries() string {
- return a.GetSession().LastSeries
-}
-
-func (a *App) SetLastRoute(route string) {
- a.GetSession().LastRoute = route
- a.GetSession().Save()
-}
-
-func (a *App) SetLastTab(tab string) {
- a.GetSession().LastTab = tab
- a.GetSession().Save()
-}
-
-func (a *App) SetLastAddress(addr string) {
- a.GetSession().LastAddress = addr
- a.GetSession().Save()
-}
-
-func (a *App) SetLastSeries(series string) {
- a.GetSession().LastSeries = series
+func (a *App) GetLast(which string) string {
+ switch which {
+ case "route":
+ return a.GetSession().LastRoute
+ case "tab":
+ return a.GetSession().LastTab
+ case "address":
+ return a.GetSession().LastAddress
+ case "series":
+ return a.GetSession().LastSeries
+ }
+ return "Unknown"
+}
+
+func (a *App) SetLast(which, value string) {
+ reload := false
+ switch which {
+ case "route":
+ a.GetSession().LastRoute = value
+ case "tab":
+ a.GetSession().LastTab = value
+ case "address":
+ a.GetSession().LastAddress = value
+ case "series":
+ a.GetSession().LastSeries = value
+ reload = true
+ }
a.GetSession().Save()
+ if reload {
+ a.ReloadDatabases()
+ }
}
diff --git a/app/backend.go b/app/backend.go
index d334aa3..634f5f5 100644
--- a/app/backend.go
+++ b/app/backend.go
@@ -16,7 +16,15 @@ import (
var dalleCacheMutex sync.Mutex
func (a *App) MakeDalleDress(addressIn string) (*dalle.DalleDress, error) {
+ dalleCacheMutex.Lock()
+ defer dalleCacheMutex.Unlock()
+ if a.dalleCache[addressIn] != nil {
+ logger.Info("Returning cached dalle for", addressIn)
+ return a.dalleCache[addressIn], nil
+ }
+
address := addressIn
+ logger.Info("Making dalle for", addressIn)
if strings.HasSuffix(address, ".eth") {
opts := sdk.NamesOptions{
Terms: []string{address},
@@ -29,6 +37,7 @@ func (a *App) MakeDalleDress(addressIn string) (*dalle.DalleDress, error) {
}
}
}
+ logger.Info("Resolved", addressIn)
parts := strings.Split(address, ",")
seed := parts[0] + reverse(parts[0])
@@ -39,16 +48,10 @@ func (a *App) MakeDalleDress(addressIn string) (*dalle.DalleDress, error) {
seed = seed[2:66]
}
- dalleCacheMutex.Lock()
- defer dalleCacheMutex.Unlock()
-
- if a.dallesCache == nil {
- a.dallesCache = make(map[string]*dalle.DalleDress)
- }
fn := validFilename(address)
- if a.dallesCache[fn] != nil {
+ if a.dalleCache[fn] != nil {
logger.Info("Returning cached dalle for", addressIn)
- return a.dallesCache[fn], nil
+ return a.dalleCache[fn], nil
}
dd := dalle.DalleDress{
@@ -86,7 +89,9 @@ func (a *App) MakeDalleDress(addressIn string) (*dalle.DalleDress, error) {
dd.EnhancedPrompt = file.AsciiFileToString(fn)
}
- a.dallesCache[dd.Filename] = &dd
+ a.dalleCache[dd.Filename] = &dd
+ a.dalleCache[addressIn] = &dd
+
return &dd, nil
}
diff --git a/app/files.go b/app/files.go
index d8ec561..c184c8c 100644
--- a/app/files.go
+++ b/app/files.go
@@ -6,8 +6,8 @@ import (
"github.com/TrueBlocks/trueblocks-dalledress/pkg/utils"
)
-func (a *App) GetFilelist() []string {
- folder := filepath.Join("./output/series")
+func (a *App) GetFilelist(baseFolder string) []string {
+ folder := filepath.Join(baseFolder)
if list, err := utils.Listing(folder); err != nil {
return []string{err.Error()}
} else {
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 01f7c2e..7835a9b 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,17 +1,37 @@
-import React from "react";
+import React, { useEffect } from "react";
import { AppShell, Text } from "@mantine/core";
import Aside from "./components/global/Aside";
import Header from "./components/global/Header";
import Navbar from "./components/global/Navbar";
import Routes from "./components/global/Routes";
import classes from "@/App.module.css";
+import { EventsOn, EventsOff, EventsEmit } from "../wailsjs/runtime";
function App() {
+ const [showHelp, setShowHelp] = React.useState(true);
+
+ const sendMessage = () => {
+ EventsEmit("toggleHelp", "Hello from SenderComponent");
+ setShowHelp(!showHelp);
+ };
+
+ useEffect(() => {
+ const messageListener = (message: string) => {
+ console.log("Received in help component:", message);
+ };
+
+ EventsOn("toggleHelp", messageListener);
+
+ return () => {
+ EventsOff("toggleHelp");
+ };
+ }, [showHelp]);
+
return (
@@ -28,6 +48,7 @@ function App() {
time / date / currently opened file
+ {" "}
);
diff --git a/frontend/src/components/ImageDisplay.tsx b/frontend/src/components/ImageDisplay.tsx
index c1f29bd..c7c7b14 100644
--- a/frontend/src/components/ImageDisplay.tsx
+++ b/frontend/src/components/ImageDisplay.tsx
@@ -23,8 +23,8 @@ export const ImageDisplay = ({ address, loading }: { address: string; loading: b
return (
- {title}
-
+ {title}
+
);
};
diff --git a/frontend/src/components/StringTable.tsx b/frontend/src/components/StringTable.tsx
index 02ca1e7..d22629b 100644
--- a/frontend/src/components/StringTable.tsx
+++ b/frontend/src/components/StringTable.tsx
@@ -1,5 +1,8 @@
import React, { useState } from "react";
import { Table, Checkbox } from "@mantine/core";
+import { Link, useLocation } from "wouter";
+import { Anchor } from "@mantine/core";
+import { SetLast } from "@gocode/app/App";
export interface DataItem {
id: number;
@@ -12,6 +15,16 @@ interface StringTableProps {
const StringTable: React.FC = ({ data }) => {
const [selectedIds, setSelectedIds] = useState([]);
+ const [location, setLocation] = useLocation();
+
+ const handleSeriesClick = async (seriesName: string) => {
+ try {
+ await SetLast("series", seriesName);
+ setLocation("/dalle");
+ } catch (error) {
+ console.error("Error updating data:", error);
+ }
+ };
const handleCheckboxChange = (id: number) => {
setSelectedIds((prevSelectedIds) =>
@@ -33,7 +46,17 @@ const StringTable: React.FC = ({ data }) => {
handleCheckboxChange(item.id)} />
- {item.value}
+
+ {
+ e.preventDefault();
+ handleSeriesClick(item.value);
+ }}
+ >
+ {item.value}
+
+
));
diff --git a/frontend/src/components/global/Aside.tsx b/frontend/src/components/global/Aside.tsx
index 191ccf8..f15a0a2 100644
--- a/frontend/src/components/global/Aside.tsx
+++ b/frontend/src/components/global/Aside.tsx
@@ -1,4 +1,5 @@
-import React from "react";
+import React, { useEffect } from "react";
+import { EventsOn, EventsOff } from "../../../wailsjs/runtime";
import { Text } from "@mantine/core";
function Aside() {
diff --git a/frontend/src/components/global/Menu.tsx b/frontend/src/components/global/Menu.tsx
index 5e1d1bb..a6ac1d8 100644
--- a/frontend/src/components/global/Menu.tsx
+++ b/frontend/src/components/global/Menu.tsx
@@ -2,19 +2,19 @@ import React, { ReactNode, useEffect, useState } from "react";
import { NavLink } from "@mantine/core";
import { IconHome, IconSettings, IconTag, IconList, IconSpider } from "@tabler/icons-react";
import { Link, useRoute } from "wouter";
-import { GetLastRoute, SetLastRoute } from "@gocode/app/App";
+import { GetLast, SetLast } from "@gocode/app/App";
function Menu() {
const [activeRoute, setActiveRoute] = useState("/");
useEffect(() => {
- const lastRoute = (GetLastRoute() || "/").then((route) => {
+ const lastRoute = (GetLast("route") || "/").then((route) => {
setActiveRoute(route);
});
}, []);
const handleRouteChange = (route: string) => {
- SetLastRoute(route);
+ SetLast("route", route);
setActiveRoute(route);
};
diff --git a/frontend/src/components/global/Routes.tsx b/frontend/src/components/global/Routes.tsx
index d9eb65d..a8f89a0 100644
--- a/frontend/src/components/global/Routes.tsx
+++ b/frontend/src/components/global/Routes.tsx
@@ -2,13 +2,13 @@ import React, { useEffect } from "react";
import { Route, Switch, useLocation } from "wouter";
import classes from "@/App.module.css";
import { DalleView, NamesView, HomeView, SeriesView, SettingsView } from "@/views";
-import { GetLastRoute } from "@gocode/app/App";
+import { GetLast } from "@gocode/app/App";
export const Routes = () => {
const [, setLocation] = useLocation();
useEffect(() => {
- const lastRoute = (GetLastRoute() || "/").then((route) => {
+ const lastRoute = (GetLast("route") || "/").then((route) => {
setLocation(route);
});
}, [setLocation]);
diff --git a/frontend/src/views/Dalle/DalleView.tsx b/frontend/src/views/Dalle/DalleView.tsx
index f4ad273..a3f6381 100644
--- a/frontend/src/views/Dalle/DalleView.tsx
+++ b/frontend/src/views/Dalle/DalleView.tsx
@@ -1,5 +1,5 @@
import React, { useState, useEffect } from "react";
-import { Stack, Title, Text, Select, Paper, Grid, Button, Group } from "@mantine/core";
+import { Stack, Title, Paper, Grid, Button, Group } from "@mantine/core";
import classes from "@/App.module.css";
import { View, ViewStatus } from "@/components/view";
import EditableSelect from "@/components/EditableSelect";
@@ -13,12 +13,8 @@ import {
GetEnhanced,
GetFilename,
GenerateImage,
- GetLastTab,
- GetLastAddress,
- GetLastSeries,
- SetLastTab,
- SetLastAddress,
- SetLastSeries,
+ GetLast,
+ SetLast,
Save,
} from "@gocode/app/App";
import { ImageDisplay } from "@/components/ImageDisplay";
@@ -37,6 +33,7 @@ export function DalleView() {
const [activeTab, setActiveTab] = useState("json");
const [dialogOpened, setDialogOpened] = useState(false);
const [success, setSuccess] = useState(false);
+ const gridWidth = 8;
const handleOpenDialog = (result: boolean) => {
setSuccess(result);
@@ -60,10 +57,10 @@ export function DalleView() {
// On first load of the view, set the most recently viewed tab and address
useEffect(() => {
- GetLastTab().then((lastTab: string) => {
+ GetLast("tab").then((lastTab: string) => {
setActiveTab(lastTab);
});
- GetLastAddress().then((lastAddress: string) => {
+ GetLast("address").then((lastAddress: string) => {
if (lastAddress && lastAddress.length > 0) {
setAddress(lastAddress);
} else {
@@ -75,7 +72,7 @@ export function DalleView() {
// When address changes, update all the data
useEffect(() => {
if (address && !imageLoading) {
- SetLastAddress(address);
+ SetLast("address", address);
GetJson(address).then((value: string) => {
setJson(value);
});
@@ -103,7 +100,7 @@ export function DalleView() {
const handleTabChange = (value: string | null) => {
if (value) {
setActiveTab(value);
- SetLastTab(value);
+ SetLast("tab", value);
}
};
@@ -120,9 +117,9 @@ export function DalleView() {
Dalle View
-
-
-
+
+
+
-
+
-
-
-
-
-
- setDialogOpened(false)} success={success} />
-