From 7050773414c550b7693c41a9bdd8cb390d7ef647 Mon Sep 17 00:00:00 2001 From: Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com> Date: Thu, 29 Jun 2023 10:45:12 +0300 Subject: fix: record controller Former-commit-id: bff6b62474e02f644d93f49827145cfd92682c6f --- backend/parser/parser.go | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 backend/parser/parser.go (limited to 'backend/parser/parser.go') diff --git a/backend/parser/parser.go b/backend/parser/parser.go new file mode 100644 index 0000000..6f9a24f --- /dev/null +++ b/backend/parser/parser.go @@ -0,0 +1,7 @@ +package parser + +import "mime/multipart" + +func ProcessDemo(demo *multipart.FileHeader) (scoreCount int, scoreTime int, err error) { + return 0, 0, nil +} -- cgit v1.2.3 From 1a14309e212a697bae8acd4ddb17723b0f6670a6 Mon Sep 17 00:00:00 2001 From: Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com> Date: Mon, 3 Jul 2023 08:40:43 +0000 Subject: feat: parser for getting portal and tick count (#42) Former-commit-id: 1619ece868b7009a661dcc3b622746cc09981042 --- backend/controllers/recordController.go | 2 +- backend/parser/parser.go | 41 ++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 4 deletions(-) (limited to 'backend/parser/parser.go') diff --git a/backend/controllers/recordController.go b/backend/controllers/recordController.go index c865bfb..183ab27 100644 --- a/backend/controllers/recordController.go +++ b/backend/controllers/recordController.go @@ -106,7 +106,7 @@ func CreateRecordWithDemo(c *gin.Context) { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) return } - hostDemoScoreCount, hostDemoScoreTime, err = parser.ProcessDemo(record.HostDemo) + hostDemoScoreCount, hostDemoScoreTime, err = parser.ProcessDemo("parser/demos/" + header.Filename) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) return diff --git a/backend/parser/parser.go b/backend/parser/parser.go index 6f9a24f..040b94a 100644 --- a/backend/parser/parser.go +++ b/backend/parser/parser.go @@ -1,7 +1,42 @@ package parser -import "mime/multipart" +import ( + "bufio" + "fmt" + "os/exec" + "strconv" + "strings" +) -func ProcessDemo(demo *multipart.FileHeader) (scoreCount int, scoreTime int, err error) { - return 0, 0, nil +func ProcessDemo(demoPath string) (int, int, error) { + cmd := exec.Command("bash", "-c", fmt.Sprintf(`echo "FEXBash" && ./parser %s`, demoPath)) + stdout, err := cmd.StdoutPipe() + if err != nil { + return 0, 0, err + } + cmd.Start() + scanner := bufio.NewScanner(stdout) + var cmTicks, portalCount int + for scanner.Scan() { + line := scanner.Text() + if strings.Contains(line, "CM ticks") { + cmTicksStr := strings.TrimSpace(strings.Split(line, ":")[1]) + cmTicks, err = strconv.Atoi(cmTicksStr) + if err != nil { + return 0, 0, err + } + } + if strings.Contains(line, "Portal count") { + portalCountStr := strings.TrimSpace(strings.Split(line, ":")[1]) + portalCount, err = strconv.Atoi(portalCountStr) + if err != nil { + return 0, 0, err + } + } + } + err = cmd.Wait() + if err != nil { + return 0, 0, err + } + return cmTicks, portalCount, nil } -- cgit v1.2.3 From 50f5fff2873847b3e5df92d204e5166b641baeb2 Mon Sep 17 00:00:00 2001 From: Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com> Date: Mon, 3 Jul 2023 17:22:14 +0000 Subject: fix: parser actually works now (#42) Former-commit-id: 28378525f79e2879a1306b3bb169668d238cc117 --- backend/controllers/recordController.go | 13 ++++++++----- backend/parser/parser.go | 13 +++++++------ 2 files changed, 15 insertions(+), 11 deletions(-) (limited to 'backend/parser/parser.go') diff --git a/backend/controllers/recordController.go b/backend/controllers/recordController.go index 28c55e0..1c0f3b2 100644 --- a/backend/controllers/recordController.go +++ b/backend/controllers/recordController.go @@ -71,7 +71,10 @@ func CreateRecordWithDemo(c *gin.Context) { return } // Demo files - demoFiles := []*multipart.FileHeader{record.HostDemo, record.PartnerDemo} + demoFiles := []*multipart.FileHeader{record.HostDemo} + if isCoop { + demoFiles = append(demoFiles, record.PartnerDemo) + } var hostDemoUUID, hostDemoFileID, partnerDemoUUID, partnerDemoFileID string var hostDemoScoreCount, hostDemoScoreTime int client := serviceAccount() @@ -91,12 +94,12 @@ func CreateRecordWithDemo(c *gin.Context) { for i, header := range demoFiles { uuid := uuid.New().String() // Upload & insert into demos - err = c.SaveUploadedFile(header, "backend/parser/demos/"+header.Filename) + err = c.SaveUploadedFile(header, "backend/parser/"+header.Filename) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) return } - f, err := os.Open("backend/parser/demos/" + header.Filename) + f, err := os.Open("backend/parser/" + header.Filename) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) return @@ -107,7 +110,7 @@ func CreateRecordWithDemo(c *gin.Context) { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) return } - hostDemoScoreCount, hostDemoScoreTime, err = parser.ProcessDemo("backend/parser/demos/" + header.Filename) + hostDemoScoreCount, hostDemoScoreTime, err = parser.ProcessDemo("backend/parser/" + header.Filename) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) return @@ -125,7 +128,7 @@ func CreateRecordWithDemo(c *gin.Context) { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) return } - os.Remove("backend/parser/demos/" + header.Filename) + os.Remove("backend/parser/" + header.Filename) } // Insert into records if isCoop { diff --git a/backend/parser/parser.go b/backend/parser/parser.go index 040b94a..562b8c0 100644 --- a/backend/parser/parser.go +++ b/backend/parser/parser.go @@ -3,15 +3,17 @@ package parser import ( "bufio" "fmt" + "log" "os/exec" "strconv" "strings" ) func ProcessDemo(demoPath string) (int, int, error) { - cmd := exec.Command("bash", "-c", fmt.Sprintf(`echo "FEXBash" && ./parser %s`, demoPath)) + cmd := exec.Command("bash", "-c", fmt.Sprintf(`echo "FEXBash" && ./backend/parser/parser %s`, demoPath)) stdout, err := cmd.StdoutPipe() if err != nil { + log.Println(err) return 0, 0, err } cmd.Start() @@ -34,9 +36,8 @@ func ProcessDemo(demoPath string) (int, int, error) { } } } - err = cmd.Wait() - if err != nil { - return 0, 0, err - } - return cmTicks, portalCount, nil + cmd.Wait() + // We don't check for error in wait, since FEXBash always gives segmentation fault + // Wanted output is retrieved, so it's okay (i think) + return portalCount, cmTicks, nil } -- cgit v1.2.3