Changeset 88bbc1410b52d4b669c54abc42f68c5677c3b951

Timestamp:

03/15/08 00:46:38 (10 months ago)

Author:

KRKeegan <-NOSPAM-kevin@krkeegan.com>

git-committer:

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

git-parent:

[4d2469c7e4af30574a75287c0c43f50b184c1d98]

git-author:

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

Message:

Add form to change MAK and save path

Files:

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

plugins/admin/admin.py

@@ -30 +30 @@
-        config.reset()
-        handler.server.reset()
+        if 'last_page' in query:
+            last_page = query['last_page'][0]
+        else:
+            last_page = 'Admin'
-        
-        subcname = query['Container'][0]
@@ -38 +42 @@
-        t.container = cname
-        t.time = '3'
-Admin
+'+ last_page +'
-        t.text = '<h3>The pyTivo Server has been soft reset.</h3>  <br>pyTivo has reloaded the pyTivo.conf'+\
-                 'file and all changed should now be in effect. <br> The'+ \
-Admin&Container='+ cname +'"> Admin
+'+ last_page +'&Container='+ cname +'"> previous
-        handler.wfile.write(t)
-    
@@ -147 +151 @@
-                else:
-                    tivo_mak = ""
+                if 'togo_path' in data:
+                    togo_path = data['togo_path']
+                else:
+                    togo_path = ""
-
-        if 'TiVo' in query:
@@ -225 +233 @@
-            tivoIP = ''
-
-        print len(data)
-        subcname = query['Container'][0]
-        cname = subcname.split('/')[0]
@@ -233 +240 @@
-        t.folder = folder
-        t.status = status
-
+
+
-        t.tivos = handler.tivos
-        t.tivoIP = tivoIP
@@ -349 +357 @@
-                 '<br> The <a href="/TiVoConnect?Command=NPL&Container='+ cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + query['Folder'][0] +'"> ToGo</a> page will reload in 3 seconds.'
-        handler.wfile.write(t)
+
+
+    def SaveNPL(self, handler, query):
+        config = ConfigParser.ConfigParser()
+        config.read(config_file_path)
+        if 'tivo_mak' in query:
+            config.set(query['Container'][0], 'tivo_mak', query['tivo_mak'][0])
+        if 'togo_path' in query:
+            config.set(query['Container'][0], 'togo_path', query['togo_path'][0])                 
+        f = open(config_file_path, "w")
+        config.write(f)
+        f.close()
+
+        subcname = query['Container'][0]
+        cname = subcname.split('/')[0]
+        handler.send_response(200)
+        handler.end_headers()
+        t = Template(file=os.path.join(SCRIPTDIR,'templates', 'redirect.tmpl'))
+        t.container = cname
+        t.time = '2'
+        t.url = '/TiVoConnect?last_page=NPL&Command=Reset&Container=' + cname
+        t.text = '<h3>Your Settings have been saved.</h3>  <br>You settings have been saved to the pyTivo.conf file.'+\
+                 'pyTivo will now do a <b>Soft Reset</b> to allow these changes to take effect.'+\
+                 '<br> The <a href="/TiVoConnect?last_page=NPL&Command=Reset&Container='+ cname +'"> Reset</a> will occur in 2 seconds.'
+        handler.wfile.write(t)

plugins/admin/templates/npl.tmpl

@@ -110 +110 @@
-          #else
-                  <!-- No TiVo IP Provided so display instructions -->
+                  <form method="get" action="/TiVoConnect">
+                  <input type="hidden" name="Command" value="SaveNPL">
+                  <input type="hidden" name="Container" value="$container">
+                  <table align='right' style="border: 1px solid rgb(220, 220, 220);">
+                  <tr><td colspan=2 align='center'><b>ToGo Settings</b></td></tr>
+                  <tr><td>MAK:</td><td><input type='text' name="tivo_mak" value="$tivo_mak"></td></tr>
+                  <tr><td>Save Path:</td><td><input type='text' name="togo_path" value="$togo_path"></td></tr>
+                  <tr><td colspan=2 align="center"><input type="submit" value="Save Settings"></td></tr>
+                  </table></form>
+                  
-                  <h2>Instructions</h2>
-