catchup api alternative url, hungrary tranlsation update, removed bra…

…ckets from filenames
kiddac · Jan 10, 2025 · 7a774a4 · 7a774a4
1 parent cfa9342
commit 7a774a4
Show file tree

Hide file tree

Showing 9 changed files with 848 additions and 8 deletions.
diff --git a/BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/catchup.py b/BouquetMakerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/catchup.py
@@ -357,7 +357,15 @@ def displayShortEpg(self):
 
     def play(self):
         if self["epg_short_list"].getCurrent():
-            playurl = "%s/streaming/timeshift.php?username=%s&password=%s&stream=%s&start=%s&duration=%s" % (self.domain, self.username, self.password, self.epg_short_list[self.current_selection][7], self.epg_short_list[self.current_selection][4], self.epg_short_list[self.current_selection][5])
+            playurl = "{}/timeshift/{}/{}/{}/{}/{}.ts".format(
+                self.domain,
+                self.username,
+                self.password,
+                self.epg_short_list[self.current_selection][5],
+                self.epg_short_list[self.current_selection][4],
+                self.epg_short_list[self.current_selection][7]
+            )
+
             stream_type = 4097
             sref = eServiceReference(stream_type, 0, playurl)
             sref.setName(self.epg_short_list[self.current_selection][2])

diff --git a/...kerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/globalfunctions.py b/...kerXtream/usr/lib/enigma2/python/Plugins/Extensions/BouquetMakerXtream/globalfunctions.py
@@ -177,7 +177,7 @@ def safeName(name):
             name = str(name)
 
     # Replace unsafe characters with underscores
-    name = re.sub(r"[\<\>\:\"\/\\\|\?\*]", "_", name)
+    name = re.sub(r'[\'\<\>\:\"\/\\\|\?\*\(\)\[\]]', "_", name)
     name = re.sub(r" ", "_", name)
     name = re.sub(r"_+", "_", name)
     name = name.strip("_")

diff --git a/.../python/Plugins/Extensions/BouquetMakerXtream/locale/hu/LC_MESSAGES/BouquetMakerXtream.mo b/.../python/Plugins/Extensions/BouquetMakerXtream/locale/hu/LC_MESSAGES/BouquetMakerXtream.mo