tidy up the imports

rsbbs/__init__.py

@@ -17,12 +17,13 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 __all__ = ['config', 'console', 'controller',
-           'logger', 'parser', 'pluginloader']
+           'logger', 'models', 'parser', 'pluginloader']
 
 __version__ = "0.3.0"
 
-# from .config import Config
-# from .console import Console
-# from .controller import Controller
-# from .parser import Parser
-# from .pluginloader import PluginLoader
+from .config import Config
+from .console import Console
+from .controller import Controller
+from .logger import Logger
+from .parser import Parser
+from .pluginloader import PluginLoader

rsbbs/console.py

@@ -20,10 +20,7 @@ import logging
 import sys
 
 import rsbbs
-from rsbbs.config import Config
-from rsbbs.controller import Controller
-from rsbbs.parser import Parser
-from rsbbs.pluginloader import PluginLoader
+from rsbbs import Config, Controller, Parser, PluginLoader
 
 
 # Main UI console class
@@ -34,9 +31,9 @@ class Console():
         self.config = config
         self.controller = controller
 
-        self.parser = Parser()
+        self.parser = rsbbs.Parser()
 
-        self.pluginloader = PluginLoader(self)
+        self.pluginloader = rsbbs.PluginLoader(self)
         self.pluginloader.load_plugins()
 
     #

rsbbs/controller.py

@@ -19,7 +19,7 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import Session
 
-from rsbbs.config import Config
+from rsbbs import Config
 from rsbbs.models import Base
 
 

rsbbs/logger.py

@@ -23,7 +23,7 @@ import os
 import platformdirs
 
 
-class RSLogger(logging.Logger):
+class Logger(logging.Logger):
     def __init__(self, config):
         super().__init__(name=config.app_name)
         self.config = config
@@ -55,13 +55,13 @@ class RSLogger(logging.Logger):
         handler = logging.FileHandler(filename=log_filepath)
 
         # Add the calling station to the log messages
-        handler.setFormatter(RSFormatter(self.caller))
+        handler.setFormatter(Formatter(self.caller))
 
         # Add the handler!
         logger.addHandler(handler)
 
 
-class RSFormatter(logging.Formatter):
+class Formatter(logging.Formatter):
     def __init__(self, var):
         super().__init__()
         self.var = var

rsbbs/plugins/bye/plugin.py

@@ -18,8 +18,7 @@
 
 import logging
 
-from rsbbs.console import Console
-from rsbbs.parser import Parser
+from rsbbs import Console, Parser
 
 
 class Plugin():

rsbbs/plugins/delete/plugin.py

@@ -21,9 +21,8 @@ import logging
 import sqlalchemy
 import sqlalchemy.exc
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():

rsbbs/plugins/deletem/plugin.py

@@ -19,9 +19,8 @@
 import logging
 import sqlalchemy
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():

rsbbs/plugins/heard/plugin.py

@@ -19,8 +19,7 @@
 import logging
 import subprocess
 
-from rsbbs.console import Console
-from rsbbs.parser import Parser
+from rsbbs import Console, Parser
 
 
 class Plugin():

rsbbs/plugins/help/plugin.py

@@ -16,8 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-from rsbbs.console import Console
-from rsbbs.parser import Parser
+from rsbbs import Console, Parser
 
 
 class Plugin():

rsbbs/plugins/list/plugin.py

@@ -19,9 +19,8 @@
 import logging
 import sqlalchemy
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():

rsbbs/plugins/listm/plugin.py

@@ -19,9 +19,8 @@
 import logging
 import sqlalchemy
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():

rsbbs/plugins/read/plugin.py

@@ -20,9 +20,8 @@ import logging
 import sqlalchemy
 import sqlalchemy.exc
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():

rsbbs/plugins/readm/plugin.py

@@ -19,9 +19,8 @@
 import logging
 import sqlalchemy
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():

rsbbs/plugins/send/plugin.py

@@ -18,9 +18,8 @@
 
 import logging
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():

rsbbs/plugins/sendp/plugin.py

@@ -18,9 +18,8 @@
 
 import logging
 
-from rsbbs.console import Console
+from rsbbs import Console, Parser
 from rsbbs.models import Message
-from rsbbs.parser import Parser
 
 
 class Plugin():

rsbbs/rsbbs.py

@@ -21,10 +21,7 @@ import logging
 import sys
 
 from rsbbs import __version__
-from rsbbs.config import Config
-from rsbbs.console import Console
-from rsbbs.controller import Controller
-from rsbbs.logger import RSLogger
+from rsbbs import Config, Console, Controller, Logger
 
 
 def parse_args():
@@ -96,7 +93,7 @@ def main():
            args=args)
 
     # Start logging
-    logger = RSLogger(config)
+    logger = Logger(config)
     logging.info(f"caller connected")
 
     # Init the controller