Changeset 3f4d97154588100797d4a362fb5eeb86ef9206fd

Timestamp:

03/26/08 20:00:48 (8 months ago)

Author:

Jason Michalski <armooo@armooo-desktop.(none)>

git-committer:

Jason Michalski <armooo@armooo-desktop.(none)> 1206579648 -0500

git-parent:

[efc6d758b8235f783ad065be17fe17e6d51f32c6], [e5d0a3e3671bf2c9a4df8961caffe9c6f25d4782]

git-author:

Jason Michalski <armooo@armooo-desktop.(none)> 1206579648 -0500

Message:

Merge commit 'krkeegan/master'

Conflicts:

plugins/admin/admin.py

Files:

• plugins/admin/admin.py (modified) (10 diffs)
• plugins/admin/templates/admin.tmpl (deleted)
• plugins/admin/templates/npl.tmpl (modified) (4 diffs)

plugins/admin/admin.py

@@ -144 +144 @@
-        
-    def NPL(self, handler, query):
+        shows_per_page = 50 #Change this to alter the number of shows returned per page
-        subcname = query['Container'][0]
-        cname = subcname.split('/')[0]
-        folder = ''
+        AnchorItem = ''
+        AnchorOffset= ''
-        for name, data in config.getShares():
-            if cname == name:
@@ -160 +163 @@
-        if 'TiVo' in query:
-            tivoIP = query['TiVo'][0]
-
+ItemCount='+ str(shows_per_page) +'&
-            if 'Folder' in query:
-                folder += str(query['Folder'][0])
-                theurl += '/' + folder
+            if 'AnchorItem' in query:
+                AnchorItem += str(query['AnchorItem'][0])
+                theurl += '&AnchorItem=' + quote(AnchorItem)
+            if 'AnchorOffset' in query:
+                AnchorOffset += str(query['AnchorOffset'][0])
+                theurl += '&AnchorOffset=' + AnchorOffset
-
-            password = tivo_mak #TiVo MAK
@@ -212 +221 @@
-            xmldoc = minidom.parseString(tivo_cache[theurl]['thepage'])
-            items = xmldoc.getElementsByTagName('Item')
+            TotalItems = xmldoc.getElementsByTagName('Details')[0].getElementsByTagName('TotalItems')[0].firstChild.data
+            ItemStart = xmldoc.getElementsByTagName('ItemStart')[0].firstChild.data
+            ItemCount = xmldoc.getElementsByTagName('ItemCount')[0].firstChild.data
+            FirstAnchor = items[0].getElementsByTagName("Links")[0].getElementsByTagName("Content")[0].getElementsByTagName("Url")[0].firstChild.data
-
-            data = []
@@ -248 +261 @@
-            data = []
-            tivoIP = ''
+            TotalItems = 0
+            ItemStart = 0
+            ItemCount = 0
+            FirstAnchor = ''
-
-        subcname = query['Container'][0]
@@ -264 +281 @@
-        t.unquote = unquote
-        t.len = len
+        t.TotalItems = int(TotalItems)
+        t.ItemStart = int(ItemStart)
+        t.ItemCount = int(ItemCount)
+        t.FirstAnchor = quote(FirstAnchor)
+        t.shows_per_page = shows_per_page
+        t.redirect = quote(unquote_plus(handler.path).split('/')[1])
-        o = ''.join([i for i in unicode(t) if i not in (u'\u200b')])
-        handler.wfile.write(o.encode('latin-1'))
@@ -324 +347 @@
-                else:
-                    togo_path = ""
-        folder = ''
-        if 'Folder' in query:
-            folder += str(query['Folder'][0])
-        if tivo_mak != "" and togo_path != "":
-            parse_url = urlparse(str(query['Url'][0]))
@@ -345 +365 @@
-            t.container = cname
-            t.time = '3'
-TiVoConnect?Command=NPL&Container=' + cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + folder
+'+ query['Redirect'][0]
-            t.text = '<h3>Transfer Initiated.</h3>  <br>You selected transfer has been initiated.'+\
-TiVoConnect?Command=NPL&Container='+ cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + folder
+'+ query['Redirect'][0]
-            handler.wfile.write(t)
-        else:
@@ -355 +375 @@
-            t.container = cname
-            t.time = '10'
-TiVoConnect?Command=NPL&Container=' + cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + folder
+'+ query['Redirect'][0]
-            t.text = '<h3>Missing Data.</h3>  <br>You must set both "tivo_mak" and "togo_path" before using this function.'+\
-TiVoConnect?Command=NPL&Container='+ cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + folder
+'+ query['Redirect'][0]
-            handler.wfile.write(t)
-
@@ -363 +383 @@
-        parse_url = urlparse(str(query['Url'][0]))
-        theurl = 'http://' + parse_url[1].split(':')[0] + parse_url[2] + "?" + parse_url[4]
-        folder = ''
-        if 'Folder' in query:
-            folder += str(query['Folder'][0])
-        
-        status[theurl]['running'] = False
@@ -376 +393 @@
-        t.container = cname
-        t.time = '3'
-TiVoConnect?Command=NPL&Container=' + cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + folder
+'+ query['Redirect'][0]
-        t.text = '<h3>Transfer Stopped.</h3>  <br>Your transfer has been stopped.'+\
-TiVoConnect?Command=NPL&Container='+ cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + folder
+'+ query['Redirect'][0]
-        handler.wfile.write(t)
-

plugins/admin/templates/npl.tmpl

@@ -31 +31 @@
-      #if $tivoIP != ''
-          <!-- If TiVoIP is present then we should display a NPL -->
+                  #if $ItemStart > 0
+                        #set $Offset = -($ItemStart + 1)
+                        #if $Offset < -($shows_per_page+1)
+                           #set $Offset = -($shows_per_page+1)
+                        #end if
+                        <a href="/TiVoConnect?Command=NPL&Container=$container&TiVo=$tivoIP&AnchorItem=$FirstAnchor&AnchorOffset=$Offset&Folder=$folder">Previous Page</a>
+                  #end if
-                  <table>
-                  #if $folder != ''
@@ -85 +92 @@
-                                                #if $this_status['running'] and $this_status['rate'] != ""
-                                                        Transfering - $this_status['rate'] KB/s<br>
-Folder=$folder
+Redirect=$redirect
-                                                #elif $this_status['running'] and $this_status['rate'] == ""
-                                                        Initiating Transfer.<br>
@@ -91 +98 @@
-                                                #elif $this_status['error']
-                                                        Error - $this_status['error']<br>
-Folder=$folder
+Redirect=$redirect
-                                                #elif $this_status['finished']
-                                                        Transfer Complete!
-                                                #else
-                                                        Transfer Stopped<br>
-Folder=$folder
+Redirect=$redirect
-                                                #end if
-                                        #else
-Folder=$folder
+Redirect=$redirect
-                                        #end if
-                                        </td>
@@ -110 +117 @@
-                  #end for
-                  </table>
+                  #if ($TotalItems - $ItemCount) > ($ItemStart + 1)
+                     #set $Offset = $shows_per_page - 1
+                     <a href="/TiVoConnect?Command=NPL&Container=$container&TiVo=$tivoIP&AnchorItem=$FirstAnchor&AnchorOffset=$Offset&Folder=$folder">Next Page</a>
+                  #end if
-          #else
-                  <!-- No TiVo IP Provided so display instructions -->