Merge pull request #465 from Unpackerr/dn2_embed

davidnewhall · web-flow · commit 58e050870d5b · 2024-07-17T12:39:41.000-07:00
switch to embed from bindata
diff --git a/.golangci.yml b/.golangci.yml
@@ -23,8 +23,6 @@ run:
   timeout: 3m
 
 linters-settings:
-  ireturn:
-    allow: generic,stdlib,error
   depguard:
     rules:
       main:
diff --git a/Makefile b/Makefile
@@ -75,7 +75,7 @@ clean:
 	rm -f unpackerr unpackerr.*.{macos,freebsd,linux,exe}{,.gz,.zip} unpackerr.1{,.gz} unpackerr.rb
 	rm -f unpackerr{_,-}*.{deb,rpm,txz} v*.tar.gz.sha256 examples/MANUAL .metadata.make rsrc_*.syso
 	rm -f cmd/unpackerr/README{,.html} README{,.html} ./unpackerr_manual.html rsrc.syso Unpackerr.*.app.zip
-	rm -f PKGBUILD pkg/bindata/bindata.go
+	rm -f PKGBUILD
 	rm -rf package_build_* release Unpackerr.*.app Unpackerr.app
 
 ####################
@@ -94,12 +94,12 @@ unpackerr.1.gz:
 
 # TODO: provide a template that adds the date to the built html file.
 readme: README.html
-README.html: 
+README.html:
 	# This turns README.md into README.html
 	go run github.com/davidnewhall/md2roff@v0.0.1 --manual unpackerr --version $(VERSION) --date "$(DATE)" README.md
 
 rsrc: rsrc.syso
-rsrc.syso: init/windows/application.ico init/windows/manifest.xml 
+rsrc.syso: init/windows/application.ico init/windows/manifest.xml
 	go run github.com/akavel/rsrc@latest -arch amd64 -ico init/windows/application.ico -manifest init/windows/manifest.xml
 
 ####################
@@ -337,8 +337,8 @@ lint: generate
 	GOOS=freebsd golangci-lint run
 	GOOS=windows golangci-lint run
 
-generate: pkg/bindata/bindata.go
-pkg/bindata/bindata.go: pkg/bindata/files/*
+generate: examples/unpackerr.conf.example
+examples/unpackerr.conf.example: init/config/*
 	find pkg -name .DS\* -delete
 	go generate ./...
 
diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml
@@ -135,4 +135,4 @@ services:
     - UN_CMDHOOK_0_EXCLUDE_1=lidarr
     - UN_CMDHOOK_0_TIMEOUT=10s
 
-## => Content Auto Generated, 17 JUL 2024 08:35 UTC
+## => Content Auto Generated, 17 JUL 2024 16:48 UTC
diff --git a/examples/examples.go b/examples/examples.go
@@ -0,0 +1,14 @@
+package examples
+
+// This file allows unpackerr to import the example config file into the binary.
+
+import _ "embed"
+
+var (
+	//go:embed unpackerr.conf.example
+	ConfigFile []byte
+	//go:embed docker-compose.yml
+	DockerCompose []byte
+	//go:embed MANUAL.md
+	ManualMakrdown []byte
+)
diff --git a/examples/unpackerr.conf.example b/examples/unpackerr.conf.example
@@ -301,4 +301,4 @@ dir_mode = "0755"
 ## You can adjust how long to wait for the command to run.
 # timeout = "10s"
 
-## => Content Auto Generated, 17 JUL 2024 08:35 UTC
+## => Content Auto Generated, 17 JUL 2024 16:48 UTC
diff --git a/pkg/bindata/README.md b/pkg/bindata/README.md
@@ -1,2 +1 @@
-The files in this folder are auto generated from the files/ folder.
-Currently bindata is used to store the app GUI icon files.
+The files in this folder are bundled into the compiled application binary.
diff --git a/pkg/bindata/bindata.go b/pkg/bindata/bindata.go
diff --git a/pkg/bindata/bindata_other.go b/pkg/bindata/bindata_other.go
@@ -0,0 +1,8 @@
+//go:build !windows
+
+package bindata
+
+import _ "embed"
+
+//go:embed macos.png
+var SystrayIcon []byte
diff --git a/pkg/bindata/bindata_windows.go b/pkg/bindata/bindata_windows.go
@@ -0,0 +1,8 @@
+//go:build windows
+
+package bindata
+
+import _ "embed"
+
+//go:embed windows.ico
+var SystrayIcon []byte
diff --git a/pkg/bindata/generate.go b/pkg/bindata/generate.go
diff --git a/pkg/bindata/macos.png b/pkg/bindata/macos.png
diff --git a/pkg/bindata/windows.ico b/pkg/bindata/windows.ico
diff --git a/pkg/unpackerr/cnfgfile.go b/pkg/unpackerr/cnfgfile.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Unpackerr/unpackerr/pkg/bindata"
+	"github.com/Unpackerr/unpackerr/examples"
 	"github.com/Unpackerr/unpackerr/pkg/ui"
 	"github.com/hako/durafmt"
 	homedir "github.com/mitchellh/go-homedir"
@@ -208,9 +208,7 @@ func (u *Unpackerr) createConfigFile(file string) (string, error) {
 	}
 	defer fOpen.Close()
 
-	if asset, err := bindata.Asset("../../examples/unpackerr.conf.example"); err != nil {
-		return "", fmt.Errorf("getting config file: %w", err)
-	} else if _, err = fOpen.Write(asset); err != nil {
+	if _, err = fOpen.Write(examples.ConfigFile); err != nil {
 		return "", fmt.Errorf("writing config file: %w", err)
 	}
 
diff --git a/pkg/unpackerr/tray.go b/pkg/unpackerr/tray.go
@@ -46,14 +46,7 @@ func (u *Unpackerr) exitTray() {
 
 // readyTray creates the system tray/menu bar app items, and starts the web server.
 func (u *Unpackerr) readyTray() {
-	b, err := bindata.Asset(ui.SystrayIcon)
-	if err == nil {
-		systray.SetTemplateIcon(b, b)
-	} else {
-		u.Errorf("Reading Icon: %v", err)
-		systray.SetTitle("DNC")
-	}
-
+	systray.SetTemplateIcon(bindata.SystrayIcon, bindata.SystrayIcon)
 	systray.SetTooltip("Unpackerr" + " v" + version.Version)
 	u.makeChannels()
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-The files in this folder are auto generated from the files/ folder.`
`2`		`-Currently bindata is used to store the app GUI icon files.`
	`1`	`+The files in this folder are bundled into the compiled application binary.`