fixed crash on building series

kiddac · Feb 2, 2025 · 177d3dd · 177d3dd
1 parent df5f732
commit 177d3dd
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 8 deletions.
diff --git a/...MakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/buildbouquets.py b/...MakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/buildbouquets.py
@@ -323,6 +323,9 @@ def processDownloads(self, stream_type, outputtype=None):
     def loadLive(self):
         if debugs:
             print("*** loadLive ***")
+
+        self.clearCaches()
+
         self.live_stream_data = []
         settings = glob.current_playlist["settings"]
         playlist_info = glob.current_playlist["playlist_info"]
@@ -382,7 +385,7 @@ def loadLive(self):
 
                 try:
                     bouquet_id1 = int(stream_id) // 65535
-                    bouquet_id2 = int(stream_id) % 65535
+                    bouquet_id2 = int(stream_id) - int(bouquet_id1 * 65535)
                 except:
                     continue
 
@@ -523,6 +526,9 @@ def loadLive(self):
     def loadVod(self):
         if debugs:
             print("*** loadVod ***")
+
+        self.clearCaches()
+
         self.vod_stream_data = []
 
         settings = glob.current_playlist["settings"]
@@ -573,7 +579,7 @@ def loadVod(self):
 
                 try:
                     bouquet_id1 = int(stream_id) // 65535
-                    bouquet_id2 = int(stream_id) % 65535
+                    bouquet_id2 = int(stream_id) - int(bouquet_id1 * 65535)
                 except:
                     continue
 
@@ -690,6 +696,8 @@ def loadSeries(self):
         if debugs:
             print("*** loadSeries ***")
 
+        self.clearCaches()
+
         self.series_stream_data = []
 
         settings = glob.current_playlist["settings"]
@@ -744,7 +752,7 @@ def loadSeries(self):
 
                 try:
                     bouquet_id1 = int(stream_id) // 65535
-                    bouquet_id2 = int(stream_id) % 65535
+                    bouquet_id2 = int(stream_id) - int(bouquet_id1 * 65535)
                 except:
                     continue
 

diff --git a/...kerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/globalfunctions.py b/...kerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/globalfunctions.py
@@ -162,18 +162,24 @@ def downloadUrlMulti(url, output_file=None):
 
                 else:
                     # Collect chunks into memory and return as content
+                    content = ''
+                    """
                     if pythonVer == 2:
                         content = ''
                     else:
                         content = b""
+                        """
 
                     for chunk in r.iter_content(chunk_size=chunk_size):
                         if chunk:  # Only append non-empty chunks
                             if ext == "text":
+                                content += chunk.decode('utf-8', errors='ignore')
+                                """
                                 if pythonVer == 2:
                                     content += chunk.decode('utf-8', errors='ignore')
                                 else:
                                     content += chunk.decode('utf-8', errors='ignore').encode('utf-8')
+                                    """
                             else:
                                 content += chunk
 

diff --git a/...akerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/seriesparsem3u.py b/...akerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/seriesparsem3u.py
@@ -14,6 +14,9 @@ def parseM3u8Playlist(response):
     streamid = 0
     url_pattern = re.compile(r'(https?://[^\s]+)')
 
+    if isinstance(response, bytes):  # Ensure it's a string
+        response = response.decode('utf-8', 'ignore')
+
     response_lines = response.splitlines()
     length = len(response_lines)
 

diff --git a/BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/update.py b/BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/update.py
@@ -361,6 +361,9 @@ def processDownloads(self, stream_type, outputtype=None):
                 os.remove(output_file)
 
     def loadLive(self):
+
+        self.clearCaches()
+
         self.live_stream_data = []
 
         settings = glob.current_playlist["settings"]
@@ -425,7 +428,7 @@ def loadLive(self):
 
                 try:
                     bouquet_id1 = int(stream_id) // 65535
-                    bouquet_id2 = int(stream_id) % 65535
+                    bouquet_id2 = int(stream_id) - int(bouquet_id1 * 65535)
                 except:
                     continue
 
@@ -564,6 +567,9 @@ def loadLive(self):
                 self.finished()
 
     def loadVod(self):
+
+        self.clearCaches()
+
         self.vod_stream_data = []
 
         settings = glob.current_playlist["settings"]
@@ -616,7 +622,7 @@ def loadVod(self):
 
                 try:
                     bouquet_id1 = int(stream_id) // 65535
-                    bouquet_id2 = int(stream_id) % 65535
+                    bouquet_id2 = int(stream_id) - int(bouquet_id1 * 65535)
                 except:
                     continue
 
@@ -731,6 +737,9 @@ def loadVod(self):
                 self.finished()
 
     def loadSeries(self):
+
+        self.clearCaches()
+
         self.series_stream_data = []
 
         settings = glob.current_playlist["settings"]
@@ -790,7 +799,7 @@ def loadSeries(self):
 
                 try:
                     bouquet_id1 = int(stream_id) // 65535
-                    bouquet_id2 = int(stream_id) % 65535
+                    bouquet_id2 = int(stream_id) - int(bouquet_id1 * 65535)
                 except:
                     continue
 

diff --git a/BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/version.txt b/BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/version.txt
@@ -1 +1 @@
-1.44-20250125
+1.46-20250201
diff --git a/CONTROL/control b/CONTROL/control
@@ -1,5 +1,5 @@
 Package: enigma2-plugin-extensions-bouquetmakerxtream
-Version: 1.44-20250125
+Version: 1.46-20250201
 Section: misc
 Priority: optional
 Architecture: all