Clean up logging in handler.py

How was this not fixed?

.gitignore

@@ -1,3 +1,4 @@
 
 *.pyc
-.idea
+.idea
+Adventure Game/adventure_game/logs/AdventureGame.log

Adventure Game/adventure_game/GameNavigator.py

@@ -0,0 +1,97 @@
+import npyscreen
+import sys
+
+from Handler import Handler
+
+
+class QuitButton(npyscreen.ButtonPress):
+    def whenPressed(self):
+        sys.exit(0)
+
+
+class GameNavigator(npyscreen.FormBaseNew):
+    """
+    This class handles all the drawing and 'graphics' of our game.
+    only basic logic like initial loading should happen here. re-drawing
+    and game logic should be done in Handler.py
+    TODO: Find a fix for initial room startup
+    TODO: Find a way to reset the cursor after a user hits sendButton
+    """
+
+    def update_log(self, newline):
+        self.logList.append(newline)  # Append the newline
+        self.logList = self.logList[-7:]  # Truncate to only the last 5 lines
+
+        res = ''  # Convert the list to a string
+        for element in self.logList:
+            res = res + str(element) + '\n'
+        res = res.upper()  # Log is always uppercase
+
+        self.logBox.value = res  # Set the logbox to that value
+
+    def create(self):
+        top_division_height = 20
+        inventory_width = 20
+        art_width = 100
+        self.logList = []
+
+        self.artBox = self.add(npyscreen.BoxBasic,
+                               name='ArtBox',
+                               max_width=art_width,
+                               max_height=top_division_height,
+                               rely=2,
+                               relx=inventory_width + 1,
+                               editable=False)
+        self.artContent = self.add(npyscreen.MultiLineEdit,
+                                   rely=3,
+                                   relx=inventory_width + 2,
+                                   max_width=art_width - 2,
+                                   max_height=top_division_height - 2,
+                                   value=self.parentApp.gamelib['menu']['graphics']['not_found'],
+                                   editable=False)
+        self.artBox.footer = 'Unknown Location'
+
+        self.artBox = self.add(npyscreen.BoxBasic,
+                               name='Inventory',
+                               max_width=inventory_width,
+                               max_height=top_division_height,
+                               relx=1,
+                               rely=2,
+                               editable=False)
+
+        self.logBoxOutline = self.add(npyscreen.BoxBasic,
+                                      max_width=inventory_width + art_width,
+                                      max_height=9,
+                                      relx=1,
+                                      rely=top_division_height + 2,
+                                      editable=False)
+
+        self.logBox = self.add(npyscreen.MultiLineEdit,
+                               max_width=inventory_width + art_width - 7,
+                               max_height=7,
+                               relx=2,
+                               rely=top_division_height + 3,
+                               editable=False)
+
+        self.dialogueBoxOutline = self.add(npyscreen.BoxBasic,
+                                           max_width=inventory_width + art_width,
+                                           max_height=3,
+                                           relx=1,
+                                           rely=top_division_height + 2 + 9,
+                                           editable=False)
+
+        self.dialogueBox = self.add(npyscreen.Textfield,
+                                    name='Type Here',
+                                    max_width=inventory_width + art_width - 14,
+                                    max_height=1,
+                                    relx=2,
+                                    rely=top_division_height + 3 + 9)
+
+        self.sendButton = self.add(Handler,
+                                   name="Send",
+                                   relx=inventory_width + art_width - 7,
+                                   rely=top_division_height + 3 + 9)
+        self.quitButton = self.add(QuitButton,
+                                   name="Quit",
+                                   relx=1,
+                                   rely=1)

Adventure Game/adventure_game/Handler.py

