diff options
Diffstat (limited to 'pyload/remote')
| -rw-r--r-- | pyload/remote/apitypes.py | 7 | ||||
| -rw-r--r-- | pyload/remote/apitypes_debug.py | 2 | ||||
| -rw-r--r-- | pyload/remote/pyload.thrift | 7 | ||||
| -rw-r--r-- | pyload/remote/wsbackend/AsyncHandler.py | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/pyload/remote/apitypes.py b/pyload/remote/apitypes.py index d186717d4..53d2de6d2 100644 --- a/pyload/remote/apitypes.py +++ b/pyload/remote/apitypes.py @@ -241,14 +241,15 @@ class InvalidConfigSection(ExceptionObject): self.section = section class LinkStatus(BaseObject): - __slots__ = ['url', 'name', 'plugin', 'size', 'status'] + __slots__ = ['url', 'name', 'size', 'status', 'plugin', 'hash'] - def __init__(self, url=None, name=None, plugin=None, size=None, status=None): + def __init__(self, url=None, name=None, size=None, status=None, plugin=None, hash=None): self.url = url self.name = name - self.plugin = plugin self.size = size self.status = status + self.plugin = plugin + self.hash = hash class OnlineCheck(BaseObject): __slots__ = ['rid', 'data'] diff --git a/pyload/remote/apitypes_debug.py b/pyload/remote/apitypes_debug.py index 1c34b702e..74ea8a6a8 100644 --- a/pyload/remote/apitypes_debug.py +++ b/pyload/remote/apitypes_debug.py @@ -32,7 +32,7 @@ classes = { 'Input' : [int, (None, basestring), (None, basestring)], 'InteractionTask' : [int, int, Input, basestring, basestring, basestring], 'InvalidConfigSection' : [basestring], - 'LinkStatus' : [basestring, basestring, basestring, int, int], + 'LinkStatus' : [basestring, basestring, int, int, (None, basestring), (None, basestring)], 'OnlineCheck' : [int, (dict, basestring, LinkStatus)], 'PackageDoesNotExists' : [int], 'PackageInfo' : [int, basestring, basestring, int, int, basestring, basestring, basestring, int, (list, basestring), int, bool, int, PackageStats, (list, int), (list, int)], diff --git a/pyload/remote/pyload.thrift b/pyload/remote/pyload.thrift index d41b6d10b..905be22b0 100644 --- a/pyload/remote/pyload.thrift +++ b/pyload/remote/pyload.thrift @@ -197,9 +197,10 @@ struct TreeCollection { struct LinkStatus { 1: string url, 2: string name, - 3: PluginName plugin, - 4: ByteCount size, // size <= 0 : unknown - 5: DownloadStatus status, + 3: ByteCount size, // size <= 0 : unknown + 4: DownloadStatus status, + 5: optional PluginName plugin, + 6: optional string hash } struct ServerStatus { diff --git a/pyload/remote/wsbackend/AsyncHandler.py b/pyload/remote/wsbackend/AsyncHandler.py index 136cc060d..c7a26cd6b 100644 --- a/pyload/remote/wsbackend/AsyncHandler.py +++ b/pyload/remote/wsbackend/AsyncHandler.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- ############################################################################### -# Copyright(c) 2008-2012 pyLoad Team +# Copyright(c) 2008-2013 pyLoad Team # http://www.pyload.org # # This file is part of pyLoad. |