Add Basic Database functions.

dsst/dsst_core/core.py

@@ -1,59 +0,0 @@
-import datetime
-from dsst_core import models, sql
-
-
-class DSSTCore:
-    def __init__(self):
-        # Set DB Connection
-        sql.create_tables()
-
-    @staticmethod
-    def insert_player(model: models.Player):
-        sql.Player.create(name=model.name, hex_id=model.hex_id)
-
-    @staticmethod
-    def insert_enemy(enemy: models.Enemy):
-        sql.Enemy.create(name=enemy.name)
-
-    @staticmethod
-    def insert_drink(model: models.Drink):
-        sql.Drink.create(name=model.name, vol=model.vol)
-
-    @staticmethod
-    def insert_season(season: models.Season):
-        sql.Season.create(number=season.number, game_name=season.game_name, start_date=season.start_date,
-                          end_date=season.end_date)
-
-    @staticmethod
-    def insert_episode(episode: models.Episode):
-        sql.Episode.update()
-
-if __name__ == '__main__':
-    core = DSSTCore()
-    # Insert player
-    # player = models.Player()
-    # player.name = 'Marvin'
-    # core.insert_player(player)
-
-    # Insert a Season
-    # season = models.Season()
-    # season.number = 1
-    # season.game_name = 'Dark Souls'
-    # season.start_date = datetime.date(2017, 1, 1)
-    # core.insert_season(season)
-
-    # core.insert_drink(models.Drink({'name': 'Pfeffi', 'vol': 22.5}))
-
-    # core.insert_enemy(models.Enemy({'name': 'Newton'}))
-
-    # Insert an episode
-    ep = models.Episode()
-    ep.date = datetime.date(2017, 2, 5)
-    ep.number = 1
-    ep.seq_number = 1
-    ep.players = [models.Player({'id': 1,}), models.Player({'id': 2})]
-    ep.deaths = [models.Death({
-        'player': 1,
-        'enemy': 1,
-        'penalty': 1,
-    })]

dsst/dsst_core/models.py

@@ -1,63 +0,0 @@
-class Season:
-    def __init__(self, arg={}):
-        self.id = arg.get('id')
-        self.game_name = arg.get('game_name')
-        self.number = arg.get('number')
-        self.start_date = arg.get('start_date')
-        self.end_date = arg.get('end_date')
-
-        self.players = arg.get('players')
-        self.enemies = arg.get('enemies')
-        self.episodes = arg.get('episodes')
-
-
-class Episode:
-    def __init__(self, arg={}):
-        self.id = arg.get('id')
-        self.seq_number = arg.get('seq_number')
-        self.number = arg.get('number')
-        self.date = arg.get('date')
-
-        self.players = arg.get('players')
-        self.enemies = arg.get('enemies')
-        self.deaths = arg.get('deaths')
-        self.victories = arg.get('victories')
-
-
-class GameEvent:
-    def __init__(self, arg={}):
-        self.id = arg.get('id')
-        self.player = arg.get('player')
-        self.enemy = arg.get('enemy')
-        self.info = arg.get('info')
-
-
-class Death(GameEvent):
-    def __init__(self, arg={}):
-        GameEvent.__init__(self, arg)
-        self.penalty = arg.get('penalty')
-
-
-class Victory(GameEvent):
-    def __init__(self, arg={}):
-        GameEvent.__init__(self, arg)
-
-
-class Player:
-    def __init__(self, arg={}):
-        self.id = arg.get('id')
-        self.name = arg.get('name')
-        self.hex_id = arg.get('hex_id')
-
-
-class Enemy:
-    def __init__(self, arg={}):
-        self.id = arg.get('id')
-        self.name = arg.get('name')
-
-
-class Drink:
-    def __init__(self, arg={}):
-        self.id = arg.get('id')
-        self.name = arg.get('name')
-        self.vol = arg.get('vol')

dsst/dsst_gtk3/dialogs.py