@@ -0,0 +1,31 @@
+import npyscreen
+
+
+class Handler(npyscreen.ButtonPress):
+    """
+    Very important, called when the player hits send, there are several things we need to do here:
+    1: handle the player's input, and run logic, this is done in handler.py
+    2: prepare new items to display on the screen
+    3: re-render the screen
+    """
+    def whenPressed(self):
+        self.parent.parentApp.log.debug('Send button pressed!')
+        # This is the raw command from the user
+        raw_command = self.parent.dialogueBox.value
+        self.parent.dialogueBox.value = '' # Clear the dialogue box, TODO: This may become unneeded if issue #8 is fixed
+
+        # This is the raw command from the user
+        parsed_command = raw_command.split()
+
+        try:
+            command = parsed_command.pop(0)
+        except IndexError:
+            self.parent.parentApp.log.warn('Command "{0}" could not be split, was it malformed or incomplete?'.format(raw_command))
+            command = ''
+        arguments = parsed_command # Whatever is left in the list, are arguments.
+
+        self.parent.parentApp.log.info('Parsed command "{0}" with arguments "{1}"'.format(command, arguments))
+        self.parent.update_log('command: ' + command)
+        self.parent.update_log('args: {0}'.format(arguments))
+        self.parent.artContent.display()
+        self.parent.parentApp.switchForm('GAME')

Adventure Game/adventure_game/MainMenu.py

@@ -0,0 +1,21 @@
+import npyscreen
+
+
+from Player import Player
+
+
+class MainMenu(npyscreen.Form):
+    """
+    This is the main menu, code here should only be for
+    initializing the player data and any settings they want to change
+    """
+    def afterEditing(self):
+        # TODO: the game needs to happen after this inital main menu
+        self.parentApp.setNextForm('GAME')
+
+    def create(self):
+        self.add(npyscreen.FixedText, value='You cannot select a file yet! Just hit OK', editable=False)
+        self.playerSaveLocation = self.add(npyscreen.TitleFilenameCombo, name="Your save file:")
+
+        self.parentApp.player = Player(self.parentApp.mainPath / 'playerdata/defaults/default_player.yaml')
+        self.add(npyscreen.MultiLineEdit, value=self.parentApp.gamelib['menu']['graphics']['logo'], editable=False)

Adventure Game/adventure_game/Player.py

@@ -0,0 +1,11 @@
+from yaml_parser import parse_datafile as parse
+
+class Player:
+    """
+    This class intended to abstract out the actual yaml data into a player.(item) that is more
+    friendly to handle in code. 
+    """
+    def __init__(self, save_location):
+        self.save_location = save_location
+
+        self.playerData = parse(save_location)

Adventure Game/adventure_game/__main__.py

@@ -0,0 +1,79 @@
+import pathlib
+import npyscreen
+import logging
+from npyscreen import NotEnoughSpaceForWidget
+from os import system
+
+from yaml_parser import parse_datafile as parse
+from GameNavigator import GameNavigator
+from MainMenu import MainMenu
+
+
+class AlphaWarning(npyscreen.Popup):
+    def afterEditing(self):
+        self.parentApp.setNextForm('MENU')
+
+    def create(self):
+        self.add(npyscreen.Pager, values=['Welcome to Unnamed Adventure game!',
+                                          'Please enjoy your stay and report any bugs at',
+                                          'kitsunehosting.net'], editable=False)
+
+
+class AdventureGame(npyscreen.NPSAppManaged):
+    """
+    This is the 'root' of the entire game!
+    """
+    # Do on creation
+    def onStart(self):
+        # Setup some important 'global' values we'll need later
+        # Set the path all other files will follow
+        self.mainPath = pathlib.Path(__file__).parent
+
+        # Setup logging
+        self.log = logging
+        self.log.basicConfig(filename=self.mainPath / 'logs/AdventureGame.log',
+                             filemode='w',
+                             level=logging.DEBUG)
+        self.log.info('Logging started!')
+
+        # parse this data first (since it includes graphics for the main menu
+        self.gamelib = parse(
+            self.mainPath / 'gamedata/gamelib.yaml')
+        self.log.debug('Gamelib at {0}'.format(self.mainPath / 'gamedata/gamelib.yaml'))
+
+        # Intalize the player as none, the player will be created in the main menu.
+        self.player = None
+
+
+
+        # Set screen size before drawing windows
+        dimensions = self.gamelib['menu']['graphics']['dimensions']
+        #system('mode con: cols={0} lines={1}'.format(
+        #    dimensions['inventory_width']+dimensions['art_width'],
+        #    30)) # TODO: Finish setting this up.
+
+        # Set theme
+        #TODO: modify custom theme?
+        npyscreen.setTheme(npyscreen.Themes.ElegantTheme)
+
+        # Draw game windows
+        self.addForm('GAME', GameNavigator, name='Unnamed Adventure Game')  # This window should draw the actual game
+        self.addForm('MENU', MainMenu, name='Welcome to the main menu')  # This window should draw the main menu
+        self.addForm('MAIN', AlphaWarning, name='Welcome to the alpha!')  # This window is only needed for the ALPHA
+
+        # TODO: Create a 'splash screen' or, traditional "main menu"
+
+
+if __name__ == '__main__':
+    # Set the screen size bigger
+    system('mode con: cols={0} lines={1}'.format(124, 36))
+
+    # Make a new adventure game if not imported
+    adventure_game = AdventureGame()
+
+    # Run the game!
+    try:
+        adventure_game.run()
+    except NotEnoughSpaceForWidget:
+        # This exception should catch if a player tries to play in a screen that is too small.
+        print('Your screen is too small!\nOr, Joe has not fixed https://kitsunehosting.net/gitea/Kenwood/SNHU-IT-140/issues/7')

