userland import fixes

userland/__init__.py

@@ -1 +1 @@
-"""xthulu default userland"""
+"""Default userland"""

userland/cli/seed.py

@@ -5,13 +5,14 @@
 from inspect import isclass
 
 # local
-from xthulu import config, db
+from xthulu import db
+from xthulu.configuration import get_config
 
 
 async def seed():
     """Seed userland model data."""
 
-    await db.set_bind(config["db"]["bind"])
+    await db.set_bind(get_config("db.bind"))
     models = __import__("userland.models", fromlist=("*",))
 
     for m in dir(models):

userland/scripts/__init__.py

@@ -1 +1 @@
-"""xthulu default userland scripts"""
+"""Default userland scripts"""

userland/scripts/lock_example.py

@@ -1,10 +1,10 @@
-"""xthulu lock example"""
+"""Lock example"""
 
 # api
-from xthulu.context import Context
+from xthulu.ssh.context import SSHContext
 
 
-async def main(cx: Context):
+async def main(cx: SSHContext):
     with cx.lock("testing") as l:
         if not l:
             cx.echo("Unable to acquire lock\r\n")

userland/scripts/oneliners.py

@@ -1,8 +1,8 @@
-"""oneliners script"""
+"""Oneliners script"""
 
 # api
-from xthulu.context import Context
-from xthulu.ui.editors import LineEditor
+from xthulu.ssh.context import SSHContext
+from xthulu.ssh.ui.editors import LineEditor
 
 # local
 from userland.models import Oneliner
@@ -14,7 +14,7 @@
 """Number of oneliners to display on screen"""
 
 
-async def main(cx: Context):
+async def main(cx: SSHContext):
     async def get_oneliners():
         recent = (
             Oneliner.select("id")

userland/scripts/top.py

@@ -1,11 +1,11 @@
 """Userland entry point"""
 
-# local
-from xthulu.context import Context
-from xthulu.ui import show_art
+# api
+from xthulu.ssh.context import SSHContext
+from xthulu.ssh.ui import show_art
 
 
-async def main(cx: Context):
+async def main(cx: SSHContext):
     if cx.encoding == "utf-8":
         cx.echo("\x1b%G")
     elif cx.env["TERM"] != "ansi":