Skirda/sharedutils
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge games into one package

Browse Source
This commit is contained in:
cyber-dream 2023-02-12 19:43:44 +03:00
parent 0cef129db6
commit 9234cc2edc
4 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
domain/domain.go
View File

@ -3,17 +3,16 @@ package domain
import (
"errors"
"git.gregbrzezinski.com/Skirda/skirdaGoLauncher/sharedutils/games/skirdagame"
"git.gregbrzezinski.com/Skirda/skirdaGoLauncher/sharedutils/skirdasession"
)
type SkirdaDomain struct {
DomainId string
skirdagame.SkirdaGames
SkirdaGames
skirdasession.SkirdaSessions
}
func (domain SkirdaDomain) BuildDomain(newGames []skirdagame.SkirdaGame, newSessions []skirdasession.SkirdaSession) {
func (domain SkirdaDomain) BuildDomain(newGames []SkirdaGame, newSessions []skirdasession.SkirdaSession) {
domain.AddGames(newGames)
domain.AddSessions(newSessions)
}
@ -24,7 +23,7 @@ func (domains Domains) Set(newDomains []SkirdaDomain) {
domains = append([]SkirdaDomain{}, newDomains...)
}
func (domains Domains) FindGameByID(gameId string) (skirdagame.SkirdaGame, error) {
func (domains Domains) FindGameByID(gameId string) (SkirdaGame, error) {
for _, domain := range domains {
game, _ := domain.FindGameByID(gameId)
if game.GetSkirdaGameId() == gameId {
@ -35,8 +34,8 @@ func (domains Domains) FindGameByID(gameId string) (skirdagame.SkirdaGame, error
return nil, errors.New("")
}
func (domains Domains) GetGames() skirdagame.SkirdaGames {
allGames := skirdagame.SkirdaGames{}
func (domains Domains) GetGames() SkirdaGames {
allGames := SkirdaGames{}
for _, domain := range domains {
allGames = append(allGames, domain.SkirdaGames...)
}

16
games/minecraftgame/minecraftgame.go → domain/minecraftgame.go
View File

@ -1,12 +1,10 @@
package minecraftgame
package domain
import "git.gregbrzezinski.com/Skirda/skirdaGoLauncher/sharedutils/games/skirdagame"
const gameType = "minecraft"
// const gameType = "minecraft"
type MinecraftGame struct {
SkirdaGameId string
Assets skirdagame.GameUIAssets
Assets GameUIAssets
Versions []string
}
@ -14,7 +12,7 @@ func (game MinecraftGame) GetSkirdaGameId() string {
return game.SkirdaGameId
}
func (game MinecraftGame) GetUIAssets() skirdagame.GameUIAssets {
func (game MinecraftGame) GetUIAssets() GameUIAssets {
return game.Assets
}
@ -23,11 +21,11 @@ func (game MinecraftGame) GetLaunchArgs() []string {
}
func (game MinecraftGame) GetType() string {
return gameType
return "minecraft"
}
func (game MinecraftGame) GetArguments() skirdagame.Arguments {
return skirdagame.Arguments{}
func (game MinecraftGame) GetArguments() Arguments {
return Arguments{}
}
func (game MinecraftGame) GetVersions() []string {

2
games/skirdagame/skirdagame.go → domain/skirdagame.go
View File

@ -1,4 +1,4 @@
package skirdagame
package domain
import "errors"

16
games/steamgame/steamgame.go → domain/steamgame.go
View File

@ -1,14 +1,10 @@
package steamgame
import "git.gregbrzezinski.com/Skirda/skirdaGoLauncher/sharedutils/games/skirdagame"
const gameType = "steam"
package domain
type SteamGame struct {
SkirdaGameId string
SteamId string
Assets skirdagame.GameUIAssets
Arguments skirdagame.Arguments
Assets GameUIAssets
Arguments Arguments
// CurrentVersion string
}
@ -16,7 +12,7 @@ func (game SteamGame) GetSkirdaGameId() string {
return game.SkirdaGameId
}
func (game SteamGame) GetUIAssets() skirdagame.GameUIAssets {
func (game SteamGame) GetUIAssets() GameUIAssets {
return game.Assets
}
@ -25,9 +21,9 @@ func (game SteamGame) GetLaunchArgs() []string {
}
func (game SteamGame) GetType() string {
return gameType
return "steam"
}
func (game SteamGame) GetArguments() skirdagame.Arguments {
func (game SteamGame) GetArguments() Arguments {
return game.Arguments
}