Improve debug, fix warn, trim code, enlarge window

retrixe · Nov 10, 2024 · 0bd9a30 · 0bd9a30
1 parent df91191
commit 0bd9a30
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/main.go b/main.go
@@ -39,12 +39,9 @@ var js string
 // ParseToJsString takes a string, escapes slashes and double-quotes, adds newlines for multi-line
 // strings and wraps it in double-quotes, allowing it to be passed to JavaScript.
 func ParseToJsString(s string) string {
-	split := strings.Split(s, "\n")
-	result := `"` + strings.ReplaceAll(strings.ReplaceAll(split[0], `\`, `\\`), `"`, `\"`) + `"`
-	for _, line := range split[1:] {
-		result += ` + "\n` + strings.ReplaceAll(strings.ReplaceAll(line, `\`, `\\`), `"`, `\"`) + `"`
-	}
-	return result
+	return strings.ReplaceAll(
+		`"`+strings.ReplaceAll(strings.ReplaceAll(s, `\`, `\\`), `"`, `\"`)+`"`,
+		"\n", `\n`)
 }
 
 func main() {
@@ -78,15 +75,12 @@ func main() {
 	}
 	w = webview.New(debug)
 	defer w.Destroy()
-	w.SetSize(420, 210, webview.HintNone)
+	w.SetSize(540, 240, webview.HintNone)
 	w.SetTitle("Imprint " + version)
 
 	// Bind a function to inject JavaScript and CSS via webview.Eval.
 	w.Bind("initiate", func() {
-		w.Eval(`// inject <style> tag
-const style = document.createElement('style')
-style.textContent = ` + ParseToJsString(css) + `
-document.head.appendChild(style)`)
+		w.Eval(`document.getElementById('inject-css').textContent = ` + ParseToJsString(css))
 		w.Eval(js)
 	})
 

diff --git a/package.json b/package.json
@@ -8,8 +8,8 @@
   "private": true,
   "scripts": {
     "lint": "eslint . && tsc --noEmit",
-    "dev": "parcel renderer/index.html & go run -ldflags=\"-s -w -X main.overrideUrl=http://localhost:1234/\" . & echo Starting...",
-    "start": "parcel build renderer/index.tsx && go run .",
+    "dev": "parcel renderer/index.html & DEBUG=true go run -ldflags=\"-s -w -X main.overrideUrl=http://localhost:1234/\" . & echo Starting...",
+    "start": "parcel build renderer/index.tsx && DEBUG=true go run .",
     "build": "parcel build renderer/index.tsx --no-source-maps && yarn build:go",
     "build:go": "run-script-os",
     "build:go:default": "go build -ldflags=\"-s -w\" -o imprint -v",

diff --git a/renderer/App.tsx b/renderer/App.tsx
@@ -19,7 +19,9 @@ const App = (): JSX.Element => {
   globalThis.setProgressReact = setProgress
   globalThis.setFileSizeReact = setFileSize
   globalThis.setSelectedDeviceReact = setSelectedDevice
-  useEffect(() => globalThis.refreshDevices(), [])
+  useEffect(() => {
+    globalThis.refreshDevices()
+  }, [])
 
   const inProgress = typeof progress === 'number'
   useEffect(() => setConfirm(false), [inProgress])

diff --git a/renderer/index.html b/renderer/index.html
@@ -13,6 +13,7 @@
 		  Ubuntu,Cantarell,Oxygen-Sans,"Helvetica Neue",Arial,Roboto,sans-serif;
 	}
   </style>
+	<style id='inject-css'></style>
 </head>
 <body><div id="app"></div><script type="module" src="./index.tsx" /></body>
 </html>