@@ -0,0 +1,64 @@
+import gi
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk
+from dsst_sql import sql
+
+
+def enter_string_dialog(builder: Gtk.Builder, title: str, value=None) -> str:
+    """ Simple modal dialog for entering a string value
+    :param builder: GtkBuilder with loaded dialogs.glade file
+    :param title: Dialog title
+    :param value: Pre set value for dialog
+    :return:
+    """
+    dialog = builder.get_object("nameEnterDialog")  # type: Gtk.Dialog
+    dialog.set_transient_for(builder.get_object("main_window"))
+    dialog.set_title(title)
+    entry = builder.get_object("nameEnterEntry")
+    if value:
+        entry.set_text(value)
+    entry.grab_focus()
+
+    result = dialog.run()
+    dialog.hide()
+
+    if result == Gtk.ResponseType.OK:
+        return entry.get_text()
+    else:
+        return value
+
+
+def show_episode_dialog(builder: Gtk.Builder, title: str, episode: sql.Episode=None):
+    dialog = builder.get_object("edit_episode_dialog")  # type: Gtk.Dialog
+    dialog.set_transient_for(builder.get_object("main_window"))
+    dialog.set_title(title)
+    if episode:
+        builder.get_object("episode_no_spin_button").set_value(episode.number)
+        ep_players = sql.Player.select().join(sql.EpisodePlayer).join(sql.Episode).get()
+
+    result = dialog.run()
+    dialog.hide()
+
+    if result == Gtk.ResponseType.OK:
+        player_ids = [row[0] for row in builder.get_object('episode_players_store')]
+        query = sql.EpisodePlayer\
+            .delete()\
+            .wher(sql.EpisodePlayer.episode == episode.id)\
+            .where(sql.EpisodePlayer.player.not_in(player_ids))
+        #query = sql.EpisodePlayer.get_or_create(episode=episode.id, player=pl)
+
+        return episode
+    else:
+        return None
+
+
+def show_manage_players_dialog(builder: Gtk.Builder, title: str):
+    dialog = builder.get_object("manage_players_dialog")  # type: Gtk.Dialog
+    dialog.set_transient_for(builder.get_object("main_window"))
+    dialog.set_title(title)
+
+    result = dialog.run()
+    dialog.hide()
+
+    if result == Gtk.ResponseType.OK:
+        pass

dsst/dsst_gtk3/gtk_ui.py

@@ -3,13 +3,40 @@ import os
 
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
+from dsst_gtk3.handlers import handlers
+
+from dsst_sql import sql
 
 
 class DSSTGtkUi:
+    """ The main UI class """
     def __init__(self):
+        # Load Glade UI files
         self.ui = Gtk.Builder()
         self.ui.add_from_file(os.path.join(os.path.dirname(__file__), 'resources', 'glade', 'window.glade'))
+        self.ui.add_from_file(os.path.join(os.path.dirname(__file__), 'resources', 'glade', 'dialogs.glade'))
+        # Connect signal handlers to UI
+        self.handlers = handlers.Handlers(self)
+        self.ui.connect_signals(self.handlers)
+        # Show all widgets
         self.ui.get_object('main_window').show_all()
+        # Create database if not exists
+        sql.create_tables()
+
+        self.reload_view_data()
+
+    def reload_view_data(self):
+        # Rebuild all players store
+        self.ui.get_object('all_players_store').clear()
+        for player in sql.Player.select():
+            self.ui.get_object('all_players_store').append([player.id, player.name, player.hex_id])
+        # Rebuild seasons store
+        store = self.ui.get_object('seasons_store')
+        store.clear()
+        for season in sql.Season.select().order_by(sql.Season.number):
+            store.append([season.id, season.game_name])
+
+
 
 if __name__ == '__main__':
     DSSTGtkUi()

dsst/dsst_gtk3/handlers/handlers.py

@@ -0,0 +1,24 @@
+import gi
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk
+from dsst_gtk3.handlers.season_and_episodes import SeasonAndEpisodesHandlers
+from dsst_gtk3.handlers.players import PlayerHandlers
+
+
+class Handlers(SeasonAndEpisodesHandlers, PlayerHandlers):
+    """ Class containing all signal handlers for the GTK GUI """
+    def __init__(self, app):
+        """ Initialize handler class
+        :param app: reference to the main application object
+        """
+        self.app = app
+        # Call constructors of superclasses
+        SeasonAndEpisodesHandlers.__init__(self, app)
+        PlayerHandlers.__init__(self, app)
+
+    @staticmethod
+    def do_delete_event(*args):
+        """ Signal will be sent when app should close
+        :param args: Arguments to the delete event
+        """
+        Gtk.main_quit()

dsst/dsst_gtk3/handlers/players.py

@@ -0,0 +1,27 @@
+from dsst_gtk3.gtk_ui import DSSTGtkUi
+from dsst_gtk3 import dialogs, util
+from dsst_sql import sql
+
+
+class PlayerHandlers:
+    def __init__(self, app: DSSTGtkUi):
+        self.app = app
+
+    def do_manage_players(self, *_):
+        result = dialogs.show_manage_players_dialog(self.app.ui, 'Manage Players')
+
+    def do_add_player(self, entry):
+        if entry.get_text():
+            sql.Player.create(name=entry.get_text())
+            entry.set_text('')
+            self.app.reload_view_data()
+
+    def do_add_player_to_episode(self, combo):
+        player_id = util.Util.get_combo_value(combo, 0)
+        if player_id:
+            self.app.ui.get_object('add_player_combo_box').set_active(-1)
+            player = sql.Player.get(sql.Player.id == player_id)
+            store = self.app.ui.get_object('episode_players_store')
+            if not any(row[0] == player_id for row in store):
+                store.append([player_id, player.name, player.hex_id])
+

