From 87c0d524c8beb298c88060d9fb3f6dc8c4617f95 Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Sun, 8 Jun 2025 12:35:26 +0500 Subject: [PATCH] Update --- LeraFoxQueen/main.py | 25 +++++++++++++++++-------- push.sh | 28 ++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/LeraFoxQueen/main.py b/LeraFoxQueen/main.py index acc256e..fd21524 100644 --- a/LeraFoxQueen/main.py +++ b/LeraFoxQueen/main.py @@ -1,13 +1,14 @@ # import pathlib -from fastapi import FastAPI, Request -from fastapi.templating import Jinja2Templates -from fastapi.staticfiles import StaticFiles -from fastapi.responses import HTMLResponse +import datetime import uuid - from contextlib import asynccontextmanager -from .database import create_tables, delete_tables +from fastapi import FastAPI, Request +from fastapi.responses import HTMLResponse +from fastapi.staticfiles import StaticFiles +from fastapi.templating import Jinja2Templates + +from .database import create_tables, delete_tables from .router import router as datings_router from .validity import is_valid_uuid @@ -31,13 +32,21 @@ app.include_router(datings_router) app.mount("/static", StaticFiles(directory="static"), name="static") + @app.get("/", response_class=HTMLResponse) async def index(request: Request): response = templates.TemplateResponse("index.html", {"request": request}) - sessionKey = request.cookies.get("sessionkey") if isinstance(sessionKey, str) and is_valid_uuid(sessionKey): pass else: - response.set_cookie(key="sessionkey", value=str(uuid.uuid4())) + days = 365 + expires_t_obj = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta( + days=days + ) + expires_t_str = expires_t_obj.strftime("%a, %d %b %Y %H:%M:%S GMT") + + response.set_cookie( + key="sessionkey", value=str(uuid.uuid4()), expires=expires_t_str + ) return response diff --git a/push.sh b/push.sh index 73ef16b..dd47cba 100755 --- a/push.sh +++ b/push.sh @@ -1,6 +1,30 @@ #!/bin/bash -git add . && git commit -m "Update" -git push +cd $(dirname $0) + +ip1="10.120.152.1" +ip2="192.168.1.250" + +ip r | grep 10.120.152.1 +if [[ $? == 0 ]]; then + ping -c 1 10.120.152.1 + if [[ $? == 0 ]]; then + ip=$ip1 + git='work' + fi +else + ping -c 1 192.168.1.250 + if [[ $? == 0 ]]; then + ip=$ip2 + git='origin' + fi +fi + +git add . +git commit -m "Update" +git push $git + +ssh ${ip} -f '~/update-lerafoxqueen.sh' +status=$? echo "Finish!"