Merge pull request #46 from AuroraBTH/master

Version 1 of general actions

Author: mosbth

.gitignore

@@ -13,3 +13,5 @@ done/
 config.php
 build/
 .venv
+__pycache__/
+data/marvinMorning_date.txt

data/.gitignore

@@ -45,7 +45,7 @@
 
 import marvin
 import marvin_actions
-
+import marvin_general_actions
 
 #
 # General stuff about this program
@@ -193,8 +193,11 @@ def main():
     options = parseOptions()
     marvin.setConfig(options)
     marvin_actions.setConfig(options)
+    marvin_general_actions.setConfig(options)
     actions = marvin_actions.getAllActions()
+    general_actions = marvin_general_actions.getAllGeneralActions()
     marvin.registerActions(actions)
+    marvin.registerGeneralActions(general_actions)
     marvin.connectToServer()
     marvin.mainLoop()
 

main.py

@@ -42,6 +42,7 @@
 
 # All actions to check for incoming messages
 ACTIONS = []
+GENERAL_ACTIONS = []
 
 # Keep a log of the latest messages
 IRCLOG = None
@@ -71,6 +72,14 @@ def registerActions(actions):
         print(" - " + action.__name__)
     ACTIONS.extend(actions)
 
+def registerGeneralActions(actions):
+    """
+    Register general actions to use.
+    """
+    print("Adding general actions:")
+    for action in actions:
+        print(" - " + action.__name__)
+    GENERAL_ACTIONS.extend(actions)
 
 def connectToServer():
     """
@@ -283,3 +292,9 @@ def checkMarvinActions(words):
                 if msg:
                     sendPrivMsg(msg, words[2])
                     break
+        else:
+            for action in GENERAL_ACTIONS:
+                msg = action(set(row), row, raw)
+                if msg:
+                    sendPrivMsg(msg, words[2])
+                    break

marvin.py

@@ -0,0 +1,91 @@
+#! /usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+Make general actions for Marvin, one function for each action.
+"""
+import time
+import datetime
+import json
+import random
+
+# Load all strings from file
+with open("marvin_strings.json", encoding="utf-8") as f:
+    STRINGS = json.load(f)
+
+# Configuration loaded
+CONFIG = None
+
+def setConfig(config):
+    """
+    Keep reference to the loaded configuration.
+    """
+    global CONFIG
+    CONFIG = config
+
+
+def getString(key, key1=None):
+    """
+    Get a string from the string database.
+    """
+    data = STRINGS[key]
+    if isinstance(data, list):
+        res = data[random.randint(0, len(data) - 1)]
+    elif isinstance(data, dict):
+        if key1 is None:
+            res = data
+        else:
+            res = data[key1]
+            if isinstance(res, list):
+                res = res[random.randint(0, len(res) - 1)]
+    elif isinstance(data, str):
+        res = data
+
+    return res
+
+
+def getAllGeneralActions():
+    """
+    Return all general actions as an array.
+    """
+    return [
+        marvinMorning
+    ]
+
+
+def marvinMorning(row, asList=None, asStr=None):
+    """
+    Marvin says Good morning after someone else says it
+    """
+    phrases = [
+        "morgon",
+        "godmorgon",
+        "god morgon",
+        "morrn",
+        "morn"
+    ]
+
+    morning_phrases = [
+        "Godmorgon! :-)",
+        "Morgon allesammans",
+        "Morgon gott folk",
+        "Guten morgen",
+        "Morgon"
+    ]
+
+    for phrase in phrases:
+        if phrase in row:
+            msg = random.choice(morning_phrases)
+
+            try:
+                file = open('data/marvinMorning_date.txt', 'r+')
+                file_data = file.read()
+
+                if not file_data == str(datetime.date.today()):
+                    f = open('data/marvinMorning_date.txt', 'w')
+                    f.write(str(datetime.date.today()))
+                    return msg
+            except IOError:
+                file = open('data/marvinMorning_date.txt', 'w')
+                file.write(str(datetime.date.today()))
+                return msg