dsst/dsst_gtk3/handlers/season_and_episodes.py

@@ -0,0 +1,26 @@
+from dsst_gtk3.gtk_ui import DSSTGtkUi
+from dsst_gtk3.util import Util
+from dsst_sql import sql
+from dsst_gtk3 import dialogs
+
+
+class SeasonAndEpisodesHandlers:
+    def __init__(self, app: DSSTGtkUi):
+        self.app = app
+
+    def do_add_season(self, *_):
+        name = dialogs.enter_string_dialog(self.app.ui, 'Name for the new Season')
+        if name:
+            sql.Season.create(game_name=name, number=1)
+            self.app.reload_view_data()
+
+    def do_season_selected(self, *_):
+        combo = self.app.ui.get_object('season_combo_box')
+        season_id = Util.get_combo_value(combo, 0)
+        if not season_id: return
+        season = sql.Season.get(sql.Season.id == season_id)
+        for episode in season.episodes:
+            print(episode)
+
+    def do_add_episode(self, *_):
+        episode = dialogs.show_episode_dialog(self.app.ui, 'Create new Episode')

dsst/dsst_gtk3/resources/glade/dialogs.glade

@@ -0,0 +1,710 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.3 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkListStore" id="all_players_store">
+    <columns>
+      <!-- column-name id -->
+      <column type="gint"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name hex_id -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkDialog" id="manage_players_dialog">
+    <property name="can_focus">False</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="deletable">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">4</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="okButtonRename2">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancelButtonRename2">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">5</property>
+                    <property name="margin_right">5</property>
+                    <property name="margin_top">5</property>
+                    <property name="margin_bottom">5</property>
+                    <property name="label" translatable="yes">Add Player</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="manage_add_player_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <signal name="activate" handler="do_add_player" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">5</property>
+                <property name="margin_right">5</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
+                <property name="label" translatable="yes">All Players</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkTreeView" id="manage_all_players_tree_view">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="vexpand">True</property>
+                <property name="model">all_players_store</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection"/>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn">
+                    <property name="title" translatable="yes">Name</property>
+                    <child>
+                      <object class="GtkCellRendererText"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn">
+                    <property name="title" translatable="yes">Hex ID</property>
+                    <child>
+                      <object class="GtkCellRendererText"/>
+                      <attributes>
+                        <attribute name="text">2</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-5">okButtonRename2</action-widget>
+      <action-widget response="-6">cancelButtonRename2</action-widget>
+    </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+  <object class="GtkEntryCompletion" id="search_player_completion">
+    <property name="model">all_players_store</property>
+    <property name="text_column">1</property>
+    <property name="inline_completion">True</property>
+    <property name="inline_selection">True</property>
+    <child>
+      <object class="GtkCellRendererText" id="completion_renderer1"/>
+      <attributes>
+        <attribute name="text">1</attribute>
+      </attributes>
+    </child>
+  </object>
+  <object class="GtkAdjustment" id="ep_number_ajustment">
+    <property name="upper">1000000</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="episode_players_store">
+    <columns>
+      <!-- column-name id -->
+      <column type="gint"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name hex_id -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkDialog" id="edit_episode_dialog">
+    <property name="can_focus">False</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="deletable">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">4</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">5</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Episode No.</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="episode_no_spin_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="input_purpose">digits</property>
+                        <property name="adjustment">ep_number_ajustment</property>
+                        <property name="climb_rate">1</property>
+                        <property name="snap_to_ticks">True</property>
+                        <property name="numeric">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Player</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="add_player_combo_box">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="model">all_players_store</property>
+                        <property name="entry_text_column">1</property>
+                        <property name="id_column">1</property>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="text">1</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton">
+                        <property name="label" translatable="yes">Add</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <signal name="clicked" handler="do_add_player_to_episode" object="add_player_combo_box" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkTreeView" id="episode_players_tree_view">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="model">episode_players_store</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection"/>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn">
+                        <property name="title" translatable="yes">Name</property>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="text">1</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn">
+                        <property name="title" translatable="yes">Hex ID</property>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="text">2</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">5</property>
+                    <property name="margin_right">5</property>
+                    <property name="margin_top">5</property>
+                    <property name="margin_bottom">5</property>
+                    <property name="label" translatable="yes">Episode Date</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCalendar">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="year">2018</property>
+                    <property name="month">1</property>
+                    <property name="day">22</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-5">button1</action-widget>
+      <action-widget response="-6">button2</action-widget>
+    </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+  <object class="GtkDialog" id="nameEnterDialog">
+    <property name="can_focus">False</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="deletable">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">4</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="okButtonRename">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancelButtonRename">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="nameEnterEntry">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-5">okButtonRename</action-widget>
+      <action-widget response="-6">cancelButtonRename</action-widget>
+    </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+  <object class="GtkDialog" id="yn_dialog">
+    <property name="can_focus">False</property>
+    <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
+    <property name="deletable">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">15</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="yn_yes">
+                <property name="label">gtk-yes</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="yn_no">
+                <property name="label">gtk-no</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="yn_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">2</property>
+            <property name="margin_right">2</property>
+            <property name="margin_top">2</property>
+            <property name="margin_bottom">2</property>
+            <property name="justify">center</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-8">yn_yes</action-widget>
+      <action-widget response="-9">yn_no</action-widget>
+    </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+  <object class="GtkDialog" id="ync_dialog">
+    <property name="can_focus">False</property>
+    <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
+    <property name="deletable">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">15</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="ync_yes">
+                <property name="label">gtk-yes</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="ync_no">
+                <property name="label">gtk-no</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="ync_cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="ync_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">2</property>
+            <property name="margin_right">2</property>
+            <property name="margin_top">2</property>
+            <property name="margin_bottom">2</property>
+            <property name="justify">center</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-8">ync_yes</action-widget>
+      <action-widget response="-9">ync_no</action-widget>
+      <action-widget response="-6">ync_cancel</action-widget>
+    </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
+  </object>
+</interface>

