Changeset 2045

Timestamp:

10/23/07 22:16:37 (15 months ago)

Author:

markybob

Message:

sync with webui rev87

Files:

• tags/deluge-0.5.5.95/plugins/WebUi/deluge_webserver.py (modified) (1 diff)
• tags/deluge-0.5.5.95/plugins/WebUi/webserver_common.py (modified) (1 diff)
• tags/deluge-0.5.5.95/plugins/WebUi/webserver_framework.py (modified) (4 diffs)
• trunk/plugins/WebUi/deluge_webserver.py (modified) (1 diff)
• trunk/plugins/WebUi/revno (modified) (1 diff)
• trunk/plugins/WebUi/version (modified) (1 diff)
• trunk/plugins/WebUi/webserver_common.py (modified) (1 diff)
• trunk/plugins/WebUi/webserver_framework.py (modified) (4 diffs)

tags/deluge-0.5.5.95/plugins/WebUi/deluge_webserver.py

@@ -40 +40 @@
 import webpy022 as web
 from webpy022.http import seeother, url
-from webpy022.webapi import setcookie
 from webpy022.utils import Storage
 

tags/deluge-0.5.5.95/plugins/WebUi/webserver_common.py

@@ -63 +63 @@
 
 
-REVNO = open(os.path.join(os.path.dirname(__file__),'revno')).read()
+REVNO = '0.56.stable.' + open(os.path.join(os.path.dirname(__file__),'revno')).read()
 VERSION = open(os.path.join(os.path.dirname(__file__),'version')).read()
 

tags/deluge-0.5.5.95/plugins/WebUi/webserver_framework.py

@@ -43 +43 @@
 import webpy022 as web
 
-from webpy022.webapi import cookies, setcookie
+from webpy022.webapi import cookies, setcookie as w_setcookie
 from webpy022.http import seeother, url
 from webpy022 import template,changequery as self_url
@@ -55 +55 @@
 import webserver_common as ws
 
+from debugerror import deluge_debugerror
+
 #init:
-web.webapi.internalerror = web.debugerror
-
-
+web.webapi.internalerror = deluge_debugerror
 #/init
 
 #methods:
+def setcookie(key, val):
+    """add 30 days expires header for persistent cookies"""
+    return w_setcookie(key, val , expires=2592000)
+
 SESSIONS = [] #dumb sessions.
 def start_session():
@@ -89 +93 @@
 
 def getcookie(key, default=None):
+    COOKIE_DEFAULTS = {'auto_refresh_secs':'10'}
+    key = str(key).strip()
     ck = cookies()
-    return str(ck.get(key, default))
+    val = ck.get(key, default)
+    if (not val) and key in COOKIE_DEFAULTS:
+        return COOKIE_DEFAULTS[key]
+    return val
 
 #deco's:
@@ -328 +337 @@
     'auto_refreshed', 'check_session',
     'do_redirect', 'error_page','start_session','getcookie'
-    ,'create_webserver']
-
-
-
+    ,'create_webserver','setcookie']
+
+
+

trunk/plugins/WebUi/deluge_webserver.py

@@ -40 +40 @@
 import webpy022 as web
 from webpy022.http import seeother, url
-from webpy022.webapi import setcookie
 from webpy022.utils import Storage
 

trunk/plugins/WebUi/revno

@@ -1 @@
-57
+87

trunk/plugins/WebUi/version

@@ -1 +1 @@
 revision-id: mvoncken@gmail.com-20070930083408-sv8mo0mi1rbjnfvk
-date: 2007-09-30 10:34:08 +0200
-build-date: 2007-09-30 10:34:50 +0200
-revno: 57
+date: 2007-10-23 15:10:08 +0200
+build-date: 2007-10-23 15:34:50 +0200
+revno:  87
 branch-nick: WebUi

trunk/plugins/WebUi/webserver_common.py

@@ -63 +63 @@
 
 
-REVNO = open(os.path.join(os.path.dirname(__file__),'revno')).read()
+REVNO = '0.56.stable.' + open(os.path.join(os.path.dirname(__file__),'revno')).read()
 VERSION = open(os.path.join(os.path.dirname(__file__),'version')).read()
 

trunk/plugins/WebUi/webserver_framework.py

@@ -43 +43 @@
 import webpy022 as web
 
-from webpy022.webapi import cookies, setcookie
+from webpy022.webapi import cookies, setcookie as w_setcookie
 from webpy022.http import seeother, url
 from webpy022 import template,changequery as self_url
@@ -55 +55 @@
 import webserver_common as ws
 
+from debugerror import deluge_debugerror
+
 #init:
-web.webapi.internalerror = web.debugerror
-
-
+web.webapi.internalerror = deluge_debugerror
 #/init
 
 #methods:
+def setcookie(key, val):
+    """add 30 days expires header for persistent cookies"""
+    return w_setcookie(key, val , expires=2592000)
+
 SESSIONS = [] #dumb sessions.
 def start_session():
@@ -89 +93 @@
 
 def getcookie(key, default=None):
+    COOKIE_DEFAULTS = {'auto_refresh_secs':'10'}
+    key = str(key).strip()
     ck = cookies()
-    return str(ck.get(key, default))
+    val = ck.get(key, default)
+    if (not val) and key in COOKIE_DEFAULTS:
+        return COOKIE_DEFAULTS[key]
+    return val
 
 #deco's:
@@ -328 +337 @@
     'auto_refreshed', 'check_session',
     'do_redirect', 'error_page','start_session','getcookie'
-    ,'create_webserver']
-
-
-
+    ,'create_webserver','setcookie']
+
+
+