Attempt SpiceBot import start

sopel_modules/SpiceBot/Events.py

@@ -1,10 +1,14 @@
-#!/usr/bin/env python
+# coding=utf8
-# coding=utf-8
+from __future__ import unicode_literals, absolute_import, division, print_function
-from __future__ import unicode_literals, absolute_import, print_function, division
+"""
+This is the SpiceBot events system.
+
+We utilize the Sopel code for event numbers and
+self-trigger the bot into performing actions
+"""
+
 
-# sopel imports
 import sopel
-from sopel.trigger import PreTrigger
 import functools
 
 
@@ -45,7 +49,7 @@ class BotEvents(object):
     def trigger(self, bot, number, message="SpiceBot_Events"):
         number = str(number)
         if number in self.defaultevents or self.check(self.BOT_CONNECTED):
-            pretrigger = PreTrigger(
+            pretrigger = sopel.trigger.PreTrigger(
                 bot.nick,
                 ":SpiceBot_Events " + number + " " + str(bot.nick) + " :" + message
             )

sopel_modules/SpiceBot/Logs.py

@@ -1,12 +1,14 @@
-# coding=utf-8
+# coding=utf8
 from __future__ import unicode_literals, absolute_import, division, print_function
+"""
+This is the SpiceBot Logs system.
 
-import sopel.module
+This Class stores logs in an easy to access manner
-import sopel.tools
+"""
-import sopel.config
 
+
+import sopel
 import os
-
 import spicemanip
 
 
@@ -102,23 +104,3 @@ class botlogs():
 
 
 botlogs = botlogs()
-
-
-@sopel.module.event('001')
-@sopel.module.rule('.*')
-def join_log_channel(bot, trigger):
-
-    if bot.config.core.logging_channel:
-        channel = bot.config.core.logging_channel
-        if channel not in bot.channels.keys():
-            bot.write(('JOIN', bot.nick, channel))
-            if channel not in bot.channels.keys() and bot.config.SpiceBot_Channels.operadmin:
-                bot.write(('SAJOIN', bot.nick, channel))
-
-        while True:
-            if len(botlogs.SpiceBot_Logs["queue"]):
-                bot.say(str(botlogs.SpiceBot_Logs["queue"][0]), channel)
-                del botlogs.SpiceBot_Logs["queue"][0]
-    else:
-        botlogs.sopel_config["logging_channel"] = False
-        botlogs.SpiceBot_Logs["queue"] = []

sopel_modules/SpiceBot/__init__.py

@@ -0,0 +1,14 @@
+# coding=utf8
+from __future__ import unicode_literals, absolute_import, division, print_function
+"""
+These are the core SpiceBot Classes
+
+This module contains references only for other modules to utilize.
+"""
+
+from .Logs import *
+from .Events import *
+
+__author__ = 'Sam Zick'
+__email__ = 'sam@deathbybandaid.net'
+__version__ = '0.1.1'

sopel_modules/SpiceBot_AI/AI.py

@@ -7,7 +7,7 @@ import sopel.module
 import spicemanip
 
 from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, googlesearch, bot_privs, inlist, inlist_match, similar_list
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 
 
 @botevents.check_ready([botevents.BOT_LOADED, botevents.BOT_COMMANDSQUERY])

sopel_modules/SpiceBot_Channels/Channels.py

@@ -6,8 +6,8 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi
 import sopel.module
 from sopel.config.types import StaticSection, ValidatedAttribute, ListAttribute
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 from sopel_modules.SpiceBot_SBTools import join_all_channels, chanadmin_all_channels, channel_list_current
 
 import spicemanip

sopel_modules/SpiceBot_Channels/Channels_Command.py

@@ -6,7 +6,7 @@ import sopel.module
 
 import spicemanip
 
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 from sopel_modules.SpiceBot_SBTools import (
                                             sopel_triggerargs, inlist, channel_privs,
                                             join_all_channels, channel_list_current,

sopel_modules/SpiceBot_CommandsQuery/CommandsQuery.py

@@ -7,8 +7,8 @@ import sopel.module
 
 import os
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 
 import spicemanip
 

sopel_modules/SpiceBot_CommandsQuery/NickQueryCommand.py

@@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
 import sopel
 import sopel.module
 
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, similar_list, letters_in_string
 
 

sopel_modules/SpiceBot_CommandsQuery/QueryCommand.py

@@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
 import sopel
 import sopel.module
 
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, similar_list, letters_in_string
 
 

sopel_modules/SpiceBot_Database_Addons/Databaseaddons.py

@@ -10,7 +10,7 @@ from sopel.db import SopelDB, NickValues, ChannelValues
 from sqlalchemy.exc import SQLAlchemyError
 import json
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
 
 
 def setup(bot):

sopel_modules/SpiceBot_Database_Cache/DatabaseCache.py

@@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi
 # sopel imports
 import sopel.module
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
 
 
 def setup(bot):

sopel_modules/SpiceBot_Events/Events.py

@@ -5,8 +5,8 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
 import sopel.module
 from sopel.trigger import PreTrigger
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
-from .System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 
 import time
 

sopel_modules/SpiceBot_Events/__init__.py

@@ -1,7 +1,6 @@
 # coding=utf8
 from __future__ import unicode_literals, absolute_import, division, print_function
 
-from .System import *
 from .Events import *
 
 __author__ = 'Sam Zick'

sopel_modules/SpiceBot_GifSearch/gif.py

@@ -7,7 +7,7 @@ from sopel import module
 from .gifsearch import getGif
 
 from sopel_modules.SpiceBot_SBTools import sopel_triggerargs
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 
 import spicemanip
 

sopel_modules/SpiceBot_GifSearch/gifapi.py

@@ -9,7 +9,7 @@ import sopel.module
 import spicemanip
 
 from sopel_modules.SpiceBot_SBTools import sopel_triggerargs
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 
 
 @botevents.check_ready([botevents.BOT_GIFSEARCH])

sopel_modules/SpiceBot_GifSearch/gifsearch.py

@@ -5,8 +5,8 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
 import sopel.module
 from sopel.config.types import StaticSection, ValidatedAttribute
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 from sopel_modules.SpiceBot_CommandsQuery.CommandsQuery import commandsquery_register
 from sopel_modules.SpiceBot_SBTools import read_directory_json_to_dict
 

sopel_modules/SpiceBot_InvalidCommand/InvalidCommand.py

@@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
 import sopel.module
 
 from sopel_modules.SpiceBot_SBTools import sopel_triggerargs
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 
 
 def setup(bot):

sopel_modules/SpiceBot_Kick/__init__.py

@@ -14,7 +14,7 @@ from sopel import tools, module
 from sopel.tools import Identifier
 from sopel.config.types import StaticSection, ValidatedAttribute
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
 
 
 import time

sopel_modules/SpiceBot_Logs/ErrorDisplay.py

@@ -3,9 +3,8 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
 
 import sopel.module
 
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Logs import botlogs
-
+from sopel_modules.SpiceBot.Events import botevents
-from .Logs import botlogs
 
 
 @sopel.module.event(botevents.BOT_STARTUPMONOLOGUE)

sopel_modules/SpiceBot_Logs/Logs_Command.py

@@ -5,8 +5,8 @@ import sopel.module
 
 import spicemanip
 
-from .Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, command_permissions_check, inlist, inlist_match, similar_list
 
 

sopel_modules/SpiceBot_Logs/Queue.py

@@ -0,0 +1,28 @@
+# coding=utf-8
+from __future__ import unicode_literals, absolute_import, division, print_function
+
+import sopel.module
+import sopel.tools
+import sopel.config
+
+from sopel_modules.SpiceBot.Logs import botlogs
+
+
+@sopel.module.event('001')
+@sopel.module.rule('.*')
+def join_log_channel(bot, trigger):
+
+    if bot.config.core.logging_channel:
+        channel = bot.config.core.logging_channel
+        if channel not in bot.channels.keys():
+            bot.write(('JOIN', bot.nick, channel))
+            if channel not in bot.channels.keys() and bot.config.SpiceBot_Channels.operadmin:
+                bot.write(('SAJOIN', bot.nick, channel))
+
+        while True:
+            if len(botlogs.SpiceBot_Logs["queue"]):
+                bot.say(str(botlogs.SpiceBot_Logs["queue"][0]), channel)
+                del botlogs.SpiceBot_Logs["queue"][0]
+    else:
+        botlogs.sopel_config["logging_channel"] = False
+        botlogs.SpiceBot_Logs["queue"] = []

sopel_modules/SpiceBot_Logs/__init__.py

@@ -1,7 +1,7 @@
 # coding=utf8
 from __future__ import unicode_literals, absolute_import, division, print_function
 
-from .Logs import *
+from .Queue import *
 from .Logs_Command import *
 from .ErrorDisplay import *
 

sopel_modules/SpiceBot_Restart/Restart.py

@@ -5,7 +5,7 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi
 # sopel imports
 import sopel.module
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
 from sopel_modules.SpiceBot_SBTools import spicebot_reload
 
 

sopel_modules/SpiceBot_SBTools/__init__.py

@@ -20,7 +20,7 @@ from pygit2 import clone_repository
 
 import spicemanip
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
 
 
 """Variable References"""

sopel_modules/SpiceBot_SopelPatches/Patches.py

@@ -6,7 +6,7 @@ from __future__ import unicode_literals, absolute_import, print_function, divisi
 import sopel
 import sopel.module
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
 from sopel_modules.SpiceBot_SBTools import stock_modules_begone
 
 

sopel_modules/SpiceBot_StartupMonologue/StartupMonologue.py

@@ -4,8 +4,8 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
 
 import sopel.module
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 
 
 def setup(bot):

sopel_modules/SpiceBot_StartupMonologue/StartupMonologue_Display.py

@@ -4,8 +4,8 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
 
 import sopel.module
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
-from sopel_modules.SpiceBot_Events.System import botevents
+from sopel_modules.SpiceBot.Events import botevents
 from sopel_modules.SpiceBot_SBTools import humanized_time
 
 import time

sopel_modules/SpiceBot_Update/Update.py

@@ -8,7 +8,7 @@ from sopel.config.types import StaticSection, ValidatedAttribute
 
 import spicemanip
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
 from sopel_modules.SpiceBot_SBTools import sopel_triggerargs, command_permissions_check, spicebot_reload, spicebot_update
 
 

sopel_modules/SpiceBot_Uptime/Uptime.py

@@ -6,7 +6,7 @@ import sopel.module
 
 import time
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
 from sopel_modules.SpiceBot_SBTools import humanized_time
 
 

sopel_modules/SpiceBot_osd/__init__.py

@@ -14,7 +14,7 @@ from sopel import tools, module
 from sopel.tools import Identifier
 from sopel.config.types import StaticSection, ValidatedAttribute
 
-from sopel_modules.SpiceBot_Logs.Logs import botlogs
+from sopel_modules.SpiceBot.Logs import botlogs
 
 import time
 from collections import abc