Feat: Map rotation includes current and next map index

Author: Dorfieeee

rcon/commands.py

@@ -8,7 +8,7 @@
 
 from rcon.connection import HLLCommandError, HLLConnection, Handle, Response
 from rcon.maps import LAYERS, MAPS, UNKNOWN_MAP_NAME, Environment, GameMode, LayerType
-from rcon.types import MapSequenceResponse, ServerInfoType, SlotsType, VipId, GameStateType, AdminType
+from rcon.types import MapRotationResponse, MapSequenceResponse, ServerInfoType, SlotsType, VipId, GameStateType, AdminType
 from rcon.utils import exception_in_chain
 
 logger = logging.getLogger(__name__)
@@ -347,8 +347,12 @@ def get_votekick_thresholds(self) -> list[list[int]]:
         thresholds = self.exchange("GetVoteKickThreshold", 2).content_dict["voteThresholdList"]
         return [[int(x["playerCount"]), int(x["voteThreshold"])] for x in thresholds]
 
-    def get_map_rotation(self) -> list[str]:
-        return [x["iD"] for x in self.exchange("GetServerInformation", 2, {"Name": "maprotation", "Value": ""}).content_dict["mAPS"]]
+    def get_map_rotation(self) -> MapRotationResponse:
+        data = self.exchange("GetServerInformation", 2, {"Name": "maprotation", "Value": ""}).content_dict
+        return {
+            "maps": [x["iD"] for x in data["mAPS"]],
+            "current_index": data["currentIndex"]
+        }
 
     def get_map_sequence(self) -> MapSequenceResponse:
         data = self.exchange("GetServerInformation", 2, {"Name": "mapsequence", "Value": ""}).content_dict
@@ -481,7 +485,7 @@ def add_map_to_rotation(
             map_name: str,
             after_map_name: str | None = None,
     ):
-        rotation = self.get_map_rotation()
+        rotation = self.get_map_rotation()["maps"]
 
         map_index = len(rotation)
         if after_map_name:
@@ -496,7 +500,7 @@ def add_map_to_rotation_at_index(self, map_name: str, map_index: int):
         self.exchange("AddMapToRotation", 2, {"MapName": map_name, "Index": map_index})
 
     def remove_map_from_rotation(self, map_name: str):
-        rotation = self.get_map_rotation()
+        rotation = self.get_map_rotation()["maps"]
         try:
             map_index = rotation.index(map_name)
         except ValueError:

rcon/rcon.py

@@ -26,6 +26,7 @@
     GameStateType,
     GetDetailedPlayer,
     GetDetailedPlayers,
+    GetMapRotation,
     GetMapSequence,
     GetPlayersType,
     ParsedLogsType,
