diff --git a/app/eparser/enigma/lamedb.py b/app/eparser/enigma/lamedb.py index 2e8fab4a..822209b4 100644 --- a/app/eparser/enigma/lamedb.py +++ b/app/eparser/enigma/lamedb.py @@ -52,7 +52,7 @@ class LameDbReader: """ Lamedb parser class. Reads and parses the Enigma2 lamedb[5] file. - Supports versions 3, 4 and 5.. + Supports versions 3, 4 and 5. """ __slots__ = ["_path", "_fmt"] @@ -99,7 +99,7 @@ class LameDbReader: try: data = str(file.read()) except UnicodeDecodeError as e: - log("lamedb parse error: " + str(e)) + log(f"lamedb parse error: {e}") else: return self.get_services_list(data) @@ -115,7 +115,7 @@ class LameDbReader: for line in lns: if line.startswith("s:"): srv_data = line.strip("s:").split(",", 2) - srv_data[1] = srv_data[1].strip("\"") + srv_data[1] = srv_data[1].strip("\"\n") data_len = len(srv_data) if data_len == 3: srv_data[2] = srv_data[2].strip() @@ -129,7 +129,7 @@ class LameDbReader: tr, srv = data[0].strip("t:"), data[1].strip().replace(":", " ", 1) trs[tr] = srv else: - log("Error while parsing transponder data [ver. 5] for line: {}".format(line)) + log(f"Error while parsing transponder data [ver. 5] for line: {line}") return self.parse_services(srvs, trs) @@ -188,7 +188,7 @@ class LameDbReader: tr_type = TrType(tr_type) tr = tr.split(_SEP) service_type = SERVICE_TYPE.get(data[4], SERVICE_TYPE["-2"]) - # Removing all non printable symbols! + # Removing all non-printable symbols! srv_name = "".join(c for c in srv[1] if c.isprintable()) freq = tr[0] rate = tr[1] @@ -258,18 +258,17 @@ class LameDbReader: tr_set = set() for srv in services: data_id = str(srv.data_id).split(_SEP) - tr_id = "{}:{}:{}".format(data_id[1], data_id[2], data_id[3]) + tr_id = f"{data_id[1]}:{data_id[2]}:{data_id[3]}" if tr_id not in tr_set: - transponder = "{}\n\t{}\n/\n".format(tr_id, srv.transponder) - tr_lines.append(transponder) + tr_lines.append(f"{tr_id}\n\t{srv.transponder}\n/\n") tr_set.add(tr_id) # Services - services_lines.append("{}\n{}\n{}\n".format(srv.data_id, srv.service, srv.flags_cas)) + services_lines.append(f"{srv.data_id}\n{srv.service}\n{srv.flags_cas}\n") tr_lines.sort() lines.extend(tr_lines) lines.extend(services_lines) - lines.append("end\n" + _END_LINE) + lines.append(f"end\n{_END_LINE}") return lines @@ -324,13 +323,13 @@ class LameDbWriter: for srv in self._services: data_id = str(srv.data_id).split(_SEP) - tr_id = "{}:{}:{}".format(data_id[1], data_id[2], data_id[3]) - tr_set.add("t:{},{}\n".format(tr_id, srv.transponder.replace(" ", ":", 1))) + tr_id = f"{data_id[1]}:{data_id[2]}:{data_id[3]}" + tr_set.add(f"t:{tr_id},{srv.transponder.replace(' ', ':', 1)}\n") # Removing empty packages flags = list(filter(lambda x: x != "p:", srv.flags_cas.split(","))) flags = ",".join(flags) flags = "," + flags if flags else "" - services_lines.append("s:{},\"{}\"{}\n".format(srv.data_id, srv.service, flags)) + services_lines.append(f"s:{srv.data_id},\"{srv.service}\"{flags}\n") lines.extend(sorted(tr_set)) lines.extend(services_lines)