python 2.7 fixes, series amends and fixes, removal of keep-alive, bouquet non ascii characters fix

Author: kiddac

BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/buildbouquets.py

@@ -292,7 +292,7 @@ def loadLive(self):
         stream_type = glob.current_playlist["settings"]["live_type"]
         live_categories = glob.current_playlist["data"]["live_categories"]
 
-        if not live_categories or (len(live_categories) == len(glob.current_playlist["data"]["live_categories_hidden"])):
+        if not live_categories:
 
             if glob.current_playlist["playlist_info"]["playlist_type"] == "xtream":
 
@@ -486,7 +486,7 @@ def loadVod(self):
         stream_type = glob.current_playlist["settings"]["vod_type"]
         vod_categories = glob.current_playlist["data"]["vod_categories"]
 
-        if not vod_categories or (len(vod_categories) == len(glob.current_playlist["data"]["vod_categories_hidden"])):
+        if not vod_categories:
 
             if glob.current_playlist["playlist_info"]["playlist_type"] == "xtream":
 
@@ -645,7 +645,7 @@ def loadSeries(self):
         stream_type = glob.current_playlist["settings"]["vod_type"]
         series_categories = glob.current_playlist["data"]["series_categories"]
 
-        if not series_categories or (len(series_categories) == len(glob.current_playlist["data"]["series_categories_hidden"])):
+        if not series_categories:
             self.finished()
             return
 

BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/catchup.py

@@ -30,7 +30,6 @@
 
 hdr = {
     'User-Agent': str(cfg.useragent.value),
-    'Connection': 'keep-alive',
     'Accept-Encoding': 'gzip, deflate'
 }
 

BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/choosecategories.py

@@ -460,7 +460,7 @@ def buildListEntry(self, id, name, hidden):
         return (pixmap, str(name), str(id), hidden)
 
     def buildListEntry2(self, id, name, hidden):
-        pixmap = LoadPixmap(cached=True, path=os.path.join(common_path, "lock_off.png"))
+        pixmap = LoadPixmap(cached=True, path=os.path.join(common_path, "lock_disabled.png"))
         return (pixmap, str(name), str(id), hidden)
 
     def refresh(self):

BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/downloadpicons.py

@@ -100,7 +100,6 @@ def mychunk_TRNS(self, pos, length):
 
 hdr = {
     'User-Agent': str(cfg.useragent.value),
-    'Connection': 'keep-alive',
     'Accept-Encoding': 'gzip, deflate'
 }
 

BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/globalfunctions.py

@@ -13,7 +13,6 @@
 
 hdr = {
     'User-Agent': str(cfg.useragent.value),
-    'Connection': 'keep-alive',
     'Accept-Encoding': 'gzip, deflate'
 }
 
@@ -155,14 +154,18 @@ def downloadUrlMulti(url, output_file=None):
 
 def safeName(name):
     if pythonVer == 2:
-        name = name.decode("utf-8", "ignore").encode("ascii", "ignore")
+        if isinstance(name, str):
+            name = name.decode("utf-8", "ignore")
     elif pythonVer == 3:
-        name = name.encode("ascii", "ignore").decode("ascii")
+        if not isinstance(name, str):
+            name = str(name)
 
-    name = re.sub(r"[\<\>\:\"\/\\\|\?\*]", "_", str(name))
+    # Replace unsafe characters with underscores
+    name = re.sub(r"[\<\>\:\"\/\\\|\?\*]", "_", name)
     name = re.sub(r" ", "_", name)
     name = re.sub(r"_+", "_", name)
     name = name.strip("_")
+
     return name
 
 

BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/locale/ru/LC_MESSAGES/BouquetMakerXtream.mo

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: 2024-09-15 13:08+0100\n"
-"PO-Revision-Date: 2024-11-25 20:45+0000\n"
+"PO-Revision-Date: 2024-12-14 17:02+0000\n"
 "Last-Translator: airforce <kosmosspace@gmail.com>\n"
 "Language-Team: \n"
 "Language: ru_RU\n"
@@ -36,8 +36,8 @@ msgstr ""
 
 #: about.py:45
 msgid ""
-"Plugin enables the simple bouquet creation of standard Xtream codes/XUI One, external and local "
-"m3u8 playlists. \n"
+"Plugin enables the simple bouquet creation of standard Xtream codes/XUI One, external and local m3u8 "
+"playlists. \n"
 "Play your files via your TV bouquets.\n"
 "\n"
 msgstr ""
@@ -66,10 +66,8 @@ msgstr ""
 
 #: about.py:49
 msgid ""
-"If you would like to buy me a beer or a coffee: https://paypal.me/kiddac or https://ko-fi.com/"
-"kiddac\n"
-msgstr ""
-"Если хочете купить мне пива или кофе: https://paypal.me/kiddac или https://ko-fi.com/kiddac\n"
+"If you would like to buy me a beer or a coffee: https://paypal.me/kiddac or https://ko-fi.com/kiddac\n"
+msgstr "Если хочете купить мне пива или кофе: https://paypal.me/kiddac или https://ko-fi.com/kiddac\n"
 
 #: about.py:50
 msgid "Cheers - all donations are very much appreciated."
