summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-10-03 21:27:12 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-10-03 21:27:12 +0200
commitc716dfbccd4ee7b210dcf91ee7eb18550b65bf2b (patch)
tree404fc20566a6dbd3639e59d310025e31e77e5011
parentUpdate pyload to the new plugins structure (diff)
downloadpyload-c716dfbccd4ee7b210dcf91ee7eb18550b65bf2b.tar.xz
Remove trailing whitespaces
-rw-r--r--CREDITS.md2
-rw-r--r--pyload/Core.py4
-rw-r--r--pyload/api/__init__.py4
-rw-r--r--pyload/config/Setup.py2
-rw-r--r--pyload/database/FileDatabase.py2
-rw-r--r--pyload/network/XDCCRequest.py2
-rw-r--r--pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py280
-rw-r--r--pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py36
-rw-r--r--pyload/utils/__init__.py2
-rw-r--r--pyload/webui/servers/nginx_default.conf2
-rw-r--r--pyload/webui/themes/dark/css/dark.css2
-rw-r--r--pyload/webui/themes/dark/tml/base.html2
-rw-r--r--pyload/webui/themes/dark/tml/captcha.html18
-rw-r--r--pyload/webui/themes/dark/tml/home.html2
-rw-r--r--pyload/webui/themes/default/css/default.css2
-rw-r--r--pyload/webui/themes/default/tml/base.html2
-rw-r--r--pyload/webui/themes/default/tml/captcha.html18
-rw-r--r--pyload/webui/themes/default/tml/home.html2
-rw-r--r--pyload/webui/themes/flat/tml/base.html2
-rw-r--r--pyload/webui/themes/flat/tml/captcha.html18
-rw-r--r--pyload/webui/themes/flat/tml/home.html2
21 files changed, 203 insertions, 203 deletions
diff --git a/CREDITS.md b/CREDITS.md
index 8e0f86740..835baf320 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -14,7 +14,7 @@ Credits
- Walter Purcaro <vuolter@gmail.com>
- zoidberg10 <zoidberg@mujmail.cz>
-A special thanks to spoob, sebnapi and RaNaN who created pyLoad!
+A special thanks to spoob, sebnapi and RaNaN who created pyLoad!
### Contributors ###
diff --git a/pyload/Core.py b/pyload/Core.py
index 6b67f8984..e6337c334 100644
--- a/pyload/Core.py
+++ b/pyload/Core.py
@@ -603,7 +603,7 @@ def deamon():
print >> sys.stderr, "fork #1 failed: %d (%s)" % (e.errno, e.strerror)
sys.exit(1)
- # decouple from parent environment
+ # decouple from parent environment
os.setsid()
os.umask(0)
@@ -646,6 +646,6 @@ def main():
pyload_core.removeLogger()
_exit(1)
-# And so it begins...
+# And so it begins...
if __name__ == "__main__":
main()
diff --git a/pyload/api/__init__.py b/pyload/api/__init__.py
index a6927b238..43bdf5adb 100644
--- a/pyload/api/__init__.py
+++ b/pyload/api/__init__.py
@@ -705,7 +705,7 @@ class Api(Iface):
"""Gives a package a new position.
:param pid: package id
- :param position:
+ :param position:
"""
self.core.files.reorderPackage(pid, position)
@@ -917,7 +917,7 @@ class Api(Iface):
:param username:
:param password:
- :param remoteip:
+ :param remoteip:
:return: dict with info, empty when login is incorrect
"""
if self.core.config["remote"]["nolocalauth"] and remoteip == "127.0.0.1":
diff --git a/pyload/config/Setup.py b/pyload/config/Setup.py
index 697b92fbb..1fbdc3e51 100644
--- a/pyload/config/Setup.py
+++ b/pyload/config/Setup.py
@@ -283,7 +283,7 @@ class SetupAssistant:
print
print _("The following logindata is valid for CLI and webinterface.")
-
+
from pyload.database import DatabaseBackend
db = DatabaseBackend(None)
diff --git a/pyload/database/FileDatabase.py b/pyload/database/FileDatabase.py
index 3594da685..c03136f9a 100644
--- a/pyload/database/FileDatabase.py
+++ b/pyload/database/FileDatabase.py
@@ -769,7 +769,7 @@ class FileMethods:
def updatePackage(self, p):
self.c.execute('UPDATE packages SET name=?, folder=?, site=?, password=?, queue=? WHERE id=?', (p.name, p.folder, p.site, p.password, p.queue, str(p.id)))
- @style.queue
+ @style.queue
def updateLinkInfo(self, data):
""" data is list of tupels (name, size, status, url) """
self.c.executemany('UPDATE links SET name=?, size=?, status=? WHERE url=? AND status IN (1, 2, 3, 14)', data)
diff --git a/pyload/network/XDCCRequest.py b/pyload/network/XDCCRequest.py
index 9ae52f72b..b9baa7215 100644
--- a/pyload/network/XDCCRequest.py
+++ b/pyload/network/XDCCRequest.py
@@ -103,7 +103,7 @@ class XDCCRequest:
now = time()
timespan = now - lastUpdate
- if timespan > 1:
+ if timespan > 1:
self.speed = cumRecvLen / timespan
cumRecvLen = 0
lastUpdate = now
diff --git a/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py b/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py
index f0b356375..e8d2cf9af 100644
--- a/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py
+++ b/pyload/remote/thriftbackend/thriftgen/pyload/Pyload.py
@@ -3307,7 +3307,7 @@ class getConfigValue_args(TBase):
- section
"""
- __slots__ = [
+ __slots__ = [
'category',
'option',
'section',
@@ -3332,7 +3332,7 @@ class getConfigValue_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3353,7 +3353,7 @@ class setConfigValue_args(TBase):
- section
"""
- __slots__ = [
+ __slots__ = [
'category',
'option',
'value',
@@ -3377,7 +3377,7 @@ class setConfigValue_args(TBase):
class setConfigValue_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3386,7 +3386,7 @@ class setConfigValue_result(TBase):
class getConfig_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3399,7 +3399,7 @@ class getConfig_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3413,7 +3413,7 @@ class getConfig_result(TBase):
class getPluginConfig_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3426,7 +3426,7 @@ class getPluginConfig_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3440,7 +3440,7 @@ class getPluginConfig_result(TBase):
class pauseServer_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3449,7 +3449,7 @@ class pauseServer_args(TBase):
class pauseServer_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3458,7 +3458,7 @@ class pauseServer_result(TBase):
class unpauseServer_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3467,7 +3467,7 @@ class unpauseServer_args(TBase):
class unpauseServer_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3476,7 +3476,7 @@ class unpauseServer_result(TBase):
class togglePause_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3489,7 +3489,7 @@ class togglePause_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3503,7 +3503,7 @@ class togglePause_result(TBase):
class statusServer_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3516,7 +3516,7 @@ class statusServer_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3530,7 +3530,7 @@ class statusServer_result(TBase):
class freeSpace_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3543,7 +3543,7 @@ class freeSpace_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3557,7 +3557,7 @@ class freeSpace_result(TBase):
class getServerVersion_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3570,7 +3570,7 @@ class getServerVersion_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3584,7 +3584,7 @@ class getServerVersion_result(TBase):
class kill_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3593,7 +3593,7 @@ class kill_args(TBase):
class kill_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3602,7 +3602,7 @@ class kill_result(TBase):
class restart_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3611,7 +3611,7 @@ class restart_args(TBase):
class restart_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3624,7 +3624,7 @@ class getLog_args(TBase):
- offset
"""
- __slots__ = [
+ __slots__ = [
'offset',
]
@@ -3643,7 +3643,7 @@ class getLog_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3657,7 +3657,7 @@ class getLog_result(TBase):
class isTimeDownload_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3670,7 +3670,7 @@ class isTimeDownload_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3684,7 +3684,7 @@ class isTimeDownload_result(TBase):
class isTimeReconnect_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3697,7 +3697,7 @@ class isTimeReconnect_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3711,7 +3711,7 @@ class isTimeReconnect_result(TBase):
class toggleReconnect_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3724,7 +3724,7 @@ class toggleReconnect_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3742,7 +3742,7 @@ class generatePackages_args(TBase):
- links
"""
- __slots__ = [
+ __slots__ = [
'links',
]
@@ -3761,7 +3761,7 @@ class generatePackages_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3779,7 +3779,7 @@ class checkURLs_args(TBase):
- urls
"""
- __slots__ = [
+ __slots__ = [
'urls',
]
@@ -3798,7 +3798,7 @@ class checkURLs_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3817,7 +3817,7 @@ class parseURLs_args(TBase):
- url
"""
- __slots__ = [
+ __slots__ = [
'html',
'url',
]
@@ -3839,7 +3839,7 @@ class parseURLs_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3857,7 +3857,7 @@ class checkOnlineStatus_args(TBase):
- urls
"""
- __slots__ = [
+ __slots__ = [
'urls',
]
@@ -3876,7 +3876,7 @@ class checkOnlineStatus_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3896,7 +3896,7 @@ class checkOnlineStatusContainer_args(TBase):
- data
"""
- __slots__ = [
+ __slots__ = [
'urls',
'filename',
'data',
@@ -3921,7 +3921,7 @@ class checkOnlineStatusContainer_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3939,7 +3939,7 @@ class pollResults_args(TBase):
- rid
"""
- __slots__ = [
+ __slots__ = [
'rid',
]
@@ -3958,7 +3958,7 @@ class pollResults_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -3972,7 +3972,7 @@ class pollResults_result(TBase):
class statusDownloads_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -3985,7 +3985,7 @@ class statusDownloads_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -4003,7 +4003,7 @@ class getPackageData_args(TBase):
- pid
"""
- __slots__ = [
+ __slots__ = [
'pid',
]
@@ -4023,7 +4023,7 @@ class getPackageData_result(TBase):
- e
"""
- __slots__ = [
+ __slots__ = [
'success',
'e',
]
@@ -4044,7 +4044,7 @@ class getPackageInfo_args(TBase):
- pid
"""
- __slots__ = [
+ __slots__ = [
'pid',
]
@@ -4064,7 +4064,7 @@ class getPackageInfo_result(TBase):
- e
"""
- __slots__ = [
+ __slots__ = [
'success',
'e',
]
@@ -4085,7 +4085,7 @@ class getFileData_args(TBase):
- fid
"""
- __slots__ = [
+ __slots__ = [
'fid',
]
@@ -4105,7 +4105,7 @@ class getFileData_result(TBase):
- e
"""
- __slots__ = [
+ __slots__ = [
'success',
'e',
]
@@ -4122,7 +4122,7 @@ class getFileData_result(TBase):
class getQueue_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4135,7 +4135,7 @@ class getQueue_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -4149,7 +4149,7 @@ class getQueue_result(TBase):
class getCollector_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4162,7 +4162,7 @@ class getCollector_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -4176,7 +4176,7 @@ class getCollector_result(TBase):
class getQueueData_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4189,7 +4189,7 @@ class getQueueData_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -4203,7 +4203,7 @@ class getQueueData_result(TBase):
class getCollectorData_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4216,7 +4216,7 @@ class getCollectorData_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -4234,7 +4234,7 @@ class getPackageOrder_args(TBase):
- destination
"""
- __slots__ = [
+ __slots__ = [
'destination',
]
@@ -4253,7 +4253,7 @@ class getPackageOrder_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -4271,7 +4271,7 @@ class getFileOrder_args(TBase):
- pid
"""
- __slots__ = [
+ __slots__ = [
'pid',
]
@@ -4290,7 +4290,7 @@ class getFileOrder_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -4309,7 +4309,7 @@ class generateAndAddPackages_args(TBase):
- dest
"""
- __slots__ = [
+ __slots__ = [
'links',
'dest',
]
@@ -4331,7 +4331,7 @@ class generateAndAddPackages_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -4351,7 +4351,7 @@ class addPackage_args(TBase):
- dest
"""
- __slots__ = [
+ __slots__ = [
'name',
'links',
'dest',
@@ -4376,7 +4376,7 @@ class addPackage_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -4395,7 +4395,7 @@ class addFiles_args(TBase):
- links
"""
- __slots__ = [
+ __slots__ = [
'pid',
'links',
]
@@ -4413,7 +4413,7 @@ class addFiles_args(TBase):
class addFiles_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4427,7 +4427,7 @@ class uploadContainer_args(TBase):
- data
"""
- __slots__ = [
+ __slots__ = [
'filename',
'data',
]
@@ -4445,7 +4445,7 @@ class uploadContainer_args(TBase):
class uploadContainer_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4458,7 +4458,7 @@ class deleteFiles_args(TBase):
- fids
"""
- __slots__ = [
+ __slots__ = [
'fids',
]
@@ -4473,7 +4473,7 @@ class deleteFiles_args(TBase):
class deleteFiles_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4486,7 +4486,7 @@ class deletePackages_args(TBase):
- pids
"""
- __slots__ = [
+ __slots__ = [
'pids',
]
@@ -4501,7 +4501,7 @@ class deletePackages_args(TBase):
class deletePackages_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4514,7 +4514,7 @@ class pushToQueue_args(TBase):
- pid
"""
- __slots__ = [
+ __slots__ = [
'pid',
]
@@ -4529,7 +4529,7 @@ class pushToQueue_args(TBase):
class pushToQueue_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4542,7 +4542,7 @@ class pullFromQueue_args(TBase):
- pid
"""
- __slots__ = [
+ __slots__ = [
'pid',
]
@@ -4557,7 +4557,7 @@ class pullFromQueue_args(TBase):
class pullFromQueue_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4570,7 +4570,7 @@ class restartPackage_args(TBase):
- pid
"""
- __slots__ = [
+ __slots__ = [
'pid',
]
@@ -4585,7 +4585,7 @@ class restartPackage_args(TBase):
class restartPackage_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4598,7 +4598,7 @@ class restartFile_args(TBase):
- fid
"""
- __slots__ = [
+ __slots__ = [
'fid',
]
@@ -4613,7 +4613,7 @@ class restartFile_args(TBase):
class restartFile_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4626,7 +4626,7 @@ class recheckPackage_args(TBase):
- pid
"""
- __slots__ = [
+ __slots__ = [
'pid',
]
@@ -4641,7 +4641,7 @@ class recheckPackage_args(TBase):
class recheckPackage_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4650,7 +4650,7 @@ class recheckPackage_result(TBase):
class stopAllDownloads_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4659,7 +4659,7 @@ class stopAllDownloads_args(TBase):
class stopAllDownloads_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4672,7 +4672,7 @@ class stopDownloads_args(TBase):
- fids
"""
- __slots__ = [
+ __slots__ = [
'fids',
]
@@ -4687,7 +4687,7 @@ class stopDownloads_args(TBase):
class stopDownloads_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4701,7 +4701,7 @@ class setPackageName_args(TBase):
- name
"""
- __slots__ = [
+ __slots__ = [
'pid',
'name',
]
@@ -4719,7 +4719,7 @@ class setPackageName_args(TBase):
class setPackageName_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4733,7 +4733,7 @@ class movePackage_args(TBase):
- pid
"""
- __slots__ = [
+ __slots__ = [
'destination',
'pid',
]
@@ -4751,7 +4751,7 @@ class movePackage_args(TBase):
class movePackage_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4765,7 +4765,7 @@ class moveFiles_args(TBase):
- pid
"""
- __slots__ = [
+ __slots__ = [
'fids',
'pid',
]
@@ -4783,7 +4783,7 @@ class moveFiles_args(TBase):
class moveFiles_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4797,7 +4797,7 @@ class orderPackage_args(TBase):
- position
"""
- __slots__ = [
+ __slots__ = [
'pid',
'position',
]
@@ -4815,7 +4815,7 @@ class orderPackage_args(TBase):
class orderPackage_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4829,7 +4829,7 @@ class orderFile_args(TBase):
- position
"""
- __slots__ = [
+ __slots__ = [
'fid',
'position',
]
@@ -4847,7 +4847,7 @@ class orderFile_args(TBase):
class orderFile_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4861,7 +4861,7 @@ class setPackageData_args(TBase):
- data
"""
- __slots__ = [
+ __slots__ = [
'pid',
'data',
]
@@ -4883,7 +4883,7 @@ class setPackageData_result(TBase):
- e
"""
- __slots__ = [
+ __slots__ = [
'e',
]
@@ -4898,7 +4898,7 @@ class setPackageData_result(TBase):
class deleteFinished_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4911,7 +4911,7 @@ class deleteFinished_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -4925,7 +4925,7 @@ class deleteFinished_result(TBase):
class restartFailed_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4934,7 +4934,7 @@ class restartFailed_args(TBase):
class restartFailed_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -4947,7 +4947,7 @@ class getEvents_args(TBase):
- uuid
"""
- __slots__ = [
+ __slots__ = [
'uuid',
]
@@ -4966,7 +4966,7 @@ class getEvents_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -4984,7 +4984,7 @@ class getAccounts_args(TBase):
- refresh
"""
- __slots__ = [
+ __slots__ = [
'refresh',
]
@@ -5003,7 +5003,7 @@ class getAccounts_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -5017,7 +5017,7 @@ class getAccounts_result(TBase):
class getAccountTypes_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -5030,7 +5030,7 @@ class getAccountTypes_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -5051,7 +5051,7 @@ class updateAccount_args(TBase):
- options
"""
- __slots__ = [
+ __slots__ = [
'plugin',
'account',
'password',
@@ -5075,7 +5075,7 @@ class updateAccount_args(TBase):
class updateAccount_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -5089,7 +5089,7 @@ class removeAccount_args(TBase):
- account
"""
- __slots__ = [
+ __slots__ = [
'plugin',
'account',
]
@@ -5107,7 +5107,7 @@ class removeAccount_args(TBase):
class removeAccount_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -5121,7 +5121,7 @@ class login_args(TBase):
- password
"""
- __slots__ = [
+ __slots__ = [
'username',
'password',
]
@@ -5143,7 +5143,7 @@ class login_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -5162,7 +5162,7 @@ class getUserData_args(TBase):
- password
"""
- __slots__ = [
+ __slots__ = [
'username',
'password',
]
@@ -5184,7 +5184,7 @@ class getUserData_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -5198,7 +5198,7 @@ class getUserData_result(TBase):
class getAllUserData_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -5211,7 +5211,7 @@ class getAllUserData_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -5225,7 +5225,7 @@ class getAllUserData_result(TBase):
class getServices_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -5238,7 +5238,7 @@ class getServices_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -5257,7 +5257,7 @@ class hasService_args(TBase):
- func
"""
- __slots__ = [
+ __slots__ = [
'plugin',
'func',
]
@@ -5279,7 +5279,7 @@ class hasService_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -5297,7 +5297,7 @@ class call_args(TBase):
- info
"""
- __slots__ = [
+ __slots__ = [
'info',
]
@@ -5318,7 +5318,7 @@ class call_result(TBase):
- e
"""
- __slots__ = [
+ __slots__ = [
'success',
'ex',
'e',
@@ -5338,7 +5338,7 @@ class call_result(TBase):
class getAllInfo_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -5351,7 +5351,7 @@ class getAllInfo_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -5369,7 +5369,7 @@ class getInfoByPlugin_args(TBase):
- plugin
"""
- __slots__ = [
+ __slots__ = [
'plugin',
]
@@ -5388,7 +5388,7 @@ class getInfoByPlugin_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -5402,7 +5402,7 @@ class getInfoByPlugin_result(TBase):
class isCaptchaWaiting_args(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
@@ -5415,7 +5415,7 @@ class isCaptchaWaiting_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -5433,7 +5433,7 @@ class getCaptchaTask_args(TBase):
- exclusive
"""
- __slots__ = [
+ __slots__ = [
'exclusive',
]
@@ -5452,7 +5452,7 @@ class getCaptchaTask_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -5470,7 +5470,7 @@ class getCaptchaTaskStatus_args(TBase):
- tid
"""
- __slots__ = [
+ __slots__ = [
'tid',
]
@@ -5489,7 +5489,7 @@ class getCaptchaTaskStatus_result(TBase):
- success
"""
- __slots__ = [
+ __slots__ = [
'success',
]
@@ -5508,7 +5508,7 @@ class setCaptchaResult_args(TBase):
- result
"""
- __slots__ = [
+ __slots__ = [
'tid',
'result',
]
@@ -5526,7 +5526,7 @@ class setCaptchaResult_args(TBase):
class setCaptchaResult_result(TBase):
- __slots__ = [
+ __slots__ = [
]
thrift_spec = (
diff --git a/pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py b/pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py
index c2c50924e..67d23161d 100644
--- a/pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py
+++ b/pyload/remote/thriftbackend/thriftgen/pyload/ttypes.py
@@ -169,7 +169,7 @@ class DownloadInfo(TBase):
- plugin
"""
- __slots__ = [
+ __slots__ = [
'fid',
'name',
'speed',
@@ -239,7 +239,7 @@ class ServerStatus(TBase):
- reconnect
"""
- __slots__ = [
+ __slots__ = [
'pause',
'active',
'queue',
@@ -279,7 +279,7 @@ class ConfigItem(TBase):
- type
"""
- __slots__ = [
+ __slots__ = [
'name',
'description',
'value',
@@ -310,7 +310,7 @@ class ConfigSection(TBase):
- outline
"""
- __slots__ = [
+ __slots__ = [
'name',
'description',
'items',
@@ -348,7 +348,7 @@ class FileData(TBase):
- order
"""
- __slots__ = [
+ __slots__ = [
'fid',
'url',
'name',
@@ -409,7 +409,7 @@ class PackageData(TBase):
- fids
"""
- __slots__ = [
+ __slots__ = [
'pid',
'name',
'folder',
@@ -472,7 +472,7 @@ class InteractionTask(TBase):
- plugin
"""
- __slots__ = [
+ __slots__ = [
'iid',
'input',
'structure',
@@ -518,7 +518,7 @@ class CaptchaTask(TBase):
- resultType
"""
- __slots__ = [
+ __slots__ = [
'tid',
'data',
'type',
@@ -549,7 +549,7 @@ class EventInfo(TBase):
- destination
"""
- __slots__ = [
+ __slots__ = [
'eventname',
'id',
'type',
@@ -581,7 +581,7 @@ class UserData(TBase):
- templateName
"""
- __slots__ = [
+ __slots__ = [
'name',
'email',
'role',
@@ -619,7 +619,7 @@ class AccountInfo(TBase):
- type
"""
- __slots__ = [
+ __slots__ = [
'validuntil',
'login',
'options',
@@ -662,7 +662,7 @@ class ServiceCall(TBase):
- parseArguments
"""
- __slots__ = [
+ __slots__ = [
'plugin',
'func',
'arguments',
@@ -694,7 +694,7 @@ class OnlineStatus(TBase):
- size
"""
- __slots__ = [
+ __slots__ = [
'name',
'plugin',
'packagename',
@@ -726,7 +726,7 @@ class OnlineCheck(TBase):
- data
"""
- __slots__ = [
+ __slots__ = [
'rid',
'data',
]
@@ -748,7 +748,7 @@ class PackageDoesNotExists(TExceptionBase):
- pid
"""
- __slots__ = [
+ __slots__ = [
'pid',
]
@@ -770,7 +770,7 @@ class FileDoesNotExists(TExceptionBase):
- fid
"""
- __slots__ = [
+ __slots__ = [
'fid',
]
@@ -793,7 +793,7 @@ class ServiceDoesNotExists(TExceptionBase):
- func
"""
- __slots__ = [
+ __slots__ = [
'plugin',
'func',
]
@@ -818,7 +818,7 @@ class ServiceException(TExceptionBase):
- msg
"""
- __slots__ = [
+ __slots__ = [
'msg',
]
diff --git a/pyload/utils/__init__.py b/pyload/utils/__init__.py
index a13aa75d5..1c586912e 100644
--- a/pyload/utils/__init__.py
+++ b/pyload/utils/__init__.py
@@ -96,7 +96,7 @@ else:
def get_console_encoding(enc):
- if os.name == "nt":
+ if os.name == "nt":
if enc == "cp65001": # aka UTF-8
print "WARNING: Windows codepage 65001 is not supported."
enc = "cp850"
diff --git a/pyload/webui/servers/nginx_default.conf b/pyload/webui/servers/nginx_default.conf
index b4ebd1e02..c1cfcafca 100644
--- a/pyload/webui/servers/nginx_default.conf
+++ b/pyload/webui/servers/nginx_default.conf
@@ -65,7 +65,7 @@ http {
}
location ~* ^.+\.(jpg|jpeg|gif|png|ico|css|zip|tgz|gz|rar|bz2|doc|xls|exe|pdf|ppt|txt|tar|mid|midi|wav|bmp|rtf|js|mov) {
access_log off;
- expires 30d;
+ expires 30d;
}
location / {
# host and port to fastcgi server
diff --git a/pyload/webui/themes/dark/css/dark.css b/pyload/webui/themes/dark/css/dark.css
index ca16d0621..713f8db06 100644
--- a/pyload/webui/themes/dark/css/dark.css
+++ b/pyload/webui/themes/dark/css/dark.css
@@ -612,7 +612,7 @@ td p {
.progress_bar {
background: #0C0;
height: 5px;
-
+
}
.queue {
diff --git a/pyload/webui/themes/dark/tml/base.html b/pyload/webui/themes/dark/tml/base.html
index e7179acfa..bafcc319d 100644
--- a/pyload/webui/themes/dark/tml/base.html
+++ b/pyload/webui/themes/dark/tml/base.html
@@ -99,7 +99,7 @@
<a href="/settings/" title=""><img src="/dark/img/default/head-menu-config.png" alt="" />{{_("Config")}}</a>
</li>
{% endblock %}
-
+
</ul>
</div>{% endif %}
diff --git a/pyload/webui/themes/dark/tml/captcha.html b/pyload/webui/themes/dark/tml/captcha.html
index ae1afe444..731d97d11 100644
--- a/pyload/webui/themes/dark/tml/captcha.html
+++ b/pyload/webui/themes/dark/tml/captcha.html
@@ -2,28 +2,28 @@
<div id="cap_box" class="window_box">
<form id="cap_form" action="/json/set_captcha" method="POST" enctype="multipart/form-data" onsubmit="return false;">
-
+
<h1>{{_("Captcha reading")}}</h1>
<p id="cap_title">{{_("Please read the text on the captcha.")}}</p>
-
+
<div id="cap_textual">
-
+
<input id="cap_id" name="cap_id" type="hidden" value="" />
-
+
<label>{{_("Captcha")}}
<span class="small">{{_("The captcha.")}}</span>
</label>
<span class="cont">
<img id="cap_textual_img" src="">
</span>
-
+
<label>{{_("Text")}}
<span class="small">{{_("Input the text on the captcha.")}}</span>
</label>
<input id="cap_result" name="cap_result" type="text" size="20" />
-
+
</div>
-
+
<div id="cap_positional" style="text-align: center">
<img id="cap_positional_img" src="" style="margin: 10px; cursor:pointer">
</div>
@@ -34,9 +34,9 @@
<button id="cap_reset" type="reset" style="margin-left: 0">{{_("Close")}}</button>
</span>
</div>
-
+
<div class="spacer"></div>
-
+
</form>
</div> \ No newline at end of file
diff --git a/pyload/webui/themes/dark/tml/home.html b/pyload/webui/themes/dark/tml/home.html
index b350b705e..ef862d25c 100644
--- a/pyload/webui/themes/dark/tml/home.html
+++ b/pyload/webui/themes/dark/tml/home.html
@@ -21,7 +21,7 @@ var EntryManager = new Class({
delay: 2500,
limit: 30000
});
-
+
this.ids = [{% for link in content %}
{% if forloop.last %}
{{ link.id }}
diff --git a/pyload/webui/themes/default/css/default.css b/pyload/webui/themes/default/css/default.css
index 5d4b9ebf2..795c24d93 100644
--- a/pyload/webui/themes/default/css/default.css
+++ b/pyload/webui/themes/default/css/default.css
@@ -604,7 +604,7 @@ td p {
.progress_bar {
background: #0C0;
height: 5px;
-
+
}
.queue {
diff --git a/pyload/webui/themes/default/tml/base.html b/pyload/webui/themes/default/tml/base.html
index e2a62a116..b92a4a668 100644
--- a/pyload/webui/themes/default/tml/base.html
+++ b/pyload/webui/themes/default/tml/base.html
@@ -102,7 +102,7 @@
<a href="/settings/" title=""><img src="/default/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
</li>
{% endblock %}
-
+
</ul>
</div>
diff --git a/pyload/webui/themes/default/tml/captcha.html b/pyload/webui/themes/default/tml/captcha.html
index 56892593f..3bfa6cbcf 100644
--- a/pyload/webui/themes/default/tml/captcha.html
+++ b/pyload/webui/themes/default/tml/captcha.html
@@ -2,28 +2,28 @@
<div id="cap_box" class="window_box">
<form id="cap_form" action="/json/set_captcha" method="POST" enctype="multipart/form-data" onsubmit="return false;">
-
+
<h1>{{_("Captcha reading")}}</h1>
<p id="cap_title">{{_("Please read the text on the captcha.")}}</p>
-
+
<div id="cap_textual">
-
+
<input id="cap_id" name="cap_id" type="hidden" value="" />
-
+
<label>{{_("Captcha")}}
<span class="small">{{_("The captcha.")}}</span>
</label>
<span class="cont">
<img id="cap_textual_img" src="">
</span>
-
+
<label>{{_("Text")}}
<span class="small">{{_("Input the text on the captcha.")}}</span>
</label>
<input id="cap_result" name="cap_result" type="text" size="20" />
-
+
</div>
-
+
<div id="cap_positional" style="text-align: center">
<img id="cap_positional_img" src="" style="margin: 10px; cursor:pointer">
</div>
@@ -34,9 +34,9 @@
<button id="cap_reset" type="reset" style="margin-left: 0">{{_("Close")}}</button>
</span>
</div>
-
+
<div class="spacer"></div>
-
+
</form>
</div>
diff --git a/pyload/webui/themes/default/tml/home.html b/pyload/webui/themes/default/tml/home.html
index 0fff703b5..6272853cd 100644
--- a/pyload/webui/themes/default/tml/home.html
+++ b/pyload/webui/themes/default/tml/home.html
@@ -21,7 +21,7 @@ var EntryManager = new Class({
delay: 2500,
limit: 30000
});
-
+
this.ids = [{% for link in content %}
{% if forloop.last %}
{{ link.id }}
diff --git a/pyload/webui/themes/flat/tml/base.html b/pyload/webui/themes/flat/tml/base.html
index 17349c5f1..015a64600 100644
--- a/pyload/webui/themes/flat/tml/base.html
+++ b/pyload/webui/themes/flat/tml/base.html
@@ -99,7 +99,7 @@
<a href="/settings/" title=""><img src="/flat/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
</li>
{% endblock %}
-
+
</ul>
</div>
diff --git a/pyload/webui/themes/flat/tml/captcha.html b/pyload/webui/themes/flat/tml/captcha.html
index ae1afe444..731d97d11 100644
--- a/pyload/webui/themes/flat/tml/captcha.html
+++ b/pyload/webui/themes/flat/tml/captcha.html
@@ -2,28 +2,28 @@
<div id="cap_box" class="window_box">
<form id="cap_form" action="/json/set_captcha" method="POST" enctype="multipart/form-data" onsubmit="return false;">
-
+
<h1>{{_("Captcha reading")}}</h1>
<p id="cap_title">{{_("Please read the text on the captcha.")}}</p>
-
+
<div id="cap_textual">
-
+
<input id="cap_id" name="cap_id" type="hidden" value="" />
-
+
<label>{{_("Captcha")}}
<span class="small">{{_("The captcha.")}}</span>
</label>
<span class="cont">
<img id="cap_textual_img" src="">
</span>
-
+
<label>{{_("Text")}}
<span class="small">{{_("Input the text on the captcha.")}}</span>
</label>
<input id="cap_result" name="cap_result" type="text" size="20" />
-
+
</div>
-
+
<div id="cap_positional" style="text-align: center">
<img id="cap_positional_img" src="" style="margin: 10px; cursor:pointer">
</div>
@@ -34,9 +34,9 @@
<button id="cap_reset" type="reset" style="margin-left: 0">{{_("Close")}}</button>
</span>
</div>
-
+
<div class="spacer"></div>
-
+
</form>
</div> \ No newline at end of file
diff --git a/pyload/webui/themes/flat/tml/home.html b/pyload/webui/themes/flat/tml/home.html
index 838a351ad..c5ce7fdf7 100644
--- a/pyload/webui/themes/flat/tml/home.html
+++ b/pyload/webui/themes/flat/tml/home.html
@@ -21,7 +21,7 @@ var EntryManager = new Class({
delay: 2500,
limit: 30000
});
-
+
this.ids = [{% for link in content %}
{% if forloop.last %}
{{ link.id }}