Merge branch 'next-release'

Taskfile.yml

@@ -0,0 +1,34 @@
+# https://taskfile.dev
+
+version: '3'
+
+tasks:
+  default:
+    desc: Runs application
+    cmds:
+      - go run ./cmd/abyss-blackbox/
+    silent: true
+
+  test:
+    desc: Run all the go tests.
+    cmds:
+      - go test ./...
+
+  install-deps:
+    desc: Install dependencies needed to build release
+    cmds:
+      - go get github.com/gonutz/rsrc
+    silent: true
+
+  resources:
+    desc: Compile resource file
+    cmds:
+      - rsrc -manifest ./cmd/abyss-blackbox/main.manifest -ico ./trig_96x96.ico -o ./cmd/abyss-blackbox/rsrc.syso 
+
+  release:
+    desc: Builds artifacts for release
+    deps: [install-deps, resources]
+    cmds:
+      - go generate ./...
+      - go build -trimpath -ldflags="-H windowsgui -s -w" -o abyss-blackbox.exe ./cmd/abyss-blackbox 
+      - go build -trimpath -ldflags="-s -w" ./cmd/extract/

build-release.bat

@@ -1,4 +1,4 @@
-rsrc -manifest ./cmd/abyss-blackbox/main.manifest -ico ./trig_96x96.ico -o ./cmd/abyss-blackbox/rsrc.syso 
+Rem rsrc -manifest ./cmd/abyss-blackbox/main.manifest -ico ./trig_96x96.ico -o ./cmd/abyss-blackbox/rsrc.syso 
 Rem go build -ldflags="-H windowsgui" -o abyss-blackbox.exe
 go generate ./...
 go build -trimpath -ldflags="-H windowsgui -s -w" -o abyss-blackbox.exe ./cmd/abyss-blackbox 

cmd/abyss-blackbox/config.go

@@ -0,0 +1,166 @@
+package main
+
+import (
+	"encoding/json"
+	"os"
+	"os/user"
+	"path/filepath"
+	"sync"
+
+	"github.com/lxn/walk"
+	"github.com/shivas/abyss-blackbox/internal/mainwindow"
+)
+
+type captureConfig struct {
+	sync.Mutex
+	X, Y, H                 int
+	AppRoot                 string
+	Recordings              string
+	FilterThreshold         int
+	FilteredPreview         bool
+	EVEClientWindowTitle    string
+	EVEGameLogsFolder       string
+	TestServer              bool
+	RecorderShortcutText    string
+	RecorderShortcut        walk.Shortcut
+	Weather30ShortcutText   string
+	Weather30Shortcut       walk.Shortcut
+	Weather50ShortcutText   string
+	Weather50Shortcut       walk.Shortcut
+	Weather70ShortcutText   string
+	Weather70Shortcut       walk.Shortcut
+	LootRecordDiscriminator string
+}
+
+// SetRecorderShortcut satisfies ShortcutSetter interface.
+func (c *captureConfig) SetRecorderShortcut(shorcutType int, s walk.Shortcut) {
+	switch shorcutType {
+	case mainwindow.ShortcutRecorder:
+		c.RecorderShortcut = s
+		c.RecorderShortcutText = s.String()
+
+	case mainwindow.ShortcutWeather30:
+		c.Weather30Shortcut = s
+		c.Weather30ShortcutText = s.String()
+
+	case mainwindow.ShortcutWeather50:
+		c.Weather50Shortcut = s
+		c.Weather50ShortcutText = s.String()
+
+	case mainwindow.ShortcutWeather70:
+		c.Weather70Shortcut = s
+		c.Weather70ShortcutText = s.String()
+	}
+}
+
+// readConfig reads configuration from json file, or creates one if file doesn't exist
+func readConfig() (*captureConfig, error) {
+	appDir, err := filepath.Abs(filepath.Dir(os.Args[0]))
+	if err != nil {
+		return nil, err
+	}
+
+	var c *captureConfig
+
+	load := true
+	settingsFilename := filepath.Join(appDir, "settings.json")
+
+	defaultRecorderShortcut := walk.Shortcut{Modifiers: walk.ModControl | walk.ModAlt, Key: walk.KeyEnd}
+	defaultWeather30Shortcut := walk.Shortcut{Modifiers: walk.ModControl | walk.ModAlt, Key: walk.KeyNumpad3}
+	defaultWeather50Shortcut := walk.Shortcut{Modifiers: walk.ModControl | walk.ModAlt, Key: walk.KeyNumpad5}
+	defaultWeather70Shortcut := walk.Shortcut{Modifiers: walk.ModControl | walk.ModAlt, Key: walk.KeyNumpad7}
+
+	_, err = os.Stat(settingsFilename)
+	if os.IsNotExist(err) {
+		// fetch current user folder and try to point to Gamelogs folder
+		usr, errr := user.Current()
+		if errr != nil {
+			return nil, errr
+		}
+
+		eveGameLogsFolder := filepath.Join(usr.HomeDir, "Documents", "EVE", "logs", "Gamelogs")
+
+		c = &captureConfig{
+			AppRoot:                 appDir,
+			X:                       10,
+			Y:                       10,
+			H:                       400,
+			Recordings:              filepath.Join(appDir, "recordings"),
+			FilterThreshold:         110,
+			FilteredPreview:         false,
+			EVEGameLogsFolder:       eveGameLogsFolder,
+			RecorderShortcutText:    defaultRecorderShortcut.String(),
+			RecorderShortcut:        defaultRecorderShortcut,
+			Weather30ShortcutText:   defaultWeather30Shortcut.String(),
+			Weather30Shortcut:       defaultWeather30Shortcut,
+			Weather50ShortcutText:   defaultWeather50Shortcut.String(),
+			Weather50Shortcut:       defaultWeather50Shortcut,
+			Weather70ShortcutText:   defaultWeather70Shortcut.String(),
+			Weather70Shortcut:       defaultWeather70Shortcut,
+			LootRecordDiscriminator: "Quafe",
+		}
+		load = false
+	} else if err != nil {
+		return c, err
+	}
+
+	if load {
+		f, err := os.Open(settingsFilename)
+		if err != nil {
+			return c, err
+		}
+		defer f.Close()
+
+		err = json.NewDecoder(f).Decode(&c)
+		if err != nil {
+			return c, err
+		}
+
+		if c.RecorderShortcutText == "" {
+			c.RecorderShortcut = defaultRecorderShortcut
+			c.RecorderShortcutText = defaultRecorderShortcut.String()
+		}
+
+		if c.Weather30ShortcutText == "" {
+			c.Weather30Shortcut = defaultWeather30Shortcut
+			c.Weather30ShortcutText = defaultWeather30Shortcut.String()
+		}
+
+		if c.Weather50ShortcutText == "" {
+			c.Weather50Shortcut = defaultWeather50Shortcut
+			c.Weather50ShortcutText = defaultWeather50Shortcut.String()
+		}
+
+		if c.Weather70ShortcutText == "" {
+			c.Weather70Shortcut = defaultWeather70Shortcut
+			c.Weather70ShortcutText = defaultWeather70Shortcut.String()
+		}
+
+		if c.LootRecordDiscriminator == "" {
+			c.LootRecordDiscriminator = "Quafe"
+		}
+	}
+
+	return c, nil
+}
+
+// writeConfig saves configuration to json file
+func writeConfig(c *captureConfig) error {
+	settingsFilename := filepath.Join(c.AppRoot, "settings.json")
+
+	f, err := os.Create(settingsFilename)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	encoder := json.NewEncoder(f)
+	encoder.SetIndent("", "  ")
+
+	err = encoder.Encode(c)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}