#52 Cleanup: series map numbers helper

Author: drweissbrot

src/themes/fennec/helpers/series-map-numbers.js

@@ -0,0 +1,13 @@
+// needs to be a `function` so `this` is the Vue component
+export function seriesMapNumbers() {
+	const mapNumbers = new Set()
+
+	for (const key of Object.keys(this.$opts)) {
+		if (key.startsWith('series.maps.')) {
+			const mapNumber = Number(key.substring(12).split('.', 2)[0])
+			mapNumbers.add(mapNumber)
+		}
+	}
+
+	return [...mapNumbers].sort((a, b) => a - b)
+}

src/themes/fennec/series-graph/series-graph.js

@@ -1,4 +1,5 @@
 import { formatMapName } from '/hud/helpers/format-map-name.js'
+import { seriesMapNumbers } from '/hud/helpers/series-map-numbers.js'
 import Match from '/hud/series-graph/match/match.vue'
 
 export default {
@@ -7,21 +8,17 @@ export default {
 	},
 
 	computed: {
-		matches() {
-			const mapNumbers = new Set()
-
-			for (const key of Object.keys(this.$opts)) {
-				if (key.startsWith('series.maps.')) mapNumbers.add(key.substring(12).split('.', 2)[0])
-			}
+		seriesMapNumbers,
 
+		matches() {
 			const maps = []
 
-			for (const mapNumber of [...mapNumbers].sort((a, b) => Number(a) - Number(b))) {
+			for (const mapNumber of this.seriesMapNumbers) {
 				const mapName = this.$opts[`series.maps.${mapNumber}.name`]
 				const scoreA = this.$opts[`series.maps.${mapNumber}.pickTeamScore`]
 				const scoreB = this.$opts[`series.maps.${mapNumber}.enemyTeamScore`]
 
-				const isOnlyMatch = mapNumbers.size === 1
+				const isOnlyMatch = this.seriesMapNumbers.length === 1
 				const isFirstMapWithoutScores = ! scoreA && ! scoreB && (mapNumber === 1 || maps[maps.length - 1]?.scores)
 
 				maps.push({

src/themes/fennec/sidebars/sidebar/sidebar.js

@@ -1,3 +1,4 @@
+import { seriesMapNumbers } from '/hud/helpers/series-map-numbers.js'
 import Player from '/hud/sidebars/sidebar/player/player.vue'
 import TeamEquipment from '/hud/sidebars/sidebar/team-equipment/team-equipment.vue'
 import TeamGrenades from '/hud/sidebars/sidebar/team-grenades/team-grenades.vue'
@@ -21,14 +22,11 @@ export default {
 
 		hasSeriesGraph() {
 			if (this.$opts['preferences.seriesGraph.showMapForOnlyMatch']) return true
-
-			const mapNumbers = new Set()
-
-			for (const key of Object.keys(this.$opts)) {
-				if (key.startsWith('series.maps.')) mapNumbers.add(key.substring(12).split('.', 2)[0])
-			}
-
-			return mapNumbers.size > 1
+			return this.seriesMapNumbers().length > 1
 		},
-	}
+	},
+
+	methods: {
+		seriesMapNumbers,
+	},
 }

src/themes/fennec/top-bar/center/center.js

@@ -1,3 +1,4 @@
+import { seriesMapNumbers } from '/hud/helpers/series-map-numbers.js'
 import CurrentMap from '/hud/top-bar/center/current-map/current-map.vue'
 import CurrentRound from '/hud/top-bar/center/current-round/current-round.vue'
 import Digits from '/hud/digits/digits.vue'
@@ -17,13 +18,11 @@ export default {
 
 	computed: {
 		isMultipleMapSeries() {
-			const mapNumbers = new Set()
-
-			for (const key of Object.keys(this.$opts)) {
-				if (key.startsWith('series.maps.')) mapNumbers.add(key.substring(12).split('.', 2)[0])
-			}
-
-			return mapNumbers.size > 1
+			return this.seriesMapNumbers().length > 1
 		},
 	},
+
+	methods: {
+		seriesMapNumbers,
+	},
 }

src/themes/fennec/top-bar/center/current-map/current-map.js

@@ -1,33 +1,25 @@
+import { seriesMapNumbers } from '/hud/helpers/series-map-numbers.js'
+
 export default {
 	computed: {
-		currentMapNumber() {
-			const mapNumbers = new Set()
-
-			for (const key of Object.keys(this.$opts)) {
-				if (key.startsWith('series.maps.')) mapNumbers.add(key.substring(12).split('.', 2)[0])
-			}
+		seriesMapNumbers,
 
-			if (mapNumbers.size === 1) return 1
+		currentMapNumber() {
+			if (this.seriesMapNumbers.length < 2) return 1
 
-			for (const mapNumber of [...mapNumbers].sort((a, b) => Number(a) - Number(b))) {
+			for (const mapNumber of this.seriesMapNumbers) {
 				const scoreA = this.$opts[`series.maps.${mapNumber}.pickTeamScore`]
 				const scoreB = this.$opts[`series.maps.${mapNumber}.enemyTeamScore`]
 
-				const isFirstMapWithoutScores = !scoreA && !scoreB
+				const isFirstMapWithoutScores = ! scoreA && ! scoreB
 				if (isFirstMapWithoutScores) return mapNumber
 			}
 
 			return 1
 		},
 
 		seriesLength() {
-			const mapNumbers = new Set()
-
-			for (const key of Object.keys(this.$opts)) {
-				if (key.startsWith('series.maps.')) mapNumbers.add(key.substring(12).split('.', 2)[0])
-			}
-
-			return mapNumbers.size
+			return this.seriesMapNumbers.length
 		},
 	},
 }

src/themes/fennec/top-bar/center/map-wins/map-wins.js

@@ -1,3 +1,4 @@
+import { seriesMapNumbers } from '/hud/helpers/series-map-numbers.js'
 import { teamColorClass } from '/hud/helpers/team-color-class.js'
 
 export default {
@@ -16,12 +17,7 @@ export default {
 		},
 
 		pips() {
-			const mapNumbers = new Set()
-
-			for (const key of Object.keys(this.$opts)) {
-				if (key.startsWith('series.maps.')) mapNumbers.add(key.substring(12).split('.', 2)[0])
-			}
-
+			const mapNumbers = this.seriesMapNumbers()
 			const pips = []
 
 			for (const mapNumber of mapNumbers) {
@@ -34,8 +30,12 @@ export default {
 				} else if (scoreB > scoreA) pips.push(true)
 			}
 
-			const maxMapWins = Math.floor(mapNumbers.size / 2) + 1
+			const maxMapWins = Math.floor(mapNumbers.length / 2) + 1
 			return [...pips, ...new Array(maxMapWins - pips.length).fill(false)]
 		},
 	},
+
+	methods: {
+		seriesMapNumbers,
+	},
 }

src/themes/fennec/top-bar/center/match-point-rounds/match-point-rounds.js

@@ -1,3 +1,5 @@
+import { seriesMapNumbers } from '/hud/helpers/series-map-numbers.js'
+
 export default {
 	computed: {
 		isMatchPointRoundsActive() {
@@ -6,13 +8,11 @@ export default {
 		},
 
 		isMultipleMapSeries() {
-			const mapNumbers = new Set()
-
-			for (const key of Object.keys(this.$opts)) {
-				if (key.startsWith('series.maps.')) mapNumbers.add(key.substring(12).split('.', 2)[0])
-			}
-
-			return mapNumbers.size > 1
+			return this.seriesMapNumbers().length > 1
 		},
 	},
+
+	methods: {
+		seriesMapNumbers,
+	},
 }