Переход с webm на ogg по причинам несовместимости с новыми версиями ffmpeg.

[vpproxy.git] / plugins / m3u_plugin.py

diff --git a/plugins/m3u_plugin.py b/plugins/m3u_plugin.py
index 539616b84d0514c0419c739d6030157a9ee09a91..fc4d3e3268e75e36d3a7cdb583f8992609a6a68e 100644 (file)
--- a/plugins/m3u_plugin.py
+++ b/plugins/m3u_plugin.py
@@ -52,7 +52,7 @@ class M3u(VPProxyPlugin):
         if self.splitted_path[1]=='m3u':
           prefix='get'
         elif self.splitted_path[1]=='m3uw':
         if self.splitted_path[1]=='m3u':
           prefix='get'
         elif self.splitted_path[1]=='m3uw':

-          prefix='webm'  
+          prefix='ogg'  

         elif self.splitted_path[1]=='m3ut':
           prefix='mp4'  
         elif self.splitted_path[1] in ("list","play","index"):
         elif self.splitted_path[1]=='m3ut':
           prefix='mp4'  
         elif self.splitted_path[1] in ("list","play","index"):


@@ -115,7 +115,7 @@ class M3u(VPProxyPlugin):
               connection.dieWithError()  
             url=None
             for record in playlist:
               connection.dieWithError()  
             url=None
             for record in playlist:

-                if record.title.decode('utf-8')==channel:
+                if record.title.decode('utf-8').replace('/','')==channel:

                     url=record.path.decode('utf-8')
                     print url
             if url:
                     url=record.path.decode('utf-8')
                     print url
             if url:


@@ -147,7 +147,7 @@ class M3u(VPProxyPlugin):
              exported = ""
             
              for record in playlist:
              exported = ""
             
              for record in playlist:

-                 exported = exported + "" + record.title.decode('utf-8') + "\n"
+                 exported = exported + "" + record.title.decode('utf-8').replace('/','') + "\n"

         
         else:    
 
         
         else: