Ivars 7 years ago
parent
commit
5a2c9ac25a
5 changed files with 435 additions and 337 deletions
  1. 6
    1
      PlayStream.py
  2. 418
    334
      PlayStream.wpr
  3. 5
    0
      changelog.md
  4. 1
    1
      imake.bat
  5. 5
    1
      sources/iplayer.py

+ 6
- 1
PlayStream.py View File

@@ -66,8 +66,13 @@ def make_service(stream):
66 66
     if "|" in url:
67 67
         url = url.replace("|","#")
68 68
     #url = url.replace(":","%3a")
69
+    if re.search("\.ts$",url.split("?")[0],re.IGNORECASE):
70
+        service_type = 1
71
+    else:
72
+        service_type = 4097
73
+    print "service_type=",service_type
69 74
     print "stream_url=",url
70
-    service = eServiceReference(4097, 0, url)
75
+    service = eServiceReference(service_type, 0, url)
71 76
     service.setName( stream["name"])
72 77
     return service
73 78
 

+ 418
- 334
PlayStream.wpr
File diff suppressed because it is too large
View File


+ 5
- 0
changelog.md View File

@@ -1,3 +1,8 @@
1
+**0.5n** (15.01.2016):
2
+- salabots filmix (tagad filmix.me)
3
+- .ts strīmus spēlē ar service_type = 1 (nevis 4097)
4
+- BBC iPlayer cfg faila izveide
5
+
1 6
 **0.5l** (02.01.2016):
2 7
 - streamproxy pārsaukts par playstreamproxy lai nekonfliktē ar enigma2-streamproxy pluginu
3 8
 - samainītas vietām Exit un Back pogas

+ 1
- 1
imake.bat View File

@@ -2,7 +2,7 @@
2 2
 :=== Parameters ===
3 3
 
4 4
 if ()==(%1%) (
5
-    set ver=0.5m
5
+    set ver=0.5n
6 6
 	rem echo Please provide version
7 7
 	rem pause
8 8
 	rem GOTO:EOF

+ 5
- 1
sources/iplayer.py View File

@@ -56,7 +56,11 @@ Connection: Keep-Alive
56 56
             "bbc_alba":"http://www.lyngsat-logo.com/hires/bb/bbc_alba.png",
57 57
             "s4cpbs":"http://www.lyngsat-logo.com/hires/ss/s4c_uk.png"          
58 58
         }
59
-                       
59
+        cur_directory = os.path.dirname(os.path.abspath(__file__))
60
+        self.config_file = os.path.join(cur_directory,self.name+".cfg")
61
+        self.options = OrderedDict([("user","lietotajs"),("password","parole")])
62
+        self.options_read()
63
+                     
60 64
     def get_content(self, data):
61 65
         print "[iplayer] get_content:", data
62 66
         if "::" in data: