From 49076fe477d2d245203625d3db4f42df67ab2056 Mon Sep 17 00:00:00 2001
From: Dmitriy Yefremov <dmitriy.v.yefremov@gmail.com>
Date: Sat, 3 Feb 2018 16:45:54 +0300
Subject: [PATCH] bouquet names fix

---
 app/eparser/enigma/bouquets.py | 15 ++++++++-------
 app/eparser/enigma/lamedb.py   | 12 ++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/eparser/enigma/bouquets.py b/app/eparser/enigma/bouquets.py
index 095c744d..a959cd59 100644
--- a/app/eparser/enigma/bouquets.py
+++ b/app/eparser/enigma/bouquets.py
@@ -59,16 +59,17 @@ def get_bouquet(path, name, bq_type):
     with open(path + "userbouquet.{}.{}".format(name, bq_type)) as file:
         chs_list = file.read()
         services = []
-        for ch in list(filter(lambda x: len(x) > 1, chs_list.split("#SERVICE")[1:])):  # filtering ['']
+        srvs = list(filter(None, chs_list.split("\n#SERVICE")))  # filtering ['']
+        for ch in srvs[1:]:
             ch_data = ch.strip().split(":")
             if ch_data[1] == "64":
                 services.append(BouquetService(ch_data[-1].split("\n")[0], BqServiceType.MARKER, ch, ch_data[2]))
             elif "http" in ch:
                 services.append(BouquetService(ch_data[-1].split("\n")[0], BqServiceType.IPTV, ch, 0))
             else:
-                services.append(BouquetService(None, BqServiceType.DEFAULT,
-                                               "{}:{}:{}:{}".format(ch_data[3], ch_data[4], ch_data[5], ch_data[6]), 0))
-    return services
+                fav_id = "{}:{}:{}:{}".format(ch_data[3], ch_data[4], ch_data[5], ch_data[6])
+                services.append(BouquetService(None, BqServiceType.DEFAULT, fav_id, 0))
+    return srvs[0].strip("#NAME").strip(), services
 
 
 def parse_bouquets(path, bq_name, bq_type):
@@ -82,10 +83,10 @@ def parse_bouquets(path, bq_name, bq_type):
                 _, _, name = line.partition(nm_sep)
                 bouquets = Bouquets(name.strip(), bq_type, [])
             if bouquets and "#SERVICE" in line:
-                name = line.split(".")[1]
-                bouquets[2].append(Bouquet(name=name,
+                b_name, services = get_bouquet(path, line.split(".")[1], bq_type)
+                bouquets[2].append(Bouquet(name=b_name,
                                            type=bq_type,
-                                           services=get_bouquet(path, name, bq_type),
+                                           services=services,
                                            locked=None,
                                            hidden=None))
     return bouquets
diff --git a/app/eparser/enigma/lamedb.py b/app/eparser/enigma/lamedb.py
index 43c69d42..7605a433 100644
--- a/app/eparser/enigma/lamedb.py
+++ b/app/eparser/enigma/lamedb.py
@@ -86,17 +86,17 @@ def parse_services(services, transponders, path):
         data = str(ch[0]).split(_SEP)
         sp = "0"
         tid = data[2]
-        on_id = data[3]
-
-        transponder_id = "{}:{}:{}".format(data[1], tid, on_id)
+        nid = data[3]
+        transponder_id = "{}:{}:{}".format(data[1], tid, nid)
         transponder = transponders.get(transponder_id, None)
 
         tid = tid.lstrip(sp).upper()
-        on_id = on_id.lstrip(sp).upper()
+        nid = nid.lstrip(sp).upper()
         ssid = str(data[0]).lstrip(sp).upper()
+        onid = str(data[1]).lstrip(sp).upper()
         # For comparison in bouquets. Needed in upper case!!!
-        fav_id = "{}:{}:{}:{}".format(ssid, tid, on_id, str(data[1]).lstrip(sp))
-        picon_id = "1_0_{}_{}_{}_{}_1680000_0_0_0.png".format(1, ssid, tid, on_id)
+        fav_id = "{}:{}:{}:{}".format(ssid, tid, nid, onid)
+        picon_id = "1_0_{}_{}_{}_{}_{}_0_0_0.png".format(1, ssid, tid, nid, onid)
 
         all_flags = ch[2].split(",")
         coded = CODED_ICON if list(filter(lambda x: x.startswith("C:"), all_flags)) else None