From 1fc6120380846299c9eb19601d0891ad82b87541 Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Mon, 30 Dec 2024 20:54:09 -0500 Subject: [PATCH] Rename the whole thing to xenu_nntp --- bin/{nntp-tiny-adduser => xenu-nntp-adduser} | 6 +++--- bin/{nntp-tiny-passwd => xenu-nntp-passwd} | 8 ++++---- bin/{nntp-tiny-server => xenu-nntp-server} | 8 ++++---- lib/{nntp/tiny => xenu_nntp}/buffer.py | 0 lib/{nntp/tiny => xenu_nntp}/client.py | 10 +++++----- lib/{nntp/tiny => xenu_nntp}/config.py | 4 ++-- lib/{nntp/tiny => xenu_nntp}/daemon.py | 2 +- lib/{nntp/tiny => xenu_nntp}/db.py | 0 lib/{nntp/tiny => xenu_nntp}/host.py | 0 lib/{nntp/tiny => xenu_nntp}/mbox.py | 2 +- lib/{nntp/tiny => xenu_nntp}/message.py | 2 +- lib/{nntp/tiny => xenu_nntp}/newsgroup.py | 2 +- lib/{nntp/tiny => xenu_nntp}/passwd.py | 0 lib/{nntp/tiny => xenu_nntp}/remote.py | 2 +- lib/{nntp/tiny => xenu_nntp}/request.py | 0 lib/{nntp/tiny => xenu_nntp}/response.py | 0 lib/{nntp/tiny => xenu_nntp}/server.py | 8 ++++---- lib/{nntp/tiny => xenu_nntp}/session.py | 12 ++++++------ lib/{nntp/tiny => xenu_nntp}/socket.py | 4 ++-- lib/{nntp/tiny => xenu_nntp}/user.py | 4 ++-- 20 files changed, 37 insertions(+), 37 deletions(-) rename bin/{nntp-tiny-adduser => xenu-nntp-adduser} (90%) rename bin/{nntp-tiny-passwd => xenu-nntp-passwd} (90%) rename bin/{nntp-tiny-server => xenu-nntp-server} (78%) rename lib/{nntp/tiny => xenu_nntp}/buffer.py (100%) rename lib/{nntp/tiny => xenu_nntp}/client.py (95%) rename lib/{nntp/tiny => xenu_nntp}/config.py (95%) rename lib/{nntp/tiny => xenu_nntp}/daemon.py (92%) rename lib/{nntp/tiny => xenu_nntp}/db.py (100%) rename lib/{nntp/tiny => xenu_nntp}/host.py (100%) rename lib/{nntp/tiny => xenu_nntp}/mbox.py (98%) rename lib/{nntp/tiny => xenu_nntp}/message.py (99%) rename lib/{nntp/tiny => xenu_nntp}/newsgroup.py (95%) rename lib/{nntp/tiny => xenu_nntp}/passwd.py (100%) rename lib/{nntp/tiny => xenu_nntp}/remote.py (97%) rename lib/{nntp/tiny => xenu_nntp}/request.py (100%) rename lib/{nntp/tiny => xenu_nntp}/response.py (100%) rename lib/{nntp/tiny => xenu_nntp}/server.py (93%) rename lib/{nntp/tiny => xenu_nntp}/session.py (98%) rename lib/{nntp/tiny => xenu_nntp}/socket.py (91%) rename lib/{nntp/tiny => xenu_nntp}/user.py (93%) diff --git a/bin/nntp-tiny-adduser b/bin/xenu-nntp-adduser similarity index 90% rename from bin/nntp-tiny-adduser rename to bin/xenu-nntp-adduser index 25b831f..f960a29 100755 --- a/bin/nntp-tiny-adduser +++ b/bin/xenu-nntp-adduser @@ -4,9 +4,9 @@ import sys import os import argparse -from nntp.tiny.config import Config -from nntp.tiny.db import Database -from nntp.tiny.user import User +from xenu_nntp.config import Config +from xenu_nntp.db import Database +from xenu_nntp.user import User parser = argparse.ArgumentParser(description='Create new account') parser.add_argument('--config-file', '-f', type=str, help='Specify a configuration file location') diff --git a/bin/nntp-tiny-passwd b/bin/xenu-nntp-passwd similarity index 90% rename from bin/nntp-tiny-passwd rename to bin/xenu-nntp-passwd index d73fc2c..c748d67 100755 --- a/bin/nntp-tiny-passwd +++ b/bin/xenu-nntp-passwd @@ -5,10 +5,10 @@ import os import argparse import getpass -from nntp.tiny.config import Config -from nntp.tiny.db import Database -from nntp.tiny.user import User -from nntp.tiny.passwd import crypt +from xenu_nntp.config import Config +from xenu_nntp.db import Database +from xenu_nntp.user import User +from xenu_nntp.passwd import crypt parser = argparse.ArgumentParser(description='Set password of account') parser.add_argument('--config-file', '-f', type=str, help='Specify a configuration file location') diff --git a/bin/nntp-tiny-server b/bin/xenu-nntp-server similarity index 78% rename from bin/nntp-tiny-server rename to bin/xenu-nntp-server index 3e3f9fb..113c510 100755 --- a/bin/nntp-tiny-server +++ b/bin/xenu-nntp-server @@ -3,10 +3,10 @@ import os import argparse -from nntp.tiny.config import Config -from nntp.tiny.db import Database -from nntp.tiny.server import Server -from nntp.tiny.daemon import Daemon +from xenu_nntp.config import Config +from xenu_nntp.db import Database +from xenu_nntp.server import Server +from xenu_nntp.daemon import Daemon parser = argparse.ArgumentParser(description='Tiny NNTP server') parser.add_argument('--daemon', '-d', action='store_true', help='Run NNTP server as daemon in background') diff --git a/lib/nntp/tiny/buffer.py b/lib/xenu_nntp/buffer.py similarity index 100% rename from lib/nntp/tiny/buffer.py rename to lib/xenu_nntp/buffer.py diff --git a/lib/nntp/tiny/client.py b/lib/xenu_nntp/client.py similarity index 95% rename from lib/nntp/tiny/client.py rename to lib/xenu_nntp/client.py index ed153cf..6e3bad5 100644 --- a/lib/nntp/tiny/client.py +++ b/lib/xenu_nntp/client.py @@ -7,12 +7,12 @@ import email.utils from typing import Optional -from nntp.tiny.socket import Connection -from nntp.tiny.host import Host -from nntp.tiny.response import Response, ResponseCode -from nntp.tiny.message import MessageRange, Message, MessagePart +from xenu_nntp.socket import Connection +from xenu_nntp.host import Host +from xenu_nntp.response import Response, ResponseCode +from xenu_nntp.message import MessageRange, Message, MessagePart -from nntp.tiny.remote import ( +from xenu_nntp.remote import ( RemoteException, RemoteNewsgroup, RemoteNewsgroupDescription, diff --git a/lib/nntp/tiny/config.py b/lib/xenu_nntp/config.py similarity index 95% rename from lib/nntp/tiny/config.py rename to lib/xenu_nntp/config.py index 425e236..befc11a 100644 --- a/lib/nntp/tiny/config.py +++ b/lib/xenu_nntp/config.py @@ -37,8 +37,8 @@ class ConfigFileException(ConfigException): class Config(configparser.ConfigParser): SEARCH_PATHS = [ './server.conf', - '/usr/local/etc/nntp-tiny/server.conf', - '/etc/nntp-tiny/server.conf' + '/usr/local/etc/xenu-nntp/server.conf', + '/etc/xenu-nntp/server.conf' ] @staticmethod diff --git a/lib/nntp/tiny/daemon.py b/lib/xenu_nntp/daemon.py similarity index 92% rename from lib/nntp/tiny/daemon.py rename to lib/xenu_nntp/daemon.py index c6a82b7..6e57a9c 100644 --- a/lib/nntp/tiny/daemon.py +++ b/lib/xenu_nntp/daemon.py @@ -2,7 +2,7 @@ import os import signal import configparser -from nntp.tiny.config import Config +from xenu_nntp.config import Config class Daemon(): def init(config: Config): diff --git a/lib/nntp/tiny/db.py b/lib/xenu_nntp/db.py similarity index 100% rename from lib/nntp/tiny/db.py rename to lib/xenu_nntp/db.py diff --git a/lib/nntp/tiny/host.py b/lib/xenu_nntp/host.py similarity index 100% rename from lib/nntp/tiny/host.py rename to lib/xenu_nntp/host.py diff --git a/lib/nntp/tiny/mbox.py b/lib/xenu_nntp/mbox.py similarity index 98% rename from lib/nntp/tiny/mbox.py rename to lib/xenu_nntp/mbox.py index 8592034..94d85aa 100644 --- a/lib/nntp/tiny/mbox.py +++ b/lib/xenu_nntp/mbox.py @@ -1,4 +1,4 @@ -from nntp.tiny.message import Message +from xenu_nntp.message import Message class MBoxReaderError(Exception): pass diff --git a/lib/nntp/tiny/message.py b/lib/xenu_nntp/message.py similarity index 99% rename from lib/nntp/tiny/message.py rename to lib/xenu_nntp/message.py index b4908b5..2e9bf51 100644 --- a/lib/nntp/tiny/message.py +++ b/lib/xenu_nntp/message.py @@ -6,7 +6,7 @@ import uuid from email.utils import parsedate_to_datetime from email.header import decode_header, Header -from nntp.tiny.db import DatabaseTable +from xenu_nntp.db import DatabaseTable def decode(text: str): decoded = decode_header(text)[0] diff --git a/lib/nntp/tiny/newsgroup.py b/lib/xenu_nntp/newsgroup.py similarity index 95% rename from lib/nntp/tiny/newsgroup.py rename to lib/xenu_nntp/newsgroup.py index 2fd9fb6..09c9311 100644 --- a/lib/nntp/tiny/newsgroup.py +++ b/lib/xenu_nntp/newsgroup.py @@ -1,6 +1,6 @@ import datetime -from nntp.tiny.db import DatabaseTable +from xenu_nntp.db import DatabaseTable class Newsgroup(DatabaseTable): name = 'newsgroup' diff --git a/lib/nntp/tiny/passwd.py b/lib/xenu_nntp/passwd.py similarity index 100% rename from lib/nntp/tiny/passwd.py rename to lib/xenu_nntp/passwd.py diff --git a/lib/nntp/tiny/remote.py b/lib/xenu_nntp/remote.py similarity index 97% rename from lib/nntp/tiny/remote.py rename to lib/xenu_nntp/remote.py index f4cb0ae..bf2506f 100644 --- a/lib/nntp/tiny/remote.py +++ b/lib/xenu_nntp/remote.py @@ -1,4 +1,4 @@ -from nntp.tiny.response import Response +from xenu_nntp.response import Response class RemoteException(Exception): def __init__(self, response: Response): diff --git a/lib/nntp/tiny/request.py b/lib/xenu_nntp/request.py similarity index 100% rename from lib/nntp/tiny/request.py rename to lib/xenu_nntp/request.py diff --git a/lib/nntp/tiny/response.py b/lib/xenu_nntp/response.py similarity index 100% rename from lib/nntp/tiny/response.py rename to lib/xenu_nntp/response.py diff --git a/lib/nntp/tiny/server.py b/lib/xenu_nntp/server.py similarity index 93% rename from lib/nntp/tiny/server.py rename to lib/xenu_nntp/server.py index 8645ecc..aa16ef4 100644 --- a/lib/nntp/tiny/server.py +++ b/lib/xenu_nntp/server.py @@ -5,10 +5,10 @@ import socket import selectors import ssl -from nntp.tiny.config import Config, ConfigException -from nntp.tiny.db import Database -from nntp.tiny.host import Host -from nntp.tiny.session import Session +from xenu_nntp.config import Config, ConfigException +from xenu_nntp.db import Database +from xenu_nntp.host import Host +from xenu_nntp.session import Session class Server(): def __init__(self, config: Config): diff --git a/lib/nntp/tiny/session.py b/lib/xenu_nntp/session.py similarity index 98% rename from lib/nntp/tiny/session.py rename to lib/xenu_nntp/session.py index 724c650..d972113 100644 --- a/lib/nntp/tiny/session.py +++ b/lib/xenu_nntp/session.py @@ -10,12 +10,12 @@ import email.utils from typing import Optional -from nntp.tiny.socket import Connection -from nntp.tiny.db import Database -from nntp.tiny.response import Response, ResponseCode -from nntp.tiny.newsgroup import Newsgroup -from nntp.tiny.user import User, UserPermission -from nntp.tiny.message import ( +from xenu_nntp.socket import Connection +from xenu_nntp.db import Database +from xenu_nntp.response import Response, ResponseCode +from xenu_nntp.newsgroup import Newsgroup +from xenu_nntp.user import User, UserPermission +from xenu_nntp.message import ( Message, MessageRange, MessagePart, each_line ) diff --git a/lib/nntp/tiny/socket.py b/lib/xenu_nntp/socket.py similarity index 91% rename from lib/nntp/tiny/socket.py rename to lib/xenu_nntp/socket.py index a38ff92..1782ecf 100644 --- a/lib/nntp/tiny/socket.py +++ b/lib/xenu_nntp/socket.py @@ -1,5 +1,5 @@ -from nntp.tiny.buffer import OutputBuffer, LineBuffer -from nntp.tiny.message import Message, MessagePart, each_line +from xenu_nntp.buffer import OutputBuffer, LineBuffer +from xenu_nntp.message import Message, MessagePart, each_line class Connection(): def __init__(self, sock): diff --git a/lib/nntp/tiny/user.py b/lib/xenu_nntp/user.py similarity index 93% rename from lib/nntp/tiny/user.py rename to lib/xenu_nntp/user.py index 35c49a2..efec938 100644 --- a/lib/nntp/tiny/user.py +++ b/lib/xenu_nntp/user.py @@ -1,7 +1,7 @@ import enum -from nntp.tiny.db import Database, DatabaseTable -from nntp.tiny.passwd import compare +from xenu_nntp.db import Database, DatabaseTable +from xenu_nntp.passwd import compare class UserPermission(enum.Flag): NONE = 0