CSGOWTF/csgowtfd
3
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

added multi-parsing

Browse Source
This commit is contained in:
Giovanni Harting
2021-10-05 00:00:01 +02:00
parent 79d1df4cf3
commit 8eec0b3968
5 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
csgo/demo_parser.go
View File

@@ -29,15 +29,21 @@ type Demo struct {
type DemoParser struct {
demoQueue chan *Demo
tempDir string
db *ent.Client
lock *sync.RWMutex
}
type DemoNotFoundError struct {
error
}
func (p *DemoParser) Setup(db *ent.Client, lock *sync.RWMutex) error {
func (p *DemoParser) Setup(db *ent.Client, lock *sync.RWMutex, worker int) error {
p.demoQueue = make(chan *Demo, 1000)
go p.parseWorker(db, lock)
p.db = db
p.lock = lock
for i := 0; i < worker; i++ {
go p.parseWorker()
}
return nil
}
@@ -65,14 +71,14 @@ func (p *DemoParser) downloadReplay(demo *Demo) (io.Reader, error) {
}
func (p *DemoParser) getDBPlayer(db *ent.Client, lock *sync.RWMutex, demo *Demo, demoPlayer *common.Player) (*ent.Stats, error) {
lock.RLock()
tMatchPlayer, err := db.Stats.Query().WithMatches(func(q *ent.MatchQuery) {
func (p *DemoParser) getDBPlayer(demo *Demo, demoPlayer *common.Player) (*ent.Stats, error) {
p.lock.RLock()
tMatchPlayer, err := p.db.Stats.Query().WithMatches(func(q *ent.MatchQuery) {
q.Where(match.MatchID(demo.MatchId))
}).WithPlayers(func(q *ent.PlayerQuery) {
q.Where(player.Steamid(demoPlayer.SteamID64))
}).Only(context.Background())
lock.RUnlock()
p.lock.RUnlock()
if err != nil {
return nil, err
}
@@ -95,7 +101,7 @@ func (p *DemoParser) getMatchPlayerBySteamID(stats []*ent.Stats, steamId uint64)
return nil
}
func (p *DemoParser) parseWorker(db *ent.Client, lock *sync.RWMutex) {
func (p *DemoParser) parseWorker() {
for {
select {
case demo := <-p.demoQueue:
@@ -104,9 +110,9 @@ func (p *DemoParser) parseWorker(db *ent.Client, lock *sync.RWMutex) {
continue
}
lock.RLock()
tMatch, err := db.Match.Query().Where(match.MatchID(demo.MatchId)).Only(context.Background())
lock.RUnlock()
p.lock.RLock()
tMatch, err := p.db.Match.Query().Where(match.MatchID(demo.MatchId)).Only(context.Background())
p.lock.RUnlock()
if err != nil {
log.Errorf("[DP] Unable to get match %d: %v", demo.MatchId, err)
continue
@@ -136,9 +142,9 @@ func (p *DemoParser) parseWorker(db *ent.Client, lock *sync.RWMutex) {
}
downloadTime := time.Now().Sub(startTime)
lock.RLock()
p.lock.RLock()
tStats, err := tMatch.QueryStats().WithPlayers().All(context.Background())
lock.RUnlock()
p.lock.RUnlock()
if err != nil {
log.Errorf("[DP] Failed to find players for match %d: %v", demo.MatchId, err)
continue
@@ -292,18 +298,18 @@ func (p *DemoParser) parseWorker(db *ent.Client, lock *sync.RWMutex) {
continue
}
lock.Lock()
p.lock.Lock()
err = tMatch.Update().SetMap(demoParser.Header().MapName).SetDemoParsed(true).Exec(context.Background())
lock.Unlock()
p.lock.Unlock()
if err != nil {
log.Errorf("[DP] Unable to update match %d in database: %v", demo.MatchId, err)
continue
}
for _, tMatchPlayer := range tStats {
lock.Lock()
p.lock.Lock()
err := tMatchPlayer.Update().SetExtended(tMatchPlayer.Extended).Exec(context.Background())
lock.Unlock()
p.lock.Unlock()
if err != nil {
log.Errorf("[DP] Unable to update player %d in database: %v", tMatchPlayer.Edges.Players.Steamid, err)
continue