Adventure Game/adventure_game/example.py

@@ -1,32 +0,0 @@
-# encoding: utf-8
-
-import npyscreen
-
-
-class TestApp(npyscreen.NPSApp):
-    def main(self):
-        # These lines create the form and populate it with widgets.
-        # A fairly complex screen in only 8 or so lines of code - a line for each control.
-        F = npyscreen.Form(name="Welcome to Npyscreen", )
-        t = F.add(npyscreen.TitleText, name="Text:", )
-        fn = F.add(npyscreen.TitleFilename, name="Filename:")
-        fn2 = F.add(npyscreen.TitleFilenameCombo, name="Filename2:")
-        dt = F.add(npyscreen.TitleDateCombo, name="Date:")
-        s = F.add(npyscreen.TitleSlider, out_of=12, name="Slider")
-        ml = F.add(npyscreen.MultiLineEdit,
-                   value="""try typing here!\nMutiline text, press ^R to reformat.\n""",
-                   max_height=5, rely=9)
-        ms = F.add(npyscreen.TitleSelectOne, max_height=4, value=[1, ], name="Pick One",
-                   values=["Option1", "Option2", "Option3"], scroll_exit=True)
-        ms2 = F.add(npyscreen.TitleMultiSelect, max_height=-2, value=[1, ], name="Pick Several",
-                    values=["Option1", "Option2", "Option3"], scroll_exit=True)
-
-        # This lets the user interact with the Form.
-        F.edit()
-
-        print(ms.get_selected_objects())
-
-
-if __name__ == "__main__":
-    App = TestApp()
-    App.run()

Adventure Game/adventure_game/gamedata/gamelib.yaml

@@ -31,3 +31,12 @@ menu:
       --------------------------------------------------------------------------------------------------
       --------------------------------------------------------------------------------------------------
       --------------------------------------------------------------------------------------------------
+    dimensions:
+      inventory_width: 23
+      inventory_height: 20
+      art_width: 101
+      art_height: 20
+      dialogue_width: 122
+      dialogue_height: 20
+      entry_box_width: 122
+      entry_box_height: 3

Adventure Game/adventure_game/main.py

