Cutlery/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2025-07-09 03:04:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove file path context managers, GH-390

Browse Source
This commit is contained in:
krateng 2025-01-19 05:53:08 +01:00
parent 968bea14d9
commit 5a95d4e056
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maloja/server.py
View File

@ -165,16 +165,16 @@ def login():
@webserver.route("/media/<name>.<ext>") @webserver.route("/media/<name>.<ext>")
def static(name,ext): def static(name,ext):
assert ext in ["txt","ico","jpeg","jpg","png","less","js","ttf","css"] assert ext in ["txt","ico","jpeg","jpg","png","less","js","ttf","css"]
with resources.files('maloja') / 'web' / 'static' as staticfolder: staticfolder = resources.files('maloja') / 'web' / 'static'
response = static_file(ext + "/" + name + "." + ext,root=staticfolder) response = static_file(ext + "/" + name + "." + ext,root=staticfolder)
response.set_header("Cache-Control", "public, max-age=3600") response.set_header("Cache-Control", "public, max-age=3600")
return response return response
# new, direct reference # new, direct reference
@webserver.route("/static/<path:path>") @webserver.route("/static/<path:path>")
def static(path): def static(path):
with resources.files('maloja') / 'web' / 'static' as staticfolder: staticfolder = resources.files('maloja') / 'web' / 'static'
response = static_file(path,root=staticfolder) response = static_file(path,root=staticfolder)
response.set_header("Cache-Control", "public, max-age=3600") response.set_header("Cache-Control", "public, max-age=3600")
return response return response

20
maloja/setup.py
View File

@ -1,10 +1,7 @@
import os import os
import shutil
from importlib import resources from importlib import resources
try:
from setuptools import distutils
except ImportError:
import distutils
from doreah.io import col, ask, prompt from doreah.io import col, ask, prompt
from .pkg_global.conf import data_dir, dir_settings, malojaconfig, auth from .pkg_global.conf import data_dir, dir_settings, malojaconfig, auth
@ -22,15 +19,14 @@ ext_apikeys = [
def copy_initial_local_files(): def copy_initial_local_files():
with resources.files("maloja") / 'data_files' as folder: data_file_source = resources.files("maloja") / 'data_files'
for cat in dir_settings: for cat in dir_settings:
if dir_settings[cat] is None: if dir_settings[cat] is None:
continue continue
if cat == 'config' and malojaconfig.readonly:
continue
if cat == 'config' and malojaconfig.readonly: shutil.copytree(data_file_source / cat, dir_settings[cat])
continue
distutils.dir_util.copy_tree(os.path.join(folder,cat),dir_settings[cat],update=False)
charset = list(range(10)) + list("abcdefghijklmnopqrstuvwxyz") + list("ABCDEFGHIJKLMNOPQRSTUVWXYZ") charset = list(range(10)) + list("abcdefghijklmnopqrstuvwxyz") + list("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
def randomstring(length=32): def randomstring(length=32):

1
pyproject.toml
View File

@ -30,7 +30,6 @@ dependencies = [
"sqlalchemy==2.0", "sqlalchemy==2.0",
"python-datauri==3.0.*", "python-datauri==3.0.*",
"requests==2.32.*", "requests==2.32.*",
"setuptools==75.8.*",
"toml==0.10.*", "toml==0.10.*",
"PyYAML==6.0.*" "PyYAML==6.0.*"
] ]