diff --git a/README.md b/README.md index 43e4ede..7cf99c4 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,8 @@ user calls your station, `ax25d` answers the call and routes the connection to you have configured your axports, and that ax25d can answer calls. - **Python 3:** As this is a python 3 application, you will need python 3 and pip. +- Note on compiling Python3: If you build Python3 from source on + debian/raspbian, you will need libssl-dev, libffi-dev, and libsqlite3-dev - **Hardware:** A system capable of running Direwolf and ax25d should be more than sufficient. diff --git a/rsbbs/logger.py b/rsbbs/logger.py index 367f89f..575b925 100644 --- a/rsbbs/logger.py +++ b/rsbbs/logger.py @@ -48,7 +48,7 @@ class Logger(logging.Logger): logger.removeHandler(handler) # Log to a file in the system user log directory - log_dir = platformdirs.user_log_dir(appname=self.name, + log_dir = platformdirs.user_log_dir(appname=self.name, ensure_exists=True) log_filepath = os.path.join(log_dir, 'activity.log') @@ -60,7 +60,6 @@ class Logger(logging.Logger): # Add the handler! logger.addHandler(handler) - class Formatter(logging.Formatter): def __init__(self, var): super().__init__() diff --git a/rsbbs/plugins/bye/plugin.py b/rsbbs/plugins/bye/plugin.py index f8a8363..f58114d 100644 --- a/rsbbs/plugins/bye/plugin.py +++ b/rsbbs/plugins/bye/plugin.py @@ -18,7 +18,8 @@ import logging -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser class Plugin(): diff --git a/rsbbs/plugins/delete/plugin.py b/rsbbs/plugins/delete/plugin.py index a7e3269..f568c96 100644 --- a/rsbbs/plugins/delete/plugin.py +++ b/rsbbs/plugins/delete/plugin.py @@ -21,7 +21,8 @@ import logging import sqlalchemy import sqlalchemy.exc -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser from rsbbs.models import Message diff --git a/rsbbs/plugins/deletem/plugin.py b/rsbbs/plugins/deletem/plugin.py index cf02afb..a16b97c 100644 --- a/rsbbs/plugins/deletem/plugin.py +++ b/rsbbs/plugins/deletem/plugin.py @@ -19,7 +19,8 @@ import logging import sqlalchemy -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser from rsbbs.models import Message diff --git a/rsbbs/plugins/heard/plugin.py b/rsbbs/plugins/heard/plugin.py index 89d19e1..577b272 100644 --- a/rsbbs/plugins/heard/plugin.py +++ b/rsbbs/plugins/heard/plugin.py @@ -19,7 +19,8 @@ import logging import subprocess -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser class Plugin(): diff --git a/rsbbs/plugins/help/plugin.py b/rsbbs/plugins/help/plugin.py index 33b34fe..266ebc5 100644 --- a/rsbbs/plugins/help/plugin.py +++ b/rsbbs/plugins/help/plugin.py @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser class Plugin(): diff --git a/rsbbs/plugins/info/plugin.py b/rsbbs/plugins/info/plugin.py index ffa0591..cb56d33 100644 --- a/rsbbs/plugins/info/plugin.py +++ b/rsbbs/plugins/info/plugin.py @@ -22,7 +22,8 @@ import platformdirs from pathlib import Path -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser class Plugin(): diff --git a/rsbbs/plugins/list/plugin.py b/rsbbs/plugins/list/plugin.py index 1a2f2d6..20c180b 100644 --- a/rsbbs/plugins/list/plugin.py +++ b/rsbbs/plugins/list/plugin.py @@ -19,7 +19,8 @@ import logging import sqlalchemy -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser from rsbbs.models import Message diff --git a/rsbbs/plugins/listmine/plugin.py b/rsbbs/plugins/listmine/plugin.py index 06f7ebe..8ed726c 100644 --- a/rsbbs/plugins/listmine/plugin.py +++ b/rsbbs/plugins/listmine/plugin.py @@ -19,7 +19,8 @@ import logging import sqlalchemy -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser from rsbbs.models import Message diff --git a/rsbbs/plugins/listunread/plugin.py b/rsbbs/plugins/listunread/plugin.py index c64643a..28bbd81 100644 --- a/rsbbs/plugins/listunread/plugin.py +++ b/rsbbs/plugins/listunread/plugin.py @@ -19,7 +19,8 @@ import logging import sqlalchemy -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser from rsbbs.models import Message, User diff --git a/rsbbs/plugins/read/plugin.py b/rsbbs/plugins/read/plugin.py index 336dc51..f354c91 100644 --- a/rsbbs/plugins/read/plugin.py +++ b/rsbbs/plugins/read/plugin.py @@ -20,7 +20,8 @@ import logging import sqlalchemy import sqlalchemy.exc -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser from rsbbs.models import Message, User diff --git a/rsbbs/plugins/readm/plugin.py b/rsbbs/plugins/readm/plugin.py index 35ee2f1..94d3bba 100644 --- a/rsbbs/plugins/readm/plugin.py +++ b/rsbbs/plugins/readm/plugin.py @@ -19,7 +19,8 @@ import logging import sqlalchemy -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser from rsbbs.models import Message, User diff --git a/rsbbs/plugins/readnew/plugin.py b/rsbbs/plugins/readnew/plugin.py index 723bf08..de485dc 100644 --- a/rsbbs/plugins/readnew/plugin.py +++ b/rsbbs/plugins/readnew/plugin.py @@ -19,7 +19,8 @@ import logging import sqlalchemy -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser from rsbbs.models import Message, User diff --git a/rsbbs/plugins/send/plugin.py b/rsbbs/plugins/send/plugin.py index 46e0ddf..baa5a57 100644 --- a/rsbbs/plugins/send/plugin.py +++ b/rsbbs/plugins/send/plugin.py @@ -18,7 +18,8 @@ import logging -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser from rsbbs.models import Message diff --git a/rsbbs/plugins/sendp/plugin.py b/rsbbs/plugins/sendp/plugin.py index ff4dc66..c1c9c80 100644 --- a/rsbbs/plugins/sendp/plugin.py +++ b/rsbbs/plugins/sendp/plugin.py @@ -18,7 +18,8 @@ import logging -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser from rsbbs.models import Message diff --git a/rsbbs/plugins/stats/plugin.py b/rsbbs/plugins/stats/plugin.py index 3d96223..15b9c80 100644 --- a/rsbbs/plugins/stats/plugin.py +++ b/rsbbs/plugins/stats/plugin.py @@ -23,7 +23,8 @@ import sqlalchemy.orm import subprocess from rsbbs import __version__ -from rsbbs import Console, Parser +from rsbbs.console import Console +from rsbbs.parser import Parser from rsbbs.models import Message, User