Browse Source

[bugfix] filmix get_streams 1080p strādā tikai pro+

Ivars 7 years ago
parent
commit
a935e2b8b4
3 changed files with 5 additions and 2 deletions
  1. 2
    0
      imake.bat
  2. BIN
      release/enigma2-plugin-extensions-playstream_0.6k.ipk
  3. 3
    2
      sources/filmix.py

+ 2
- 0
imake.bat View File

3
 
3
 
4
 if ()==(%1%) (
4
 if ()==(%1%) (
5
     python get_version.py PlayStream.py >version.txt
5
     python get_version.py PlayStream.py >version.txt
6
+    cat version.txt
7
+    pause
6
     set /p ver=<version.txt
8
     set /p ver=<version.txt
7
     echo Version: %ver%
9
     echo Version: %ver%
8
 ) else (
10
 ) else (

BIN
release/enigma2-plugin-extensions-playstream_0.6k.ipk View File


+ 3
- 2
sources/filmix.py View File

314
         return result
314
         return result
315
 
315
 
316
     def get_streams2(self,url0):
316
     def get_streams2(self,url0):
317
-        m = re.search("\[([\d,]+)]",url0)
317
+        m = re.search("\[([\d\w,]+)\]",url0)
318
         if not m:
318
         if not m:
319
             return [("?",url0)]
319
             return [("?",url0)]
320
         res = m.group(1)
320
         res = m.group(1)
321
         streams=[]
321
         streams=[]
322
         for res in res.split(","):
322
         for res in res.split(","):
323
             if not res: continue
323
             if not res: continue
324
-            url=re.sub("\[[\d,]+]",res,url0)
324
+            if res in ["1080p"]: continue #TODO fullhd only in PRO+ version
325
+            url=re.sub("\[[\d\w,]+\]",res,url0)
325
             streams.append((res,url))
326
             streams.append((res,url))
326
         return streams
327
         return streams
327
 
328