Исправлена работа с протоколом

[vpproxy.git] / plugins / m3u_plugin.py

diff --git a/plugins/m3u_plugin.py b/plugins/m3u_plugin.py
index fc4d3e3268e75e36d3a7cdb583f8992609a6a68e..90f529f55a85965c4004b74c19920a1cbe2f73a2 100644 (file)
--- a/plugins/m3u_plugin.py
+++ b/plugins/m3u_plugin.py
@@ -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')
         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:  
             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')
             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
             if url:
                 redirect='/'+prefix+'/'+url

-                print redirect

                 connection.send_response(302)
                 connection.send_header('Location', redirect)
                 connection.end_headers()
                 connection.send_response(302)
                 connection.send_header('Location', redirect)
                 connection.end_headers()


@@ -147,21 +144,24 @@ class M3u(VPProxyPlugin):
              exported = ""
             
              for record in playlist:
              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:    
 
             playlistgen = PlaylistGenerator()
 
             for record in playlist:
         
         else:    
 
             playlistgen = PlaylistGenerator()
 
             for record in playlist:

-                channel=dict()
-                channel['name']=record.title.decode('utf-8')
-                channel['url']=record.path.decode('utf-8')            
-                playlistgen.addItem(channel)
+                if record.title:
+                    channel=dict()
+                    channel['name']=record.title.decode('utf-8')
+                    channel['url']=record.path.decode('utf-8')            
+                    playlistgen.addItem(channel)

 
             exported = playlistgen.exportm3u(hostport,prefix)
 
             exported = playlistgen.exportm3u(hostport,prefix)

-            
+

         exported = exported.encode('utf-8')
         exported = exported.encode('utf-8')

+        

         connection.wfile.write(exported)
 
     def getparam(self, key):
         connection.wfile.write(exported)
 
     def getparam(self, key):