1 files changed, 6 insertions, 30 deletions
diff --git a/app/main.py b/app/main.py
index 891adb1..d643447 100644
--- a/app/main.py
+++ b/app/main.py
@@ -1,10 +1,10 @@
-from pathlib import Path
-
 from fastapi import FastAPI, Request
 from fastapi.responses import HTMLResponse
 from fastapi.staticfiles import StaticFiles
 from starlette.templating import Jinja2Templates
-import httpx
+
+from app.utils import get_avatar_urls, get_client_geo, get_client_host
+from app.logging import logger
 
 templates = Jinja2Templates(directory="templates")
 
@@ -12,35 +12,11 @@ app = FastAPI()
 app.mount("/static", StaticFiles(directory="static"), name="static")
 
 
-def get_avatar_urls():
-    path = Path('./static') / 'avatars'
-    if not path.exists():
-        path.mkdir()
-
-    return sorted([
-        str(jpg_avatar)
-        for jpg_avatar
-        in path.glob('*.jpg')
-    ])
-
-
-def get_client_host(request: Request):
-    return request.client.host
-
-
-async def get_client_geo(client_host: str):
-    async with httpx.AsyncClient() as client:
-        response = await client.get(
-            # использование https платная опция сервиса, инфо тут https://members.ip-api.com/
-            url='http://ip-api.com/json/{}'.format(client_host),
-            params={"lang": "ru"}
-        )
-        data = response.json()
-    return data
-
-
 @app.get("/", response_class=HTMLResponse)
 async def index(request: Request):
+
+    logger.info(str(dict(request.headers)))
+
     return templates.TemplateResponse(
         "index.html",
         {