Feat/pyinstaller

.github/workflows/build.yml

@@ -26,3 +26,8 @@ jobs:
       - name: Test run
         run: |
           timeout 3 uvicorn canvas_app:app --port 9283 || [ $? -eq 124 ]
+      - name: Build executables
+        run: |
+          pip install pyinstaller
+          pyinstaller -F start.py
+          timeout 3 dist/start --port 9283 || [ $? -eq 124 ]

Makefile

@@ -0,0 +1,16 @@
+START_SRC=start.py
+
+all:
+	pyinstaller -F $(START_SRC)
+
+windows:
+	wine pyinstaller -F $(START_SRC)
+
+clean:
+	rm -r build dist *.spec *.log
+
+format:
+	black .
+
+run:
+	./dist/start

canvas_app.py

@@ -8,8 +8,8 @@
 import urllib.parse
 from models import Position, Check, Course, URL
 from fastapi.responses import JSONResponse
-from os import path, listdir, remove, mkdir
-from updater import update
+from os import path, listdir, remove, makedirs
+
 import json
 import logging
 from typing import List
@@ -76,9 +76,6 @@ def check_file(filename):
 
 conf = ConfigMGR()
 
-# Self Update
-update()
-
 
 @app.get(
     "/config",
@@ -376,7 +373,7 @@ async def set_check(name: str, check: Check):
     """
     Check
 
-    Only 1,2,3 is available
+    Only 1, 2, 3 is available
     """
     if check.type < 0 or check.type > 3:
         return JSONResponse(status_code=400, content={"message": "Invalid check type"})
@@ -475,7 +472,7 @@ async def get_file_list():
     if path.exists("./public/res"):
         return {"files": listdir("./public/res")}
     else:
-        mkdir("./public/res")
+        makedirs("./public/res", exist_ok=True)
         return {"files": []}
 
 

models.py

@@ -1,9 +1,4 @@
 #!/usr/bin/env python3
-"""
-@Author: King
-@Date: 2023-01-04 21:24:24
-@Email: [email protected]
-"""
 
 from pydantic import BaseModel, Field
 from typing import Union

net_config.json

@@ -0,0 +1,4 @@
+{
+    "host": "localhost",
+    "port": 9283
+}

requirements.txt

@@ -2,4 +2,3 @@ requests
 fastapi
 uvicorn
 python-multipart
-GitPython

start.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+
+import uvicorn
+from canvas_app import app
+import json
+from os import path
+
+"""
+Start script
+"""
+
+
+if __name__ == "__main__":
+    net_config = {}
+
+    log_config = {
+        "version": 1,
+        "disable_existing_loggers": True,
+        "handlers": {
+            "file_handler": {
+                "class": "logging.FileHandler",
+                "filename": "error.log",
+            },
+        },
+        "root": {
+            "handlers": ["file_handler"],
+            "level": "ERROR",
+        },
+    }
+
+    if path.exists("net_config.json"):
+        with open("net_config.json", "r", encoding="utf-8", errors="ignore") as f:
+            net_config = json.load(f)
+
+            if "host" not in net_config:
+                raise Exception("no host")
+            elif "port" not in net_config:
+                raise Exception("no port")
+
+            usr_host = net_config["host"]
+            usr_port = net_config["port"]
+    else:
+        usr_host = "localhost"
+        usr_port = 9283
+
+    uvicorn.run(app, port=usr_port, host=usr_host, reload=False, log_config=log_config)