Miseleneous Fixes

FileStream/server/API/__init__.py

@@ -24,8 +24,6 @@ async def handle_v2(request):
 api = web.Application()
 
 
-
-
 cors = aiohttp_cors.setup(api, defaults={"*": aiohttp_cors.ResourceOptions(
     allow_credentials=False,
     expose_headers="*",
@@ -33,8 +31,6 @@ cors = aiohttp_cors.setup(api, defaults={"*": aiohttp_cors.ResourceOptions(
     allow_methods="*"
 )})
 
-
-
 cors.add(api.router.add_get('/', handle_v2))
 
 #api.router.add_get('/files', list_all_files_db)

FileStream/server/APP/render_template.py

@@ -1,3 +1,4 @@
+import os
 import jinja2
 import aiohttp
 import urllib.parse
@@ -8,6 +9,10 @@ from FileStream.Tools.file import humanbytes
 db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
 
 
+# Define the path to the static folder
+static_folder = os.path.join(os.path.dirname(__file__), '..', '..', 'template')
+
+
 async def render_page(db_id):
   file_data = await db.get_file(db_id)
   src = urllib.parse.urljoin(Server.URL, f'api/dl/{file_data["_id"]}')
@@ -15,21 +20,28 @@ async def render_page(db_id):
   file_name = file_data['file']['file_name'].replace("_", " ")
 
   if str((file_data['file']['mime_type']).split('/')[0].strip()) == 'video':
-    template_file = "FileStream/server/template/play.html"
+    
+    template_file = os.path.join(static_folder, "play.html")
+    #template_file = "FileStream/server/template/play.html"
+
   else:
-    template_file = "FileStream/server/template/dl.html"
+    #template_file = "FileStream/server/template/dl.html"
+    template_file = os.path.join(static_folder, "dl.html")
+
     async with aiohttp.ClientSession() as s:
       async with s.get(src) as u:
         file_size = humanbytes(int(u.headers.get('Content-Length')))
+
   with open(template_file) as f:
     template = jinja2.Template(f.read())
-  return template.render(file_name=file_name,
-                         file_url=src,
-                         file_size=file_size)
+
+  return template.render(file_name=file_name,file_url=src,file_size=file_size)
 
 
 async def render_upload():
+
   template_file = "FileStream/server/template/upload.html"
+
   with open(template_file) as f:
     template = jinja2.Template(f.read())
   return template.render()

FileStream/server/__init__.py

@@ -18,6 +18,10 @@ from .Middlewares.logging_middleware import logging_middleware
 # Set time to consider a client inactive (e.g., 10 minutes)
 INACTIVITY_TIMEOUT = 180  # 3 minutes
 
+# Define the path to the template (static) folder
+template_folder = os.path.join(os.path.dirname(__file__), 'template')
+
+
 async def clear_inactive_clients():
     """Clear inactive clients from ACTIVE_CLIENTS."""
     await asyncio.sleep(INACTIVITY_TIMEOUT)  # Check every INACTIVITY_TIMEOUT seconds
@@ -43,5 +47,8 @@ def web_server():
     web_app.add_subapp('/app', app)
     web_app.add_subapp('/api', api)
     web_app.add_subapp('/auth', auth)
-    # Return the app to be used with AppRunner
+    
+    # Add static file handler
+    web_app.router.add_static('/static/', template_folder)
+
     return web_app