summaryrefslogtreecommitdiffstats
path: root/module/web
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-04-24 19:46:59 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-04-24 19:46:59 +0200
commit1ef8f2435ec72fac64505fc11939e94665e11eef (patch)
tree76eb662a771923479e894b9c160a9b46326f33d1 /module/web
parentbitshare fixes (diff)
downloadpyload-1ef8f2435ec72fac64505fc11939e94665e11eef.tar.xz
parse content disposition
Diffstat (limited to 'module/web')
-rw-r--r--module/web/pyload_app.py9
-rw-r--r--module/web/templates/default/info.html10
2 files changed, 15 insertions, 4 deletions
diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py
index 102638885..fc2302809 100644
--- a/module/web/pyload_app.py
+++ b/module/web/pyload_app.py
@@ -18,11 +18,12 @@
"""
from copy import deepcopy
from datetime import datetime
-from itertools import chain
from operator import itemgetter
-import os
+
import time
+import os
+import sys
from os import listdir
from os.path import isdir, isfile, join ,abspath
from sys import getfilesystemencoding
@@ -514,7 +515,9 @@ def info():
conf = PYLOAD.get_config()
- data = {"version": PYLOAD.get_server_version(),
+ data = {"python": sys.version,
+ "os": " ".join((os.name,) + os.uname()),
+ "version": PYLOAD.get_server_version(),
"folder": abspath(PYLOAD_DIR), "config": abspath(""),
"download": abspath(conf["general"]["download_folder"]["value"]),
"remote": conf["remote"]["port"]["value"],
diff --git a/module/web/templates/default/info.html b/module/web/templates/default/info.html
index f1ef06814..b9ee3b1bd 100644
--- a/module/web/templates/default/info.html
+++ b/module/web/templates/default/info.html
@@ -20,8 +20,16 @@
<h3>{{ _("System") }}</h3>
<table class="system">
+ <tr>
+ <td>{{ _("Python:") }}</td>
+ <td>{{ python }}</td>
+ </tr>
+ <tr>
+ <td>{{ _("OS:") }}</td>
+ <td>{{ os }}</td>
+ </tr>
<tr>
- <td>{{ _("Version:") }}</td>
+ <td>{{ _("pyLoad version:") }}</td>
<td>{{ version }}</td>
</tr>
<tr>