@@ -150,8 +148,8 @@ msgstr "Выход:"
 #: bouquetsettings.py:299
 msgid "Max EPG days to download: (Use Default if EPG events is 0)"
 msgstr ""
-"Максимальное количество дней EPG для загрузки: (используйте значение по умолчанию, если событий "
-"EPG равно 0)"
+"Максимальное количество дней EPG для загрузки: (используйте значение по умолчанию, если событий EPG "
+"равно 0)"
 
 #: bouquetsettings.py:301
 msgid "Use alternative EPG url:"
@@ -577,11 +575,11 @@ msgstr "8 бит"
 
 #: plugin.py:133
 msgid "Service Reference Picons"
-msgstr "Сервис референсов пиконом"
+msgstr "Пиконы по референсам"
 
 #: plugin.py:133
 msgid "Service Name Picons"
-msgstr "Сервис имен пиконов"
+msgstr "Пиконы по имени"
 
 #: plugin.py:138
 msgid "100KB"
@@ -645,7 +643,7 @@ msgstr "Сохранить"
 
 #: server.py:58
 msgid "You can manually add playlist urls to /etc/enigma2/bouquetmakerxtream/playlists.txt file"
-msgstr "Вы можете вручную добавить URL-адрес плейлиста в /etc/enigma2/"
+msgstr "Вы можете вручную добавить адрес плейлиста в /etc/enigma2/bouquetmakerxtream/playlists.txt файл"
 
 #: server.py:103
 msgid "Xtream codes / XUI ONE (get.php)"
@@ -775,11 +773,11 @@ msgstr "Выберите сторонний web user-agent"
 
 #: settings.py:153
 msgid "playlists.txt location"
-msgstr "локальный playlist.txt"
+msgstr "Локальный playlist.txt"
 
 #: settings.py:153 settings.py:154 settings.py:159 settings.py:163
 msgid " *Restart GUI Required"
-msgstr " *Требуется перезапуск графического интерфейса"
+msgstr " *Требуется рестарт GUI"
 
 #: settings.py:154
 msgid "Local M3U File location"

BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/locale/ru/LC_MESSAGES/BouquetMakerXtream.po

@@ -39,7 +39,6 @@
 
 hdr = {
     'User-Agent': str(cfg.useragent.value),
-    'Connection': 'keep-alive',
     'Accept-Encoding': 'gzip, deflate'
 }
 

BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/playlists.py

@@ -200,7 +200,6 @@
 
 hdr = {
     'User-Agent': 'Enigma2 - BouquetMakerXtream Plugin',
-    'Connection': 'keep-alive',
     'Accept-Encoding': 'gzip, deflate'
 }
 

BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/plugin.py

@@ -29,7 +29,6 @@
 
 hdr = {
     'User-Agent': str(cfg.useragent.value),
-    'Connection': 'keep-alive',
     'Accept-Encoding': 'gzip, deflate'
 }
 

BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/server.py

@@ -305,14 +305,14 @@ def processDownloads(self, stream_type, outputtype=None):
         else:
             output_file = '/var/volatile/tmp/bouquetmakerxtream/temp'
 
-        for url in self.url_list:
+        self.live_categories = []
+        self.vod_categories = []
+        self.series_categories = []
+        self.live_streams = []
+        self.vod_streams = []
+        self.series_streams = []
 
-            self.live_categories = []
-            self.vod_categories = []
-            self.series_categories = []
-            self.live_streams = []
-            self.vod_streams = []
-            self.series_streams = []
+        for url in self.url_list:
 
             if outputtype == "json":
                 result = bmx.downloadUrlCategory(url)
@@ -363,7 +363,7 @@ def loadLive(self):
 
         live_categories = glob.current_playlist["data"]["live_categories"]
 
-        if not live_categories or (len(live_categories) == len(glob.current_playlist["data"]["live_categories_hidden"])):
+        if not live_categories:
 
             if glob.current_playlist["playlist_info"]["playlist_type"] == "xtream":
 
@@ -562,7 +562,7 @@ def loadVod(self):
 
         vod_categories = glob.current_playlist["data"]["vod_categories"]
 
-        if not vod_categories or (len(vod_categories) == len(glob.current_playlist["data"]["vod_categories_hidden"])):
+        if not vod_categories:
             if glob.current_playlist["playlist_info"]["playlist_type"] == "xtream":
                 if glob.current_playlist["settings"]["show_series"]:
                     self.nextJob(_("Downloading series data..."), self.downloadSeries)
@@ -724,7 +724,7 @@ def loadSeries(self):
 
         series_categories = glob.current_playlist["data"]["series_categories"]
 
-        if not series_categories or (len(series_categories) == len(glob.current_playlist["data"]["series_categories_hidden"])):
+        if not series_categories:
             self.finished()
             return
 

BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/skin/fhd/common/lock_disabled.png

@@ -1 +1 @@
-1.36-20241208
+1.39-20241214

BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/skin/hd/common/lock_disabled.png

@@ -1,5 +1,5 @@
 Package: enigma2-plugin-extensions-bouquetmakerxtream
-Version: 1.36-20241208
+Version: 1.39-20241214
 Section: misc
 Priority: optional
 Architecture: all