@@ -1,100 +0,0 @@
-import npyscreen
-from npyscreen import NotEnoughSpaceForWidget
-
-from yaml_parser import parse_datafile as parse
-
-
-class GameNavigator(npyscreen.Form):
-    def afterEditing(self):
-        self.parentApp.setNextForm(None)  # Nothing to do after this but exit the game.
-
-    def create(self):
-        top_division_height = 20
-        inventory_width = 20
-        art_width = 100
-
-        self.artBox = self.add(npyscreen.BoxBasic,
-                               name='ArtBox',
-                               max_width=art_width,
-                               max_height=top_division_height,
-                               rely=2,
-                               relx=inventory_width + 1,
-                               editable=False)
-        self.artContent = self.add(npyscreen.MultiLineEdit,
-                                   rely=3,
-                                   relx=inventory_width + 2,
-                                   max_width=art_width - 2,
-                                   max_height=top_division_height - 2,
-                                   value=self.parentApp.gamelib['menu']['graphics']['not_found'],
-                                   editable=False)
-        self.artBox.footer = 'Unknown Location'
-
-        self.artBox = self.add(npyscreen.BoxBasic,
-                               name='Inventory',
-                               max_width=inventory_width,
-                               max_height=top_division_height,
-                               relx=1,
-                               rely=2,
-                               editable=False)
-
-        self.dialogueBoxOutline = self.add(npyscreen.BoxBasic,
-                                           max_width=inventory_width + art_width,
-                                           max_height=3,
-                                           relx=1,
-                                           rely=top_division_height + 2)
-
-        self.dialogueBox = self.add(npyscreen.Textfield,
-                                    name='Type Here',
-                                    max_width=inventory_width + art_width - 2,
-                                    max_height=1,
-                                    relx=2,
-                                    rely=top_division_height + 3)
-
-
-class MainMenu(npyscreen.Form):
-    def afterEditing(self):
-        # TODO: the game needs to happen after this inital main menu
-        self.parentApp.setNextForm('GAME')
-
-    def create(self):
-        self.add(npyscreen.FixedText, value='You cannot select a file yet! Just hit OK', editable=False)
-        self.playerSaveLocation = self.add(npyscreen.TitleFilenameCombo, name="Your save file:")
-        self.add(npyscreen.MultiLineEdit, value=self.parentApp.gamelib['menu']['graphics']['logo'], editable=False)
-
-
-class AlphaWarning(npyscreen.Popup):
-    def afterEditing(self):
-        self.parentApp.setNextForm('MENU')
-
-    def create(self):
-        self.add(npyscreen.Pager, values=['Welcome to Unnamed Adventure game!',
-                                          'Please enjoy your stay and report any bugs at',
-                                          'kitsunehosting.net'], editable=False)
-
-
-class AdventureGame(npyscreen.NPSAppManaged):
-    # Do on creation
-    def onStart(self):
-        # Setup some important 'global' values we'll need later
-        self.gamelib = parse(
-            'gamedata/gamelib.yaml')  # parse this data first (since it includes graphics for the main menu
-        self.playerSaveLocation = None  # We'll load the save location after the player gets to the save select screen
-
-        # Draw game windows
-        self.addForm('GAME', GameNavigator, name='Unnamed Adventure Game')  # This window should draw the actual game
-        self.addForm('MENU', MainMenu, name='Welcome to the main menu')  # This window should draw the main menu
-        self.addForm('MAIN', AlphaWarning, name='Welcome to the alpha!')  # This window is only needed for the ALPHA
-
-        # TODO: Create a 'splash screen' or, traditional "main menu"
-
-
-if __name__ == '__main__':
-    # Make a new adventure game if not imported
-    adventure_game = AdventureGame()
-
-    # Run the game!
-    try:
-        adventure_game.run()
-    except NotEnoughSpaceForWidget:
-        # This exception should catch if a player tries to play in a screen that is too small.
-        print('Your screen is too small!\nOr, Joe has not fixed https://kitsunehosting.net/gitea/Kenwood/SNHU-IT-140/issues/7')

Adventure Game/adventure_game/playerdata/defaults/default_player.yaml

@@ -0,0 +1,4 @@
+player:
+  name: 'Default'
+  location: 'office'
+  inventory: ['test', 'test2']

Adventure Game/adventure_game/text.py

@@ -1,35 +0,0 @@
-import npyscreen
-
-
-# npyscreen.disableColor()
-class TestApp(npyscreen.NPSApp):
-    def main(self):
-        F = npyscreen.Form(name="Welcome to Npyscreen", )
-        t = F.add(npyscreen.BoxBasic, name="Basic Box:", max_width=30, relx=2, max_height=3)
-        t.footer = "This is a footer"
-
-        t1 = F.add(npyscreen.BoxBasic, name="Basic Box:", rely=2, relx=32, max_width=30, max_height=3)
-
-        t2 = F.add(npyscreen.BoxTitle, name="Box Title:", max_height=6)
-        t3 = F.add(npyscreen.BoxTitle, name="Box Title2:", max_height=6,
-                   scroll_exit=True,
-                   contained_widget_arguments={
-                       'color': "WARNING",
-                       'widgets_inherit_color': True, }
-                   )
-
-        t2.entry_widget.scroll_exit = True
-        t2.values = ["Hello",
-                     "This is a Test",
-                     "This is another test",
-                     "And here is another line",
-                     "And here is another line, which is really very long.  abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz",
-                     "And one more."]
-        t3.values = t2.values
-
-        F.edit()
-
-
-if __name__ == "__main__":
-    App = TestApp()
-    App.run()