From 9fdef6f2e53f6e9506cf848a2b1ee0ffac162029 Mon Sep 17 00:00:00 2001
From: Blallo <blallo@autistici.org>
Date: Thu, 3 Feb 2022 12:59:52 +0100
Subject: [PATCH] Refactor web-related modules in subpackage

---
 setup.py                             | 2 +-
 src/phi/api/app.py                   | 2 +-
 src/phi/{ => web}/app.py             | 4 ++--
 src/phi/{ => web}/auth_middleware.py | 2 +-
 src/phi/{ => web}/client_store.py    | 0
 src/phi/{ => web}/login.py           | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename src/phi/{ => web}/app.py (98%)
 rename src/phi/{ => web}/auth_middleware.py (95%)
 rename src/phi/{ => web}/client_store.py (100%)
 rename src/phi/{ => web}/login.py (100%)

diff --git a/setup.py b/setup.py
index 3303688..de1939f 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ setup(
     author_email="unit@paranoici.org",
     package_dir={"": "src"},
     packages=find_packages("src"),
-    entry_points={"console_scripts": ["phid=phi.app:cli"]},
+    entry_points={"console_scripts": ["phid=phi.web.app:cli"]},
     setup_requires=["pytest-runner"],
     install_requires=[
         "aiohttp==3.8.1",
diff --git a/src/phi/api/app.py b/src/phi/api/app.py
index a33bc4d..23a5fd5 100644
--- a/src/phi/api/app.py
+++ b/src/phi/api/app.py
@@ -3,7 +3,7 @@ from aiohttp import web
 
 from phi.logging import get_logger
 from phi.api.routes import api_routes
-from phi.auth_middleware import authenticated
+from phi.web.auth_middleware import authenticated
 
 
 log = get_logger(__name__)
diff --git a/src/phi/app.py b/src/phi/web/app.py
similarity index 98%
rename from src/phi/app.py
rename to src/phi/web/app.py
index 6a8d84c..aec3b7b 100644
--- a/src/phi/app.py
+++ b/src/phi/web/app.py
@@ -9,8 +9,8 @@ import yaml
 from phi.config import get_config, merge_config, extract_secret
 from phi.logging import setup_logging, get_logger
 from phi.api.app import api_app
-from phi.client_store import ClientStore
-from phi.login import login
+from phi.web.client_store import ClientStore
+from phi.web.login import login
 
 log = get_logger(__name__)
 
diff --git a/src/phi/auth_middleware.py b/src/phi/web/auth_middleware.py
similarity index 95%
rename from src/phi/auth_middleware.py
rename to src/phi/web/auth_middleware.py
index c6fb1a1..b4f4d6d 100644
--- a/src/phi/auth_middleware.py
+++ b/src/phi/web/auth_middleware.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 from aiohttp.web import middleware, HTTPFound
 
-from phi import app
+from phi.web import app
 from phi.async_ldap.model import Hackers, Robots, Roles
 
 
diff --git a/src/phi/client_store.py b/src/phi/web/client_store.py
similarity index 100%
rename from src/phi/client_store.py
rename to src/phi/web/client_store.py
diff --git a/src/phi/login.py b/src/phi/web/login.py
similarity index 100%
rename from src/phi/login.py
rename to src/phi/web/login.py