|
|
|
@@ -747,7 +747,7 @@ class WebServer: |
|
|
|
self.logger.info(f'Received request {id(request)} from {request.remote!r} for {request.path!r}') |
|
|
|
lines = [] |
|
|
|
for path, (channel, auth) in self._paths.items(): |
|
|
|
lines.append(f'{"(PW) " if auth else ""}<a href="/{path}/today">{channel}</a> (<a href="/{path}/search">search</a>)') |
|
|
|
lines.append(f'{"(PW) " if auth else ""}<a href="/{html.escape(path)}/today">{html.escape(channel)}</a> (<a href="/{html.escape(path)}/search">search</a>)') |
|
|
|
return aiohttp.web.Response(text = f'<html><body>{"<br />".join(lines)}</body></html>', content_type = 'text/html') |
|
|
|
|
|
|
|
def _raw_to_lines(self, f, filter = lambda dt, command, content: True): |
|
|
|
@@ -785,7 +785,7 @@ class WebServer: |
|
|
|
fn = date.strftime('%Y-%m.log') |
|
|
|
with open(os.path.join(self.config['storage']['path'], request.match_info["path"], fn), 'r') as fp: |
|
|
|
lines = list(self._raw_to_lines(fp, filter = lambda ts, command, content: dateStart <= ts <= dateEnd)) |
|
|
|
return aiohttp.web.Response(text = f'<html><head>{self.logStyleTag}</head><body><a href="/{request.match_info["path"]}/{(date - datetime.timedelta(days = 1)).strftime("%Y-%m-%d")}">Previous day</a> <a href="/{request.match_info["path"]}/{(date + datetime.timedelta(days = 1)).strftime("%Y-%m-%d")}">Next day</a><br /><br />' + self._render_log(lines, request.match_info['path']) + '</body></html>', content_type = 'text/html') |
|
|
|
return aiohttp.web.Response(text = f'<html><head>{self.logStyleTag}</head><body><a href="/{html.escape(request.match_info["path"])}/{(date - datetime.timedelta(days = 1)).strftime("%Y-%m-%d")}">Previous day</a> <a href="/{html.escape(request.match_info["path"])}/{(date + datetime.timedelta(days = 1)).strftime("%Y-%m-%d")}">Next day</a><br /><br />' + self._render_log(lines, request.match_info['path']) + '</body></html>', content_type = 'text/html') |
|
|
|
|
|
|
|
async def search(self, request): |
|
|
|
self.logger.info(f'Received request {id(request)} from {request.remote!r} for {request.path!r}') |
|
|
|
|
JustAnotherArchivist
3 年前