diff --git a/website/web/__init__.py b/website/web/__init__.py index fd85c272..27d4df3d 100644 --- a/website/web/__init__.py +++ b/website/web/__init__.py @@ -17,7 +17,7 @@ import filetype # type: ignore[import-untyped] from collections import defaultdict -from datetime import date, datetime, timedelta +from datetime import date, datetime, timedelta, UTC from importlib.metadata import version from io import BytesIO, StringIO from typing import Any, TypedDict @@ -25,6 +25,7 @@ from urllib.parse import unquote_plus, urlparse from uuid import uuid4 from zipfile import ZipFile +from zoneinfo import ZoneInfo from har2tree import HostNode, URLNode import flask_login # type: ignore[import-untyped] @@ -60,7 +61,6 @@ from .proxied import ReverseProxied logging.config.dictConfig(get_config('logging')) -all_timezones_set = available_timezones() app: Flask = Flask(__name__) app.wsgi_app = ReverseProxied(app.wsgi_app) # type: ignore[method-assign] @@ -281,7 +281,13 @@ def get_icon(icon_id: str) -> Icon | None: return available_icons.get(icon_id) -def get_tz_info() -> tuple[str | None, str, set[str]]: +all_timezones_set: dict[str, str] = {} +for tzname in sorted(available_timezones()): + if offset := ZoneInfo(tzname).utcoffset(datetime.now(UTC)): + all_timezones_set[tzname] = f"{offset.total_seconds() / (60 * 60):+06.2f}" + + +def get_tz_info() -> tuple[str | None, str, dict[str, str]]: now = datetime.now().astimezone() local_TZ = now.tzname() local_UTC_offset = f'UTC{now.strftime("%z")}' @@ -1735,6 +1741,10 @@ def capture_web() -> str | Response | WerkzeugResponse: capture_query['allow_tracking'] = True if request.form.get('allow_tracking') else False capture_query['java_script_enabled'] = True if request.form.get('java_script_enabled') else False + if request.form.get('width') or request.form.get('height'): + capture_query['viewport'] = {'width': int(request.form.get('width', 1280)), + 'height': int(request.form.get('height', 720))} + if lookyloo.headed_allowed: capture_query['headless'] = True if request.form.get('headless') else False diff --git a/website/web/templates/capture.html b/website/web/templates/capture.html index b53a12e3..b1561c8c 100644 --- a/website/web/templates/capture.html +++ b/website/web/templates/capture.html @@ -322,6 +322,31 @@ +
+ +
+
+
+ +
+
Width
+ +
+
+
+ +
+
Height
+ +
+
+
+ +
+
+
@@ -359,14 +384,17 @@
{% set local_TZ, local_UTC_offset, all_timezones = tz_info() %} - +
- {% for tz in all_timezones %} - + {% for tz, offset in all_timezones.items() %} + {%endfor%} +
@@ -385,14 +413,25 @@
-
+
- + +
+
Latitude
+ +
- + +
+
Longitude
+ +
+
@@ -408,12 +447,20 @@
-
+
- + +
+
Username
+ +
- + +
+
Password
+ +