Lbenedar/Foundry-Scrapping-API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finish setup data insertion, add world insertion

Browse Source
This commit is contained in:
lbenedar
2026-04-22 18:18:43 +03:00
parent 21abe68858
commit f46ff8333e
66 changed files with 2257 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
internal/foundry/transport/db.go
View File

@@ -1,9 +1,9 @@
package transport
import (
"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/json"
"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/requests"
"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/json"
"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/types"
)
@@ -14,22 +14,22 @@ func (tr *FoundryTransport) FillDBWithFoundryData() {
return
}
idState, err := tr.Models.FoundryState.GetIdByType(db.SetupState)
if err != nil {
tr.ReadChan.Err() <- &types.FoundryError{Direction: types.WriterCode, Err: err, Type: types.DbCode}
return
}
// idState, err := tr.Models.FoundryState.GetIdByType(db.SetupState)
// if err != nil {
// tr.ReadChan.Err() <- &types.FoundryError{Direction: types.WriterCode, Err: err, Type: types.DbCode}
// return
// }
err = tr.InitWorldsData(idState)
if err != nil {
tr.ReadChan.Err() <- &types.FoundryError{Direction: types.WriterCode, Err: err, Type: types.DbCode}
return
}
// err = tr.InitWorldsData(idState)
// if err != nil {
// tr.ReadChan.Err() <- &types.FoundryError{Direction: types.WriterCode, Err: err, Type: types.DbCode}
// return
// }
}
func (tr *FoundryTransport) InitSetupData() error {
tr.Models.FoundryState.DeleteAll()
tr.Models.FoundryState.DeleteAllSeq()
db.DeleteAll(tr.DB)
db.DeleteAllSeq(tr.DB)
for k := range requests.PathToSetupState {
err := tr.InsertJsonDataToDB(k)
if err != nil {
@@ -51,48 +51,51 @@ func (tr *FoundryTransport) InsertJsonDataToDB(statePath string) error {
return err
}
foundryStateJson, err := json.ParseSetupModel(msgJson)
foundryStateJson, err := json.ParseSetup(msgJson)
if err != nil {
return err
}
foundryStateDb := foundryStateJson.GetFoundryStateDB(requests.PathToSetupState[statePath])
err = tr.Models.FoundryState.Insert(foundryStateDb)
tr.Logger.Info("Setup data received")
var foundryStateDb db.Setup
foundryStateJson.ToDB(&foundryStateDb)
err = foundryStateDb.Insert(tr.DB)
if err != nil {
return err
}
return nil
}
func (tr *FoundryTransport) InitWorldsData(idState int64) error {
worlds, err := tr.Models.FoundryState.GetWorlds(idState)
if err != nil {
return err
}
tr.Logger.Debug("Worlds", "len", len(worlds))
// func (tr *FoundryTransport) InitWorldsData(idState int64) error {
// worlds, err := tr.Models.FoundryState.GetWorlds(idState)
// if err != nil {
// return err
// }
// tr.Logger.Debug("Worlds", "len", len(worlds))
for i := range worlds {
worldName := worlds[i].TextId
tr.InitWorldData(worldName)
_, err = tr.Http.PostReturnToSetup()
if err != nil {
return err
}
}
return nil
}
// for i := range worlds {
// worldName := worlds[i].TextId
// tr.InitWorldData(worldName)
// _, err = tr.Http.PostReturnToSetup()
// if err != nil {
// return err
// }
// }
// return nil
// }
func (tr *FoundryTransport) InitWorldData(worldName string) error {
tr.Logger.Debug("World name", "name", worldName)
err := tr.LaunchWorld(worldName)
if err != nil {
return err
}
for k := range requests.PathToWorldState {
err := tr.InsertJsonDataToDB(k)
if err != nil {
return err
}
}
return nil
}
// func (tr *FoundryTransport) InitWorldData(worldName string) error {
// tr.Logger.Debug("World name", "name", worldName)
// err := tr.LaunchWorld(worldName)
// if err != nil {
// return err
// }
// for k := range requests.PathToWorldState {
// err := tr.InsertJsonDataToDB(k)
// if err != nil {
// return err
// }
// }
// return nil
// }

6
internal/foundry/transport/transport.go
View File

@@ -5,7 +5,6 @@ import (
"sync"
"time"
"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/requests"
"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/types"
"github.com/gorilla/websocket"
@@ -26,7 +25,8 @@ type FoundryTransport struct {
IsAuth bool
IsLogin bool
Models *db.Models
// Models *db.Models
DB *sqlx.DB
IsDbInit bool
Logger *slog.Logger
@@ -47,7 +47,7 @@ func NewFoundryTransport(dbConn *sqlx.DB, logger *slog.Logger, httpConfig *reque
ReconnectNumMax: 1,
ReconnectNum: 0,
Models: db.NewModels(dbConn),
DB: dbConn,
IsDbInit: false,
Logger: logger,