dave/Yggdrasil
1
0
Fork 0
generated from dave/wails-template
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Refaator service from *Addon to Addon

Browse Source
This commit is contained in:
PhatPhuckDave
2025-01-11 20:31:25 +01:00
parent 994a5a86f4
commit 84617ede5d
3 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
addonService.go
View File

@@ -3,7 +3,7 @@ package main
import "fmt" import "fmt"
type AddonService struct { type AddonService struct {
Addons map[string]*Addon Addons map[string]Addon
} }
//var addons = map[string]*Addon{ //var addons = map[string]*Addon{
@@ -12,16 +12,13 @@ type AddonService struct {
// "Dechickenator": NewAddon("Dechickenator", "https://git.site.quack-lab.dev/dave/wow_dechickenator"), // "Dechickenator": NewAddon("Dechickenator", "https://git.site.quack-lab.dev/dave/wow_dechickenator"),
//} //}
func NewAddonService() *AddonService { func (a *AddonService) GetAddon(name string) (addon Addon, err error) {
return &AddonService{} var ok bool
} addon, ok = a.Addons[name]
func (a *AddonService) GetAddon(name string) (*Addon, error) {
addon, ok := a.Addons[name]
if !ok { if !ok {
return nil, fmt.Errorf("addon with name %s not found", name) return addon, fmt.Errorf("addon with name %s not found", name)
} }
return addon, nil return
} }
func (a *AddonService) GetRemoteVersion(name string) (string, error) { func (a *AddonService) GetRemoteVersion(name string) (string, error) {
@@ -39,18 +36,18 @@ func (a *AddonService) GetLocalVersion(name string) (string, error) {
return addon.GetLocalVersion() return addon.GetLocalVersion()
} }
func (a *AddonService) UpdateAddon(name string) (*Addon, error) { func (a *AddonService) UpdateAddon(name string) (addon Addon, err error) {
addon, err := a.GetAddon(name) addon, err = a.GetAddon(name)
if err != nil { if err != nil {
return nil, err return
} }
release, err := addon.GetRemoteRelease() release, err := addon.GetRemoteRelease()
if err != nil { if err != nil {
return nil, err return
} }
err = addon.Update(release) err = addon.Update(release)
if err != nil { if err != nil {
return nil, err return
} }
return addon, nil return addon, nil
} }

15
main.go
View File

@@ -7,7 +7,6 @@ import (
"io" "io"
"log" "log"
"os" "os"
"path/filepath"
"github.com/wailsapp/wails/v2" "github.com/wailsapp/wails/v2"
"github.com/wailsapp/wails/v2/pkg/options" "github.com/wailsapp/wails/v2/pkg/options"
@@ -35,8 +34,8 @@ var gamePath string
var addonService *AddonService var addonService *AddonService
type Settings struct { type Settings struct {
GamePath string `json:"gamePath"` GamePath string `json:"gamePath"`
Addons map[string]*Addon `json:"addons"` Addons map[string]Addon `json:"addons"`
} }
func main() { func main() {
@@ -49,12 +48,14 @@ func main() {
settings := Settings{} settings := Settings{}
err = json.NewDecoder(settingsFile).Decode(&settings) err = json.NewDecoder(settingsFile).Decode(&settings)
if err != nil { if err != nil {
Error.Printf("error decoding settings: %s", err) Warning.Printf("error decoding settings: %s", err)
return settings = Settings{}
} }
log.Printf("Loaded settings: %+v", settings)
addonService = NewAddonService() addonService = &AddonService{}
gamePath = filepath.Join("C:\\", "Games", "WoWRuski") addonService.Addons = settings.Addons
return
app := NewApp() app := NewApp()
err = wails.Run(&options.App{ err = wails.Run(&options.App{

13
settings.json Normal file
View File

@@ -0,0 +1,13 @@
{
"addons": {
"Channeler": {
"url": "https://git.site.quack-lab.dev/dave/wow_channeler"
},
"Heimdall": {
"url": "https://git.site.quack-lab.dev/dave/wow-Heimdall"
},
"Dechickenator": {
"url": "https://git.site.quack-lab.dev/dave/wow_dechickenator"
}
}
}