@@ -1120,16 +1121,27 @@ def perma_ban(self, player_id: str, reason="", by="", player_name: str | None =
         return res
 
     @ttl_cache(60 * 5)
-    def get_map_rotation(self) -> list[Layer]:
-        l = super().get_map_rotation()
+    def get_map_rotation(self) -> GetMapRotation:
+        map_rotation = super().get_map_rotation()
+        map_sequence = super().get_map_sequence()
+        map_rotation_list = map_rotation["maps"]
 
         maps: list[Layer] = []
-        for map_ in l:
+        for map_ in map_rotation_list:
             if not self.map_regexp.match(map_):
                 raise HLLCommandFailedError("Server returned wrong data")
 
             maps.append(parse_layer(map_))
-        return maps
+
+        next_map_index = map_sequence["current_index"] + 1
+        if (next_map_index >= len(map_sequence["maps"])):
+            next_map_index = 0
+
+        return {
+            "maps": maps,
+            "current_index": map_sequence["current_index"],
+            "next_index": next_map_index,
+        }
 
     @ttl_cache(60 * 5)
     def get_map_sequence(self) -> GetMapSequence:
@@ -1187,7 +1199,7 @@ def remove_map_from_rotation(self, map_name: str):
 
     def remove_map_from_rotation_at_index(self, map_index: int):
         if map_index < 0:
-            rotation = self.get_map_rotation()
+            rotation = self.get_map_rotation()["maps"]
             map_index = len(rotation) + map_index + 1
 
         with invalidates(
@@ -1208,7 +1220,7 @@ def remove_maps_from_rotation(self, map_names: list[str]):
 
     def add_maps_to_rotation(self, map_names: list[str]):
         """Add the given maps to the rotation, returns the game server response for each map"""
-        rotation = self.get_map_rotation()
+        rotation = self.get_map_rotation()["maps"]
         results = []
         with invalidates(
                 Rcon.get_map_rotation,
@@ -1229,7 +1241,7 @@ def set_map_rotation(self, map_names: list[str]):
         map_names = list(map_names)
         logger.info("Apply map rotation %s", map_names)
 
-        rotation = self.get_map_rotation()
+        rotation = self.get_map_rotation()["maps"]
         rotation_size = len(rotation)
 
         with invalidates(

rcon/scoreboard.py

@@ -319,7 +319,7 @@ def build_map_rotation_embed(
     embed = DiscordEmbed()
     embed.set_url(str(config.public_scoreboard_url))
 
-    rotation: list[Layer] = rcon_api.get_map_rotation()
+    rotation: list[Layer] = rcon_api.get_map_rotation()["maps"]
     gamestate: GameStateType = rcon_api.get_gamestate()
 
     title = ""

rcon/types.py

@@ -894,3 +894,12 @@ class MapSequenceResponse(TypedDict):
 class GetMapSequence(TypedDict):
     maps: list[Layer]
     current_index: int
+
+class MapRotationResponse(TypedDict):
+    maps: list[str]
+    current_index: int
+
+class GetMapRotation(TypedDict):
+    maps: list[Layer]
+    current_index: int
+    next_index: int

rcon/vote_map.py

@@ -795,7 +795,7 @@ def apply_results(self):
         rcon.set_map_rotation([next_map.id])
 
         # Check that it worked
-        current_rotation = rcon.get_map_rotation()
+        current_rotation = rcon.get_map_rotation()["maps"]
         if len(current_rotation) != 1 or current_rotation[0] != next_map:
             raise ValueError(
                 f"Applying the winning map {next_map=} failed: {current_rotation=}"

rcongui/src/components/cards/MapRotationCard.jsx

@@ -13,7 +13,7 @@ const MapRotationCard = () => {
   return (
     <ScrollableCard sx={{ height: "100%" }} title="Map Rotation">
       <Stack divider={<Divider sx={{ my: 0.2 }} />}>
-        {mapRotation.map((map) => (
+        {mapRotation.maps.map((map) => (
           <MapDetailsCardCompact key={map.id} mapLayer={map} />
         ))}
       </Stack>

rcongui/src/pages/settings/maps/MapListBuilder.jsx

@@ -39,6 +39,7 @@ export function MapListBuilder({
   isSaving,
   exclusive = false,
   actions,
+  params = {},
 }) {
   const [mapSelection, setMapSelection] = useState(
     selectedMaps.map(withSelectionId)
@@ -192,6 +193,7 @@ export function MapListBuilder({
               isDisabled={isSaveDisabled}
               isSaving={isSaving}
               actions={actions}
+              params={params}
             />
           </Grid>
         )}

rcongui/src/pages/settings/maps/rotation/builder/SortableRotationItem.jsx

@@ -1,10 +1,10 @@
-import { Box, IconButton, Tooltip } from "@mui/material";
+import { Box, Chip, IconButton, Stack, Tooltip } from "@mui/material";
 import CloseIcon from "@mui/icons-material/Close";
 import { useSortable } from "@dnd-kit/sortable";
 import { CSS } from "@dnd-kit/utilities";
 import { MapDetailsCard } from "../../MapDetailsCard";
 
-function SortableRotationItem({ item, onRemove }) {
+function SortableRotationItem({ item, onRemove, isNext }) {
   const {
     attributes,
     listeners,
@@ -64,13 +64,14 @@ function SortableRotationItem({ item, onRemove }) {
         </Box>
         <MapDetailsCard mapLayer={mapLayer} />
       </Box>
-      <Box sx={{ display: "flex", gap: 1 }}>
+      <Stack direction={"row"} gap={0.25} alignItems={"center"}>
+        {isNext && <Chip color="secondary" label="Next" />}
         <Tooltip title="Remove from rotation">
           <IconButton size="small" onClick={() => onRemove(mapLayer)} color="error">
             <CloseIcon fontSize="small" />
           </IconButton>
         </Tooltip>
-      </Box>
+      </Stack>
     </Box>
   );
 }

rcongui/src/pages/settings/maps/rotation/builder/SortableRotationList.jsx

@@ -30,6 +30,7 @@ export function SortableRotationList({
   onSave,
   isDisabled,
   actions,
+  params,
 }) {
   // Set up DnD sensors
   const sensors = useSensors(
@@ -173,13 +174,26 @@ export function SortableRotationList({
               items={maps.map((item) => item.selectionId)}
               strategy={verticalListSortingStrategy}
             >
-              {maps.map((item, index) => (
-                <SortableRotationItem
-                  key={item.selectionId}
-                  item={item}
-                  onRemove={onRemove}
-                />
-              ))}
+              {maps.map((item, index, tempRotation) => {
+                console.log(tempRotation, params, index)
+                let isNext = false;
+                if (tempRotation.length === 1) {
+                  isNext = true
+                } else if (params.currentMapIndex === params.nextMapIndex) {
+                  isNext = (index + 1) === params.nextMapIndex
+                } else {
+                  isNext = index === params.nextMapIndex
+                }
+
+                return (
+                  <SortableRotationItem
+                    key={item.selectionId}
+                    item={item}
+                    onRemove={onRemove}
+                    isNext={isNext}
+                  />
+                )
+              })}
             </SortableContext>
           </DndContext>
         ) : (

rcongui/src/pages/settings/maps/rotation/builder/index.jsx

@@ -57,14 +57,18 @@ function MapRotationBuilder() {
       )}
       <MapListBuilder
         maps={maps}
-        selectedMaps={currentRotation}
+        selectedMaps={currentRotation.maps}
         slots={{
           SelectedMapList: SortableRotationList,
           MapListItem: MapBuilderListItem,
         }}
         onSave={saveRotation}
         isSaving={isRotationSaving}
         isSaveDisabled={isRotationSaving}
+        params={{
+          nextMapIndex: currentRotation.next_index,
+          currentMapIndex: currentRotation.current_index,
+        }}
       />
     </>
   );