From f1349231b2a12fe2f9a9e3237247ebc5c8779167 Mon Sep 17 00:00:00 2001 From: Dmitriy Yefremov Date: Fri, 8 Dec 2017 23:48:20 +0300 Subject: [PATCH] iptv format fix --- app/eparser/bouquets.py | 5 ++++- app/eparser/iptv.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/eparser/bouquets.py b/app/eparser/bouquets.py index dc262143..5d75373a 100644 --- a/app/eparser/bouquets.py +++ b/app/eparser/bouquets.py @@ -35,7 +35,10 @@ def write_bouquet(path, name, bq_type, channels): for ch in channels: if not ch: # if was duplicate continue - bouquet.append("#SERVICE {}\n".format(ch.fav_id if ch.service_type == "IPTV" else to_bouquet_id(ch))) + if ch.service_type == "IPTV": + bouquet.append(ch.fav_id) + else: + bouquet.append("#SERVICE {}\n".format(to_bouquet_id(ch))) with open(path + "userbouquet.{}.{}".format(name, bq_type), "w") as file: file.writelines(bouquet) diff --git a/app/eparser/iptv.py b/app/eparser/iptv.py index 4df15ddc..8035c2ec 100644 --- a/app/eparser/iptv.py +++ b/app/eparser/iptv.py @@ -13,7 +13,8 @@ def parse_m3u(path): count += 1 elif count == 1: count = 0 - fav_id = "#SERVICE 4097:0:1:2:0:0:0:0:0:0:{}#DESCRIPTION:{}".format(line, name) + fav_id = "#SERVICE 1:0:1:0:0:0:0:0:0:0:{}:{}\n#DESCRIPTION: {}\n".format( + line.strip().replace(":", "%3a"), name, name) channels.append(Channel(*aggr[0:3], name, *aggr[0:3], "IPTV", *aggr, fav_id, None)) return channels