indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidying

merge-requests/30/head
Bob Mottram 2024-04-08 15:12:35 +01:00
parent 3cc575bb85
commit 36457c5757
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon_get.py
View File

@ -1292,7 +1292,9 @@ def daemon_http_get(self) -> None:
if '/fonts/' in self.path: if '/fonts/' in self.path:
get_fonts(self, calling_domain, self.path, get_fonts(self, calling_domain, self.path,
self.server.base_dir, self.server.debug, self.server.base_dir, self.server.debug,
getreq_start_time) getreq_start_time, self.server.fitness,
self.server.fontsCache,
self.server.domain_full)
return return
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, self.server.fitness,

18
daemon_get_css.py
View File

@ -63,7 +63,9 @@ def get_style_sheet(self, base_dir: str, calling_domain: str, path: str,
def get_fonts(self, calling_domain: str, path: str, def get_fonts(self, calling_domain: str, path: str,
base_dir: str, debug: bool, base_dir: str, debug: bool,
getreq_start_time) -> None: getreq_start_time, fitness: {},
fonts_cache: {},
domain_full: str) -> None:
"""Returns a font """Returns a font
""" """
font_str = path.split('/fonts/')[1] font_str = path.split('/fonts/')[1]
@ -85,17 +87,17 @@ def get_fonts(self, calling_domain: str, path: str,
# The file has not changed # The file has not changed
http_304(self) http_304(self)
return return
if self.server.fontsCache.get(font_str): if fonts_cache.get(font_str):
font_binary = self.server.fontsCache[font_str] font_binary = fonts_cache[font_str]
set_headers_etag(self, font_filename, set_headers_etag(self, font_filename,
font_type, font_type,
font_binary, None, font_binary, None,
self.server.domain_full, False, None) domain_full, False, None)
write2(self, font_binary) write2(self, font_binary)
if debug: if debug:
print('font sent from cache: ' + print('font sent from cache: ' +
path + ' ' + calling_domain) path + ' ' + calling_domain)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_get_fonts cache', '_GET', '_get_fonts cache',
debug) debug)
return return
@ -110,14 +112,14 @@ def get_fonts(self, calling_domain: str, path: str,
set_headers_etag(self, font_filename, set_headers_etag(self, font_filename,
font_type, font_type,
font_binary, None, font_binary, None,
self.server.domain_full, domain_full,
False, None) False, None)
write2(self, font_binary) write2(self, font_binary)
self.server.fontsCache[font_str] = font_binary fonts_cache[font_str] = font_binary
if debug: if debug:
print('font sent from file: ' + print('font sent from file: ' +
path + ' ' + calling_domain) path + ' ' + calling_domain)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_get_fonts', debug) '_GET', '_get_fonts', debug)
return return
if debug: if debug: