jmbwell/rsbbs
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tidy up new user instantiation

Browse Source
This commit is contained in:
John Burwell 2023-04-30 14:47:22 -05:00
parent 4e75ea61b5
commit bb1f488761
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsbbs/rsbbs.py
View File

@ -44,7 +44,7 @@ def main():
controller = Controller(config)
# Init the user:
user = User(controller, args.calling_station.upper())
user = User(config, controller)
# Init the UI console
console = Console(config, controller, user)

10
rsbbs/user.py
View File

@ -23,15 +23,15 @@ import sqlalchemy
from datetime import datetime, timezone
from rsbbs import __version__
from rsbbs import Controller
from rsbbs import Config, Controller
from rsbbs.models import User as SAUser
class User():
def __init__(self, controller: Controller, callsign: str):
def __init__(self, config: Config, controller: Controller):
self.controller = controller
self.callsign = callsign
self.callsign = config.args.calling_station.upper()
self.user = self.get_or_create_user()
def __getattr__(self, __name: str) -> Any:
@ -42,7 +42,7 @@ class User():
session.expire_on_commit = False
try:
statement = sqlalchemy.select(SAUser).where(
SAUser.callsign == self.callsign.upper())
SAUser.callsign == self.callsign)
exopts = {"prebuffer_rows": True}
result = session.execute(statement,
execution_options=exopts)
@ -57,7 +57,7 @@ class User():
else:
logging.info(f"User not found.")
user = SAUser(
callsign=self.callsign.upper(),
callsign=self.callsign,
login_count=1,
)
session.add(user)