troops selection: add troops to country list

opencombat/strategy/manager.py

@@ -2,7 +2,9 @@
 from synergine2.config import Config
 from synergine2.log import get_logger
 
+from opencombat.strategy.team.stash import TeamStash
 from opencombat.strategy.troops import TroopClassBuilder
+from opencombat.strategy.unit.stash import UnitStash
 
 
 class TroopManager(object):
@@ -16,8 +18,18 @@ class TroopManager(object):
         self._logger = get_logger('TroopManager', config)
 
         builder = TroopClassBuilder(config)
-        self._unit_stash = builder.get_unit_stash(units_file_path)
+        self._unit_stash = builder.get_unit_stash(
+            units_file_path,
+        )
         self._team_stash = builder.get_team_stash(
             units_file_path,
             teams_file_path,
         )
+
+    @property
+    def team_stash(self) -> TeamStash:
+        return self._team_stash
+
+    @property
+    def unit_stash(self) -> UnitStash:
+        return self._unit_stash

opencombat/strategy/selection/gui.py

@@ -1,14 +1,18 @@
 # coding: utf-8
 import typing
 from tkinter import Tk
+from tkinter import Button
+from tkinter import YES
 from tkinter import StringVar
 from tkinter import OptionMenu
 from tkinter import W
+from tkinter.ttk import Combobox
+from tkinter.ttk import Treeview
 
 from synergine2.config import Config
 
 from opencombat.gui import Gui
-from opencombat.strategy.manager import TroopManager
+from opencombat.strategy.team.stash import TeamStash
 
 
 class SelectTroopsGui(Gui):
@@ -16,26 +20,105 @@ class SelectTroopsGui(Gui):
         self,
         config: Config,
         master: Tk,
-        troop_manager: TroopManager,
+        team_stash: TeamStash,
         countries: typing.List[str],
     ) -> None:
         super().__init__(config, master)
         self._master.title('Troops selection')
+        self._team_stash = team_stash
+        self._countries_troops = {}  # type: typing.Dict[str, typing.List[TeamModel]]  # nopep8
 
         # Widgets
-        self.selected_country_var = StringVar(self._master)
-        self.selected_country_var.set(countries[0])
-        self.selected_country_var.trace('w', self.change_country)
-        self.select_country_menu = OptionMenu(
+        self._selected_country_var = StringVar(self._master)
+        self._selected_country_var.set(countries[0])
+        self._selected_country_var.trace('w', self._country_changed)
+        self._select_country_menu = OptionMenu(
             self._master,
-            self.selected_country_var,
+            self._selected_country_var,
             *countries,
         )
 
+        self._teams_var = StringVar(self._master)
+        self._teams_list = Combobox(
+            self._master,
+            height=10,
+            state='readonly',
+            textvariable=self._teams_var,
+        )
+
+        self._add_troop_var = StringVar(self._master)
+        self._add_troop_button = Button(
+            self._master,
+            textvariable=self._add_troop_var,
+            command=self._add_troop,
+        )
+        self._add_troop_var.set('Add troop')
+
+        self._troops_view = Treeview(
+            self._master,
+            columns=('Soldiers',),
+            height=10,
+        )
+        self._troops_view.heading('#0', text='Team')
+        self._troops_view.heading('#1', text='Soldiers')
+        self._troops_view.column('#0', stretch=YES)
+        self._troops_view.column('#1', stretch=YES)
+
         # Layout
-        self.select_country_menu.grid(row=0, column=0, sticky=W)
+        self._select_country_menu.grid(row=0, column=0, sticky=W)
+        self._teams_list.grid(row=1, column=0, sticky=W)
+        self._add_troop_button.grid(row=2, column=0, sticky=W)
+        self._troops_view.grid(row=3, column=0, sticky=W)
+
+        # Default behaviours
+        self._selected_country_var.set(countries[0])
+        self._country_changed()
+
+    def _country_changed(self, *args, **kwargs) -> None:
+        country = self._selected_country_var.get()
 
-    def change_country(self, *args, **kwargs) -> None:
         self._logger.info('Change country to "{}"'.format(
-            self.selected_country_var.get(),
+            country,
         ))
+        country_team_names = [
+            t.name for
+            t in self._team_stash.get_team_by_country(
+                self._selected_country_var.get(),
+            )
+        ]
+
+        self._logger.debug('Change teams for: "{}"'.format(country_team_names))
+        self._teams_list['values'] = country_team_names
+        self._teams_var.set(country_team_names[0])
+        self._update_troops_view(country)
+
+    def _add_troop(self, *args, **kwargs) -> None:
+        if self._teams_var.get():
+            country = self._selected_country_var.get()
+            team_name = self._teams_var.get()
+
+            self._logger.info('Add troop "{}" to country "{}" troops'.format(
+                team_name,
+                team_name,
+            ))
+
+            team_model = self._team_stash.get_team_by_name(
+                team_name=team_name,
+                team_country=country,
+            )
+            self._countries_troops.setdefault(country, []).append(
+                team_model,
+            )
+            self._update_troops_view(country)
+
+    def _update_troops_view(self, country: str) -> None:
+        teams = self._countries_troops.get(country, [])
+
+        self._troops_view.delete(*self._troops_view.get_children())
+        for team in teams:
+            self._troops_view.insert(
+                '',
+                'end',
+                text=team.name,
+                values=('o' * len(team.units,))
+            )

opencombat/strategy/team/stash.py

@@ -21,6 +21,7 @@ class TeamStash(object):
         self._config = config
         self._teams = None  # type: typing.List[TeamModel]
         self._unit_stash = unit_stash
+        self._teams_file_path = teams_file_path
 
         self.schema_file_path = self._config.get(
             'global.teams_schema',
@@ -31,7 +32,7 @@ class TeamStash(object):
             self.schema_file_path,
         )
         self._root_element = self._xml_validator.validate_and_return(
-            teams_file_path,
+            self._teams_file_path,
         )
 
     def _get_computed_teams(self) -> typing.List[TeamModel]:
@@ -85,3 +86,29 @@ class TeamStash(object):
                 self.schema_file_path,
             )
         )
+
+    def get_team_by_name(
+        self,
+        team_name: str,
+        team_country: str,
+    ) -> TeamModel:
+        for team in self.teams:
+            if team.name == team_name and team.country == team_country:
+                return team
+
+        raise NotFoundException(
+            'No team matching with name "{}" and country "{}" in "{}"'.format(
+                team_name,
+                team_country,
+                self.schema_file_path,
+            )
+        )
+
+    def get_team_by_country(self, country: str) -> typing.List[TeamModel]:
+        teams = []  # type: typing.List[TeamModel]
+
+        for team in self.teams:
+            if team.country == country:
+                teams.append(team)
+
+        return teams

opencombat/strategy/teams.xml

@@ -1,7 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <teams>
     <team id="std_team" country="URSS">
-        <name>Standard team</name>
+        <name>Standard URSS team</name>
+        <units>
+            <unit>
+                <id>std_soldier</id>
+            </unit>
+            <unit>
+                <id>std_soldier</id>
+            </unit>
+            <unit>
+                <id>std_soldier</id>
+            </unit>
+            <unit>
+                <id>std_soldier</id>
+            </unit>
+        </units>
+    </team>
+    <team id="std_team" country="DE">
+        <name>Standard DE team</name>
         <units>
             <unit>
                 <id>std_soldier</id>

opencombat/strategy/troops.py

@@ -2,6 +2,7 @@
 from synergine2.config import Config
 from synergine2.log import get_logger
 
+from opencombat.strategy.team.stash import TeamStash
 from opencombat.strategy.unit.stash import UnitStash
 from opencombat.util import get_class_from_string_path
 
@@ -35,7 +36,7 @@ class TroopClassBuilder(object):
         self,
         units_file_path: str,
         teams_file_path: str,
-    ) -> UnitStash:
+    ) -> TeamStash:
         class_address = self._config.resolve(
             'global.team_stash',
             'opencombat.strategy.team.stash.TeamStash',

select_troops.py

@@ -27,7 +27,7 @@ def main(
     gui = SelectTroopsGui(
         config,
         master=master,
-        troop_manager=troop_manager,
+        team_stash=troop_manager.team_stash,
         countries=countries,
     )
     master.mainloop()

tests/fixtures/teams.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <teams>
     <team id="std_team" country="URSS">
-        <name>Standard team</name>
+        <name>Standard URSS team</name>
         <units>
             <unit>
                 <id>std_soldier</id>
@@ -18,7 +18,7 @@
         </units>
     </team>
     <team id="std_team" country="DE">
-        <name>Standard team</name>
+        <name>Standard DE team</name>
         <units>
             <unit>
                 <id>std_soldier</id>