Changeset e5ddd2a85f88af48a06090ca7c7b9a664dfc4642

Timestamp:

03/11/08 22:31:48 (9 months ago)

Author:

KRKeegan <-NOSPAM-kevin@krkeegan.com>

git-committer:

KRKeegan <-NOSPAM-kevin@krkeegan.com> 1205292708 -0700

git-parent:

[5d5b39ad7a7b0586f6da77ad6db7351b81f185a2]

git-author:

KRKeegan <-NOSPAM-kevin@krkeegan.com> 1205292708 -0700

Message:

Return to folder after start, stop transfer

Files:

• plugins/admin/admin.py (modified) (6 diffs)
• plugins/admin/templates/npl.tmpl (modified) (3 diffs)

plugins/admin/admin.py

@@ -140 +140 @@
-        subcname = query['Container'][0]
-        cname = subcname.split('/')[0]
+        folder = ''
-        for name, data in config.getShares():
-            if cname == name:
@@ -146 +147 @@
-                else:
-                    tivo_mak = ""
-
-
-
+
-        if 'TiVo' in query:
-            tivoIP = query['TiVo'][0]
-
+
+
+
+
-
-            password = tivo_mak #TiVo MAK
@@ -229 +231 @@
-        handler.end_headers()
-        t = Template(file=os.path.join(SCRIPTDIR,'templates', 'npl.tmpl'))
-
-
-
+
-        t.status = status
-        print handler.tivos
@@ -317 +317 @@
-            t.container = cname
-            t.time = '3'
-
+ + '&Folder=' + query['Folder'][0]
-            t.text = '<h3>Transfer Initiated.</h3>  <br>You selected transfer has been initiated.'+\
-
+ '&Folder=' + query['Folder'][0] +
-            handler.wfile.write(t)
-        else:
@@ -327 +327 @@
-            t.container = cname
-            t.time = '10'
-
+ + '&Folder=' + query['Folder'][0]
-            t.text = '<h3>Missing Data.</h3>  <br>You must set both "tivo_mak" and "togo_path" before using this function.'+\
-
+ '&Folder=' + query['Folder'][0] +
-            handler.wfile.write(t)
-
@@ -345 +345 @@
-        t.container = cname
-        t.time = '3'
-
+ + '&Folder=' + query['Folder'][0]
-        t.text = '<h3>Transfer Stopped.</h3>  <br>Your transfer has been stopped.'+\
-
-
+ '&Folder=' + query['Folder'][0] +
+

plugins/admin/templates/npl.tmpl

@@ -28 +28 @@
-      <div style="visibility: visible; width: 920px; overflow: scroll; height: 410px; position: relative;">
-      <table>
-subfolder == True
+folder != ''
-        <tr><td colspan=5><a href="/TiVoConnect?Command=NPL&Container=$container&TiVo=$tivoIP">Back to Now Playing List</a></td></tr>
-      #end if
@@ -74 +74 @@
-                                        #if $this_status['running'] and $this_status['rate'] != ""
-                                                Transfering - $this_status['rate'] KB/s<br>
-
+&Folder=$folder
-                                        #elif $this_status['running'] and $this_status['rate'] == ""
-                                                Initiating Transfer.<br>
@@ -80 +80 @@
-                                        #elif $this_status['error']
-                                                Error - $this_status['error']<br>
-
+&Folder=$folder
-                                        #elif $this_status['finished']
-                                                Transfer Complete!
-                                        #else
-                                                Transfer Stopped<br>
-
+&Folder=$folder
-                                        #endif
-                                #else
-
+&Folder=$folder
-                                #end if
-                                </td>