From c9e8625ea508075ec2591c44abf9a46e86bcfe7a Mon Sep 17 00:00:00 2001 From: DYefremov Date: Sat, 28 Nov 2020 14:19:41 +0300 Subject: [PATCH] added types to the service parser --- app/tools/satellites.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/tools/satellites.py b/app/tools/satellites.py index b2098ce4..6624ffcb 100644 --- a/app/tools/satellites.py +++ b/app/tools/satellites.py @@ -310,8 +310,10 @@ class ServicesParser(HTMLParser): HTMLParser.__init__(self) - self._S_TYPES = {"": "2", "MPEG-2 SD": "1", "MPEG-4 SD": "22", "MPEG-4 HD": "25", "HEVC UHD": "31"} - self._TR_PAT = re.compile(r"(DVB-S[2]?)/?(.*PSK)?\s+SR\s+(\d+)\s+FEC\s+(\d/\d)\s+ONID/TID:\s+(\d+)/(\d+)\s+.*") + self._S_TYPES = {"": "2", "MPEG-2 SD": "1", "SD": "1", "MPEG-4 SD": "22", "HEVC SD": "22", "MPEG-4 HD": "25", + "MPEG-4 HD 1080": "25", "MPEG-4 HD 720": "25", "HEVC HD": "25", "HEVC UHD": "31", + "HEVC UHD 4K": "31"} + self._TR_PAT = re.compile(r"(DVB-S[2]?)/?(.*PSK)?\s+SR\s+(\d+)\s+FEC\s+(\d/\d).*ONID/TID:\s+(\d+)/(\d+)\s+.*") self._PTR_PAT = re.compile(r".*?(\d+\.\d°[EW]):\s+(\d+)\s+([RLHV]).*") self._TR = "s {}000:{}000:{}:{}:{}:{}:{}:{}" self._S2_TR = "{}:{}:{}:{}"