Merge branch 'main' into images

Author: Kesuaheli

quiz/connection.go

@@ -145,7 +145,7 @@ func (c *Connection) NewGame(data []byte) error {
 	var rounds []*Round
 	for name, n := range gameData.Categories {
 		cat := Categories.GetCategoryByName(name)
-		if cat.Title == "" {
+		if cat.ID == "" {
 			return fmt.Errorf("create game: unknown category '%s'", name)
 		}
 		rounds = append(rounds, cat.GetRounds(n)...)

quiz/global.go

@@ -45,19 +45,19 @@ func FetchQuestions() (err error) {
 			var data []byte
 			data, err = json.MarshalIndent(cat, "", "	")
 			if err != nil {
-				log.Printf("Error marshaling category '%s': %v", cat.Title, err)
+				log.Printf("Error marshaling category '%s': %v", cat.ID, err)
 				continue
 			}
 			err = os.Mkdir("sheets/"+group.Title, os.ModeDir)
 			if err != nil {
 				if !errors.Is(err, os.ErrExist) {
-					log.Printf("Error creting json file of category '%s/%s': %v", group.Title, cat.Title, err)
+					log.Printf("Error creting json file of category '%s/%s': %v", group.Title, cat.ID, err)
 					continue
 				}
 			}
-			err = os.WriteFile("sheets/"+group.Title+"/"+cat.Title+".json", data, 0644)
+			err = os.WriteFile("sheets/"+group.Title+"/"+cat.ID+".json", data, 0644)
 			if err != nil {
-				log.Printf("Error writing json file of category '%s/%s': %v", group.Title, cat.Title, err)
+				log.Printf("Error writing json file of category '%s/%s': %v", group.Title, cat.ID, err)
 			}
 		}
 	}

quiz/sheets.go

@@ -71,6 +71,7 @@ func parseCategoryGroups(s *sheets.Sheet, categories map[int]CategoryGroup) {
 
 		hexColor := intFromColor(color)
 		categoryGroup := categories[hexColor]
+		categoryGroup.ID = row.Values[0].FormattedValue
 		categoryGroup.Title = row.Values[1].FormattedValue
 		categoryGroup.IsDev = row.Values[2].FormattedValue == "TRUE"
 		categoryGroup.IsRelease = row.Values[3].FormattedValue == "TRUE"
@@ -79,13 +80,14 @@ func parseCategoryGroups(s *sheets.Sheet, categories map[int]CategoryGroup) {
 }
 
 func parseSheet(s *sheets.Sheet) Category {
-	category := Category{Title: s.Properties.Title}
+	var category Category
+	category.ID = s.Properties.Title
 
 	for rowNum, row := range s.Data[0].RowData {
 		if rowNum <= 1 {
 			if rowNum == 0 && len(row.Values) > 0 {
-				// get description from first cell in first row
-				category.Description = row.Values[0].FormattedValue
+				// get title from first cell in first row
+				category.Title = row.Values[0].FormattedValue
 			}
 			// ignore rest of 1st + 2nd row
 			continue

quiz/types.go

@@ -28,17 +28,41 @@ type GameSummary struct {
 	ChatWon        int `json:"chat_won"`
 }
 
+type CategoryGroupDefinition struct {
+	ID         string               `json:"id"`
+	Title      string               `json:"title"`
+	IsDev      bool                 `json:"-"`
+	IsRelease  bool                 `json:"-"`
+	Categories []CategoryDefinition `json:"categories"`
+}
+
 type CategoryGroup struct {
-	Title      string     `json:"title"`
-	IsDev      bool       `json:"-"`
-	IsRelease  bool       `json:"-"`
+	CategoryGroupDefinition
 	Categories []Category `json:"categories"`
 }
 
+func (cg CategoryGroup) GetDefinition() CategoryGroupDefinition {
+	cg.CategoryGroupDefinition.Categories = make([]CategoryDefinition, len(cg.Categories))
+	for i, c := range cg.Categories {
+		cg.CategoryGroupDefinition.Categories[i] = c.GetDefinition()
+	}
+	return cg.CategoryGroupDefinition
+}
+
+type CategoryDefinition struct {
+	ID    string `json:"id"`
+	Title string `json:"title"`
+	Count int    `json:"count,omitempty"`
+}
+
 type Category struct {
-	Title       string      `json:"-"`
-	Description string      `json:"description"`
-	Pool        []*Question `json:"pool"`
+	CategoryDefinition
+	Pool []*Question `json:"pool"`
+}
+
+func (c Category) GetDefinition() CategoryDefinition {
+	c.CategoryDefinition.Count = len(c.Pool)
+	return c.CategoryDefinition
 }
 
 type Question struct {
@@ -66,7 +90,7 @@ type Round struct {
 	Current  int                  `json:"current_round"`
 	Max      int                  `json:"max_round"`
 	Group    string               `json:"group"`
-	Category string               `json:"category"`
+	Category CategoryDefinition   `json:"category"`
 }
 
 type RoundSummary struct {
@@ -88,14 +112,22 @@ var log = logger.New(logger.Writer(), "[WEB] ", logger.LstdFlags|logger.Lmsgpref
 func (cg categoryGroups) GetCategoryByName(name string) Category {
 	for _, group := range cg {
 		for _, c := range group.Categories {
-			if c.Title == name {
+			if c.ID == name {
 				return c
 			}
 		}
 	}
 	return Category{}
 }
 
+func (cg categoryGroups) GetDefinition() (definitions map[int]CategoryGroupDefinition) {
+	definitions = make(map[int]CategoryGroupDefinition, len(cg))
+	for color, group := range cg {
+		definitions[color] = group.GetDefinition()
+	}
+	return definitions
+}
+
 func (g Game) GetRoundSummary() RoundSummary {
 	sum := RoundSummary{
 		StreamerPoints: g.Summary.StreamerPoints,
@@ -198,7 +230,7 @@ func (c Category) GetRounds(n int) []*Round {
 			continue
 		}
 		round := q.ToRound()
-		round.Category = c.Title
+		round.Category = c.GetDefinition()
 		rounds = append(rounds, &round)
 	}
 	return rounds

webserver/handle.go

@@ -178,14 +178,7 @@ func handleChat(w http.ResponseWriter, r *http.Request) {
 }
 
 func handleCategory(w http.ResponseWriter, r *http.Request) {
-	categories := make(map[string]int)
-	for _, group := range quiz.Categories {
-		for _, cat := range group.Categories {
-			categories[cat.Title] = len(cat.Pool)
-		}
-	}
-
-	b, err := json.Marshal(categories)
+	b, err := json.Marshal(quiz.Categories.GetDefinition())
 	if err != nil {
 		log.Printf("Failed to marshal categories: %v", err)
 		w.WriteHeader(http.StatusInternalServerError)