From efb99ea8d5e59810fcb77cdb1ebde75c555e4035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=BE=D1=88=D0=BA=D0=B8=D0=BD=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Thu, 27 Nov 2025 09:35:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=BE=20?= =?UTF-8?q?=D1=81=D0=BF=D1=83=D1=82=D0=BD=D0=B8=D0=BA=D0=B0=D0=BC=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbapp/mapsapp/utils.py | 6 +++++- docker-compose.prod.yaml | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dbapp/mapsapp/utils.py b/dbapp/mapsapp/utils.py index cfc7d66..390e643 100644 --- a/dbapp/mapsapp/utils.py +++ b/dbapp/mapsapp/utils.py @@ -141,6 +141,8 @@ def parse_transponders_from_xml(data_in: BytesIO, user=None): continue norad = sat.xpath('./ns:norad/text()', namespaces=ns) beams = sat.xpath('.//ns:BeamMemo', namespaces=ns) + intl_code = sat.xpath('.//ns:internationalCode/text()', namespaces=ns) + sub_sat_point = sat.xpath('.//ns:subSatellitePoint/text()', namespaces=ns) zones = {} for zone in beams: zone_name = zone.xpath('./ns:name/text()', namespaces=ns)[0] if zone.xpath('./ns:name/text()', namespaces=ns) else '-' @@ -174,7 +176,9 @@ def parse_transponders_from_xml(data_in: BytesIO, user=None): sat_obj, _ = Satellite.objects.get_or_create( name=name, defaults={ - "norad": int(norad[0]) if norad else -1 + "norad": int(norad[0]) if norad else -1, + "international_code": intl_code[0], + "undersat_point": sub_sat_point[0] }) trans_obj, created = Transponders.objects.get_or_create( polarization=pol_obj, diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml index 33945dd..fe24e87 100644 --- a/docker-compose.prod.yaml +++ b/docker-compose.prod.yaml @@ -56,6 +56,17 @@ services: volumes: - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro - static_volume:/usr/share/nginx/html/static + + flaresolverr: + image: ghcr.io/flaresolverr/flaresolverr:latest + container_name: flaresolverr + restart: unless-stopped + ports: + - "8191:8191" + environment: + - LOG_LEVEL=info + - LOG_HTML=false + - CAPTCHA_SOLVER=none volumes: pgdata: