mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-04-24 13:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sync with webui rev87

Browse source
This commit is contained in:
Marcos Pinto 2007-10-23 22:16:37 +00:00
parent f143d52f66
commit 709c4fb81d
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/WebUi/deluge_webserver.py
View file

@ -39,7 +39,6 @@ from webserver_framework import *
import webpy022 as web
from webpy022.http import seeother, url
from webpy022.webapi import setcookie
from webpy022.utils import Storage
from md5 import md5

2
plugins/WebUi/webserver_common.py
View file

@ -62,7 +62,7 @@ def init():
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()
TORRENT_KEYS = ['distributed_copies', 'download_payload_rate',

21
plugins/WebUi/webserver_framework.py
View file

@ -42,7 +42,7 @@ Todo's before stable:
"""
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
@ -54,13 +54,17 @@ from deluge import common
from webserver_common import REVNO, VERSION
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():
session_id = str(random.random())
@ -88,8 +92,13 @@ def error_page(error):
print ws.render.error(error)
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:
def deluge_page_noauth(func):
@ -327,7 +336,7 @@ def create_webserver(urls,methods):
__all__ = ['deluge_page_noauth', 'deluge_page', 'remote',
'auto_refreshed', 'check_session',
'do_redirect', 'error_page','start_session','getcookie'
,'create_webserver']
,'create_webserver','setcookie']