Обработка Unicode-листов, убрана отладочная печать.
[vpproxy.git] / plugins / m3u_plugin.py
index 20702062da0c64349b3ca216e968fb7bd6d48d10..00a6193f674184bdcb777c7b28ef04f6a176d846 100644 (file)
@@ -52,7 +52,7 @@ class M3u(VPProxyPlugin):
         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"):
@@ -104,7 +104,6 @@ class M3u(VPProxyPlugin):
         elif self.splitted_path[1]=="play":
             channel=self.splitted_path[len(self.splitted_path)-1]
             channel=urllib.unquote(channel).decode('utf-8')
-            print channel
             if len(self.splitted_path)<=4:
               prefix="get"
             elif len(self.splitted_path)==5:  
@@ -117,10 +116,8 @@ class M3u(VPProxyPlugin):
             for record in playlist:
                 if record.title.decode('utf-8').replace('/','')==channel:
                     url=record.path.decode('utf-8')
-                    print url
             if url:
                 redirect='/'+prefix+'/'+url
-                print redirect
                 connection.send_response(302)
                 connection.send_header('Location', redirect)
                 connection.end_headers()
@@ -147,7 +144,8 @@ class M3u(VPProxyPlugin):
              exported = ""
             
              for record in playlist:
-                 exported = exported + "" + record.title.decode('utf-8').replace('/','') + "\n"
+                 if record.title:
+                     exported = exported + "" + record.title.decode('utf-8').replace('/','') + "\n"
         
         else:    
 
@@ -160,8 +158,9 @@ class M3u(VPProxyPlugin):
                 playlistgen.addItem(channel)
 
             exported = playlistgen.exportm3u(hostport,prefix)
-            
+
         exported = exported.encode('utf-8')
+        
         connection.wfile.write(exported)
 
     def getparam(self, key):