dsst/dsst_gtk3/resources/glade/window.glade

@@ -26,6 +26,98 @@
     <property name="title" translatable="yes">Drunk Souls Stat Tool</property>
     <property name="default_width">1200</property>
     <property name="default_height">700</property>
+    <signal name="delete-event" handler="do_delete_event" swapped="no"/>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkMenuBar" id="menuBar">
+            <property name="name">menuBar</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkMenuItem" id="season_item">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Season</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="season_menu">
+                    <property name="name">mainMenu</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkMenuItem" id="add_season_item">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Add Season</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="do_add_season" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="season_manage_enemies_item">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Manage Enemies</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="manage_seasons_item">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Manage Seasons</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="players_item">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Players</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkMenuItem" id="manage_players_item">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Manage Players</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="do_manage_players" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkPaned">
             <property name="visible">True</property>
@@ -38,6 +130,10 @@
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkLabel">
                         <property name="visible">True</property>
@@ -56,11 +152,24 @@
                       </packing>
                     </child>
                     <child>
-              <object class="GtkComboBox" id="season_combo_box">
+                      <object class="GtkButton" id="add_season_button">
+                        <property name="label" translatable="yes">New</property>
                         <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="model">seasons_store</property>
-                <property name="id_column">1</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="margin_left">5</property>
+                        <property name="margin_right">5</property>
+                        <property name="margin_top">5</property>
+                        <property name="margin_bottom">5</property>
+                        <signal name="clicked" handler="do_add_season" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -68,6 +177,36 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkComboBox" id="season_combo_box">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="model">seasons_store</property>
+                    <property name="id_column">1</property>
+                    <signal name="changed" handler="do_season_selected" swapped="no"/>
+                    <child>
+                      <object class="GtkCellRendererText" id="season_number"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                    <child>
+                      <object class="GtkCellRendererText" id="season_name"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkLabel">
                         <property name="visible">True</property>
@@ -82,7 +221,33 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                <property name="position">2</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="add_episode_button">
+                        <property name="label" translatable="yes">New</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="margin_left">5</property>
+                        <property name="margin_right">5</property>
+                        <property name="margin_top">5</property>
+                        <property name="margin_bottom">5</property>
+                        <signal name="clicked" handler="do_add_episode" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
                 <child>
@@ -109,7 +274,7 @@
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
-                <property name="position">3</property>
+                    <property name="position">4</property>
                   </packing>
                 </child>
               </object>
@@ -142,7 +307,7 @@
                       <object class="GtkLabel" id="stats_tab">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Stats</property>
+                        <property name="label" translatable="yes">Season Stats</property>
                       </object>
                       <packing>
                         <property name="tab_fill">False</property>
@@ -165,7 +330,7 @@
                       <object class="GtkLabel" id="deaths_tab">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Deaths</property>
+                        <property name="label" translatable="yes">Episode Deaths</property>
                       </object>
                       <packing>
                         <property name="position">1</property>
@@ -189,7 +354,7 @@
                       <object class="GtkLabel" id="victories_tab">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Victories</property>
+                        <property name="label" translatable="yes">Episode Victories</property>
                       </object>
                       <packing>
                         <property name="position">2</property>
@@ -376,8 +541,15 @@
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
         </child>
-    <child>
+      </object>
+    </child>
+    <child type="titlebar">
       <placeholder/>
     </child>
   </object>

dsst/dsst_gtk3/util.py

@@ -0,0 +1,9 @@
+class Util:
+    @staticmethod
+    def get_combo_value(combo, index: int):
+        """ Retrieve the selected value of a combo box at the selected index in the model """
+        tree_iter = combo.get_active_iter()
+        if tree_iter:
+            return combo.get_model().get_value(tree_iter, index)
+        else:
+            return None

dsst/dsst_sql/core.py

@@ -0,0 +1,56 @@
+from dsst_sql import models, sql
+
+
+class DSSTCore:
+    def __init__(self):
+        # Set DB Connection
+        sql.create_tables()
+
+    @staticmethod
+    def insert_player(model: models.Player):
+        return sql.Player.create(name=model.name, hex_id=model.hex_id)
+
+    @staticmethod
+    def insert_enemy(enemy: models.Enemy):
+        return sql.Enemy.create(name=enemy.name)
+
+    @staticmethod
+    def insert_drink(model: models.Drink):
+        return sql.Drink.create(name=model.name, vol=model.vol)
+
+    @staticmethod
+    def insert_season(season: models.Season):
+        return sql.Season.create(number=season.number, game_name=season.game_name, start_date=season.start_date,
+                                 end_date=season.end_date)
+
+    @staticmethod
+    def insert_death(death: models.Death):
+        return sql.Death.create(info=death.info, player=death.player.id, enemy=death.enemy.id, penalty=death.penalty.id)
+
+    @staticmethod
+    def insert_victory(victory: models.Victory):
+        return sql.Death.create(info=victory.info, player=victory.player.id, enemy=victory.enemy.id)
+
+    @staticmethod
+    def insert_episode(season_id: int, episode: models.Episode):
+        with sql.connection.atomic():
+            # Insert Episode Row
+            new_ep = sql.Episode.create(seq_number=episode.seq_number, number=episode.number, date=episode.date,
+                                        season=season_id)
+            # Insert participating players
+            for player in episode.players:
+                sql.EpisodePlayer.insert(episode=new_ep.id, player=player.id)
+            # Insert deaths in this episode
+            if episode.deaths:
+                for death in episode.deaths:
+                    new_death = DSSTCore.insert_death(death)
+                    sql.EpisodeDeath.create(death=new_death.id, episode=new_ep.id)
+            # Insert victories in this episode
+            if episode.victories:
+                for victory in episode.victories:
+                    new_vic = DSSTCore.insert_victory(victory)
+                    sql.EpisodeVictory.create(victory=new_vic.id, episode=new_ep.id)
+
+
+if __name__ == '__main__':
+    core = DSSTCore()

dsst/dsst_sql/sql.py

@@ -19,6 +19,7 @@ class Episode(Model):
     seq_number = IntegerField()
     number = CharField()
     date = DateTimeField(null=True)
+    season = ForeignKeyField(Season, backref='episodes')
 
     class Meta:
         database = connection
@@ -71,18 +72,9 @@ class Victory(Model):
         database = connection
 
 
-class SeasonEpisode(Model):
-    id = AutoField()
-    season = ForeignKeyField(Season)
-    episode = ForeignKeyField(Episode)
-
-    class Meta:
-        database = connection
-
-
 class EpisodePlayer(Model):
     id = AutoField()
-    episode = ForeignKeyField(Episode,)
+    episode = ForeignKeyField(Episode)
     player = ForeignKeyField(Player)
 
     class Meta:
@@ -108,7 +100,7 @@ class EpisodeVictory(Model):
 
 
 def create_tables():
-    models = [Season, Episode, Player, Drink, Enemy, Death, Victory, SeasonEpisode, EpisodePlayer, EpisodeDeath,
+    models = [Season, Episode, Player, Drink, Enemy, Death, Victory, EpisodePlayer, EpisodeDeath,
               EpisodeVictory]
     for model in models:
         model.create_table()