diff options
Diffstat (limited to 'module/remote')
22 files changed, 625 insertions, 1146 deletions
diff --git a/module/remote/ClickAndLoadBackend.py b/module/remote/ClickAndLoadBackend.py index ad8031587..a73ea7f24 100644 --- a/module/remote/ClickAndLoadBackend.py +++ b/module/remote/ClickAndLoadBackend.py @@ -1,20 +1,6 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. - - @author: RaNaN -""" +# @author: RaNaN + import re from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler from cgi import FieldStorage @@ -24,10 +10,10 @@ from binascii import unhexlify try: from Crypto.Cipher import AES -except: +except Exception: pass -from RemoteManager import BackendBase +from pyload.manager.Remote import BackendBase core = None js = None @@ -93,7 +79,7 @@ class CNLHandler(BaseHTTPRequestHandler): resp += "\r\n" self.start_response(resp) self.wfile.write(resp) - except Exception,e : + except Exception, e: self.send_error(500, str(e)) else: self.send_error(404, "Not Found") @@ -139,7 +125,7 @@ class CNLHandler(BaseHTTPRequestHandler): IV = Key obj = AES.new(Key, AES.MODE_CBC, IV) - result = obj.decrypt(crypted).replace("\x00", "").replace("\r","").split("\n") + result = obj.decrypt(crypted).replace("\x00", "").replace("\r", "").split("\n") result = filter(lambda x: x != "", result) diff --git a/module/remote/RemoteManager.py b/module/remote/RemoteManager.py deleted file mode 100644 index 36eb52a4a..000000000 --- a/module/remote/RemoteManager.py +++ /dev/null @@ -1,91 +0,0 @@ -# -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. - - @author: mkaay -""" - -from threading import Thread -from traceback import print_exc - -class BackendBase(Thread): - def __init__(self, manager): - Thread.__init__(self) - self.m = manager - self.core = manager.core - self.enabled = True - self.running = False - - def run(self): - self.running = True - try: - self.serve() - except Exception, e: - self.core.log.error(_("Remote backend error: %s") % e) - if self.core.debug: - print_exc() - finally: - self.running = False - - def setup(self, host, port): - pass - - def checkDeps(self): - return True - - def serve(self): - pass - - def shutdown(self): - pass - - def stop(self): - self.enabled = False# set flag and call shutdowm message, so thread can react - self.shutdown() - - -class RemoteManager(): - available = [] - - def __init__(self, core): - self.core = core - self.backends = [] - - if self.core.remote: - self.available.append("ThriftBackend") -# else: -# self.available.append("SocketBackend") - - - def startBackends(self): - host = self.core.config["remote"]["listenaddr"] - port = self.core.config["remote"]["port"] - - for b in self.available: - klass = getattr(__import__("module.remote.%s" % b, globals(), locals(), [b], -1), b) - backend = klass(self) - if not backend.checkDeps(): - continue - try: - backend.setup(host, port) - self.core.log.info(_("Starting %(name)s: %(addr)s:%(port)s") % {"name": b, "addr": host, "port": port}) - except Exception, e: - self.core.log.error(_("Failed loading backend %(name)s | %(error)s") % {"name": b, "error": str(e)}) - if self.core.debug: - print_exc() - else: - backend.start() - self.backends.append(backend) - - port += 1 diff --git a/module/remote/SocketBackend.py b/module/remote/SocketBackend.py index 1a157cf1d..a1c885347 100644 --- a/module/remote/SocketBackend.py +++ b/module/remote/SocketBackend.py @@ -2,7 +2,7 @@ import SocketServer -from RemoteManager import BackendBase +from pyload.manager.Remote import BackendBase class RequestHandler(SocketServer.BaseRequestHandler): diff --git a/module/remote/ThriftBackend.py b/module/remote/ThriftBackend.py index b4a2bb25e..16917cfc9 100644 --- a/module/remote/ThriftBackend.py +++ b/module/remote/ThriftBackend.py @@ -1,29 +1,15 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. - - @author: mkaay, RaNaN -""" +# @author: RaNaN, mkaay + from os.path import exists -from module.remote.RemoteManager import BackendBase +from pyload.manager.Remote import BackendBase -from thriftbackend.Processor import Processor -from thriftbackend.Protocol import ProtocolFactory -from thriftbackend.Socket import ServerSocket -from thriftbackend.Transport import TransportFactory -#from thriftbackend.Transport import TransportFactoryCompressed +from pyload.remote.thriftbackend.Processor import Processor +from pyload.remote.thriftbackend.Protocol import ProtocolFactory +from pyload.remote.thriftbackend.Socket import ServerSocket +from pyload.remote.thriftbackend.Transport import TransportFactory +#from pyload.remote.thriftbackend.Transport import TransportFactoryCompressed from thrift.server import TServer @@ -46,11 +32,11 @@ class ThriftBackend(BackendBase): # tfactory = TransportFactoryCompressed() tfactory = TransportFactory() pfactory = ProtocolFactory() - + self.server = TServer.TThreadedServer(processor, transport, tfactory, pfactory) #self.server = TNonblockingServer.TNonblockingServer(processor, transport, tfactory, pfactory) - + #server = TServer.TThreadPoolServer(processor, transport, tfactory, pfactory) - + def serve(self): self.server.serve() diff --git a/module/remote/__init__.py b/module/remote/__init__.py index 9298f5337..60dfa77c7 100644 --- a/module/remote/__init__.py +++ b/module/remote/__init__.py @@ -1,2 +1,3 @@ # -*- coding: utf-8 -*- + activated = True diff --git a/module/remote/socketbackend/__init__.py b/module/remote/socketbackend/__init__.py index de6d13128..40a96afc6 100644 --- a/module/remote/socketbackend/__init__.py +++ b/module/remote/socketbackend/__init__.py @@ -1,2 +1 @@ -__author__ = 'christian' -
\ No newline at end of file +# -*- coding: utf-8 -*- diff --git a/module/remote/socketbackend/create_ttypes.py b/module/remote/socketbackend/create_ttypes.py index 05662cb50..5bfbcafa0 100644 --- a/module/remote/socketbackend/create_ttypes.py +++ b/module/remote/socketbackend/create_ttypes.py @@ -1,18 +1,19 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- import inspect +import os +import platform import sys -from os.path import abspath, dirname, join -path = dirname(abspath(__file__)) -module = join(path, "..", "..") -sys.path.append(join(module, "lib")) -sys.path.append(join(module, "remote")) +if "64" in platform.machine(): + sys.path.append(os.path.join(pypath, "lib64")) +sys.path.append(os.path.join(pypath, "lib")) -from thriftbackend.thriftgen.pyload import ttypes -from thriftbackend.thriftgen.pyload.Pyload import Iface +sys.path.append(os.path.join(pypath, "pyload", "remote")) + +from pyload.remote.thriftbackend.thriftgen.pyload import ttypes +from pyload.remote.thriftbackend.thriftgen.pyload.Pyload import Iface def main(): @@ -34,11 +35,10 @@ def main(): enums.append(klass) - f = open(join(path, "ttypes.py"), "wb") + f = open(os.path.join(pypath, "pyload", "api", "types.py"), "wb") f.write( - """#!/usr/bin/env python -# -*- coding: utf-8 -*- + """# -*- coding: utf-8 -*- # Autogenerated by pyload # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING @@ -74,7 +74,7 @@ class BaseObject(object): f.write("\n") - f.write("class Iface:\n") + f.write("class Iface(object):\n") for name in dir(Iface): if name.startswith("_"): continue @@ -86,6 +86,3 @@ class BaseObject(object): f.write("\n") f.close() - -if __name__ == "__main__": - main()
\ No newline at end of file diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py deleted file mode 100644 index f8ea121fa..000000000 --- a/module/remote/socketbackend/ttypes.py +++ /dev/null @@ -1,383 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# Autogenerated by pyload -# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - -class BaseObject(object): - __slots__ = [] - -class Destination: - Collector = 0 - Queue = 1 - -class DownloadStatus: - Aborted = 9 - Custom = 11 - Decrypting = 10 - Downloading = 12 - Failed = 8 - Finished = 0 - Offline = 1 - Online = 2 - Processing = 13 - Queued = 3 - Skipped = 4 - Starting = 7 - TempOffline = 6 - Unknown = 14 - Waiting = 5 - -class ElementType: - File = 1 - Package = 0 - -class Input: - BOOL = 4 - CHOICE = 6 - CLICK = 5 - LIST = 8 - MULTIPLE = 7 - NONE = 0 - PASSWORD = 3 - TABLE = 9 - TEXT = 1 - TEXTBOX = 2 - -class Output: - CAPTCHA = 1 - NOTIFICATION = 4 - QUESTION = 2 - -class AccountInfo(BaseObject): - __slots__ = ['validuntil', 'login', 'options', 'valid', 'trafficleft', 'maxtraffic', 'premium', 'type'] - - def __init__(self, validuntil=None, login=None, options=None, valid=None, trafficleft=None, maxtraffic=None, premium=None, type=None): - self.validuntil = validuntil - self.login = login - self.options = options - self.valid = valid - self.trafficleft = trafficleft - self.maxtraffic = maxtraffic - self.premium = premium - self.type = type - -class CaptchaTask(BaseObject): - __slots__ = ['tid', 'data', 'type', 'resultType'] - - def __init__(self, tid=None, data=None, type=None, resultType=None): - self.tid = tid - self.data = data - self.type = type - self.resultType = resultType - -class ConfigItem(BaseObject): - __slots__ = ['name', 'description', 'value', 'type'] - - def __init__(self, name=None, description=None, value=None, type=None): - self.name = name - self.description = description - self.value = value - self.type = type - -class ConfigSection(BaseObject): - __slots__ = ['name', 'description', 'items', 'outline'] - - def __init__(self, name=None, description=None, items=None, outline=None): - self.name = name - self.description = description - self.items = items - self.outline = outline - -class DownloadInfo(BaseObject): - __slots__ = ['fid', 'name', 'speed', 'eta', 'format_eta', 'bleft', 'size', 'format_size', 'percent', 'status', 'statusmsg', 'format_wait', 'wait_until', 'packageID', 'packageName', 'plugin'] - - def __init__(self, fid=None, name=None, speed=None, eta=None, format_eta=None, bleft=None, size=None, format_size=None, percent=None, status=None, statusmsg=None, format_wait=None, wait_until=None, packageID=None, packageName=None, plugin=None): - self.fid = fid - self.name = name - self.speed = speed - self.eta = eta - self.format_eta = format_eta - self.bleft = bleft - self.size = size - self.format_size = format_size - self.percent = percent - self.status = status - self.statusmsg = statusmsg - self.format_wait = format_wait - self.wait_until = wait_until - self.packageID = packageID - self.packageName = packageName - self.plugin = plugin - -class EventInfo(BaseObject): - __slots__ = ['eventname', 'id', 'type', 'destination'] - - def __init__(self, eventname=None, id=None, type=None, destination=None): - self.eventname = eventname - self.id = id - self.type = type - self.destination = destination - -class FileData(BaseObject): - __slots__ = ['fid', 'url', 'name', 'plugin', 'size', 'format_size', 'status', 'statusmsg', 'packageID', 'error', 'order'] - - def __init__(self, fid=None, url=None, name=None, plugin=None, size=None, format_size=None, status=None, statusmsg=None, packageID=None, error=None, order=None): - self.fid = fid - self.url = url - self.name = name - self.plugin = plugin - self.size = size - self.format_size = format_size - self.status = status - self.statusmsg = statusmsg - self.packageID = packageID - self.error = error - self.order = order - -class FileDoesNotExists(Exception): - __slots__ = ['fid'] - - def __init__(self, fid=None): - self.fid = fid - -class InteractionTask(BaseObject): - __slots__ = ['iid', 'input', 'structure', 'preset', 'output', 'data', 'title', 'description', 'plugin'] - - def __init__(self, iid=None, input=None, structure=None, preset=None, output=None, data=None, title=None, description=None, plugin=None): - self.iid = iid - self.input = input - self.structure = structure - self.preset = preset - self.output = output - self.data = data - self.title = title - self.description = description - self.plugin = plugin - -class OnlineCheck(BaseObject): - __slots__ = ['rid', 'data'] - - def __init__(self, rid=None, data=None): - self.rid = rid - self.data = data - -class OnlineStatus(BaseObject): - __slots__ = ['name', 'plugin', 'packagename', 'status', 'size'] - - def __init__(self, name=None, plugin=None, packagename=None, status=None, size=None): - self.name = name - self.plugin = plugin - self.packagename = packagename - self.status = status - self.size = size - -class PackageData(BaseObject): - __slots__ = ['pid', 'name', 'folder', 'site', 'password', 'dest', 'order', 'linksdone', 'sizedone', 'sizetotal', 'linkstotal', 'links', 'fids'] - - def __init__(self, pid=None, name=None, folder=None, site=None, password=None, dest=None, order=None, linksdone=None, sizedone=None, sizetotal=None, linkstotal=None, links=None, fids=None): - self.pid = pid - self.name = name - self.folder = folder - self.site = site - self.password = password - self.dest = dest - self.order = order - self.linksdone = linksdone - self.sizedone = sizedone - self.sizetotal = sizetotal - self.linkstotal = linkstotal - self.links = links - self.fids = fids - -class PackageDoesNotExists(Exception): - __slots__ = ['pid'] - - def __init__(self, pid=None): - self.pid = pid - -class ServerStatus(BaseObject): - __slots__ = ['pause', 'active', 'queue', 'total', 'speed', 'download', 'reconnect'] - - def __init__(self, pause=None, active=None, queue=None, total=None, speed=None, download=None, reconnect=None): - self.pause = pause - self.active = active - self.queue = queue - self.total = total - self.speed = speed - self.download = download - self.reconnect = reconnect - -class ServiceCall(BaseObject): - __slots__ = ['plugin', 'func', 'arguments', 'parseArguments'] - - def __init__(self, plugin=None, func=None, arguments=None, parseArguments=None): - self.plugin = plugin - self.func = func - self.arguments = arguments - self.parseArguments = parseArguments - -class ServiceDoesNotExists(Exception): - __slots__ = ['plugin', 'func'] - - def __init__(self, plugin=None, func=None): - self.plugin = plugin - self.func = func - -class ServiceException(Exception): - __slots__ = ['msg'] - - def __init__(self, msg=None): - self.msg = msg - -class UserData(BaseObject): - __slots__ = ['name', 'email', 'role', 'permission', 'templateName'] - - def __init__(self, name=None, email=None, role=None, permission=None, templateName=None): - self.name = name - self.email = email - self.role = role - self.permission = permission - self.templateName = templateName - -class Iface: - def addFiles(self, pid, links): - pass - def addPackage(self, name, links, dest): - pass - def call(self, info): - pass - def checkOnlineStatus(self, urls): - pass - def checkOnlineStatusContainer(self, urls, filename, data): - pass - def checkURLs(self, urls): - pass - def deleteFiles(self, fids): - pass - def deleteFinished(self): - pass - def deletePackages(self, pids): - pass - def freeSpace(self): - pass - def generateAndAddPackages(self, links, dest): - pass - def generatePackages(self, links): - pass - def getAccountTypes(self): - pass - def getAccounts(self, refresh): - pass - def getAllInfo(self): - pass - def getAllUserData(self): - pass - def getCaptchaTask(self, exclusive): - pass - def getCaptchaTaskStatus(self, tid): - pass - def getCollector(self): - pass - def getCollectorData(self): - pass - def getConfig(self): - pass - def getConfigValue(self, category, option, section): - pass - def getEvents(self, uuid): - pass - def getFileData(self, fid): - pass - def getFileOrder(self, pid): - pass - def getInfoByPlugin(self, plugin): - pass - def getLog(self, offset): - pass - def getPackageData(self, pid): - pass - def getPackageInfo(self, pid): - pass - def getPackageOrder(self, destination): - pass - def getPluginConfig(self): - pass - def getQueue(self): - pass - def getQueueData(self): - pass - def getServerVersion(self): - pass - def getServices(self): - pass - def getUserData(self, username, password): - pass - def hasService(self, plugin, func): - pass - def isCaptchaWaiting(self): - pass - def isTimeDownload(self): - pass - def isTimeReconnect(self): - pass - def kill(self): - pass - def login(self, username, password): - pass - def moveFiles(self, fids, pid): - pass - def movePackage(self, destination, pid): - pass - def orderFile(self, fid, position): - pass - def orderPackage(self, pid, position): - pass - def parseURLs(self, html, url): - pass - def pauseServer(self): - pass - def pollResults(self, rid): - pass - def pullFromQueue(self, pid): - pass - def pushToQueue(self, pid): - pass - def recheckPackage(self, pid): - pass - def removeAccount(self, plugin, account): - pass - def restart(self): - pass - def restartFailed(self): - pass - def restartFile(self, fid): - pass - def restartPackage(self, pid): - pass - def setCaptchaResult(self, tid, result): - pass - def setConfigValue(self, category, option, value, section): - pass - def setPackageData(self, pid, data): - pass - def setPackageName(self, pid, name): - pass - def statusDownloads(self): - pass - def statusServer(self): - pass - def stopAllDownloads(self): - pass - def stopDownloads(self, fids): - pass - def togglePause(self): - pass - def toggleReconnect(self): - pass - def unpauseServer(self): - pass - def updateAccount(self, plugin, account, password, options): - pass - def uploadContainer(self, filename, data): - pass - diff --git a/module/remote/thriftbackend/Processor.py b/module/remote/thriftbackend/Processor.py index a8b87c82c..683697d1c 100644 --- a/module/remote/thriftbackend/Processor.py +++ b/module/remote/thriftbackend/Processor.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from thriftgen.pyload import Pyload +from pyload.remote.thriftbackend.thriftgen.pyload import Pyload class Processor(Pyload.Processor): def __init__(self, *args, **kwargs): diff --git a/module/remote/thriftbackend/Protocol.py b/module/remote/thriftbackend/Protocol.py index c42d01459..417b45834 100644 --- a/module/remote/thriftbackend/Protocol.py +++ b/module/remote/thriftbackend/Protocol.py @@ -17,7 +17,7 @@ class Protocol(TBinaryProtocol.TBinaryProtocol): str = self.trans.readAll(len) try: str = str.decode("utf8", "ignore") - except: + except Exception: pass return str @@ -27,4 +27,4 @@ class ProtocolFactory(TBinaryProtocol.TBinaryProtocolFactory): def getProtocol(self, trans): prot = Protocol(trans, self.strictRead, self.strictWrite) - return prot
\ No newline at end of file + return prot diff --git a/module/remote/thriftbackend/Socket.py b/module/remote/thriftbackend/Socket.py index 2243f9df2..f6edc8408 100644 --- a/module/remote/thriftbackend/Socket.py +++ b/module/remote/thriftbackend/Socket.py @@ -10,7 +10,7 @@ from thrift.transport.TSocket import TSocket, TServerSocket, TTransportException WantReadError = Exception #overwritten when ssl is used -class SecureSocketConnection: +class SecureSocketConnection(object): def __init__(self, connection): self.__dict__["connection"] = connection @@ -26,14 +26,14 @@ class SecureSocketConnection: def accept(self): connection, address = self.__dict__["connection"].accept() return SecureSocketConnection(connection), address - + def send(self, buff): try: return self.__dict__["connection"].send(buff) except WantReadError: sleep(0.1) return self.send(buff) - + def recv(self, buff): try: return self.__dict__["connection"].recv(buff) @@ -86,7 +86,7 @@ class Socket(TSocket): buff = '' else: raise - + if not len(buff): raise TTransportException(type=TTransportException.END_OF_FILE, message='TSocket read 0 bytes') return buff diff --git a/module/remote/thriftbackend/ThriftClient.py b/module/remote/thriftbackend/ThriftClient.py index 74363cf62..7c2a1cb01 100644 --- a/module/remote/thriftbackend/ThriftClient.py +++ b/module/remote/thriftbackend/ThriftClient.py @@ -2,13 +2,17 @@ import sys from socket import error -from os.path import dirname, abspath, join from traceback import print_exc try: import thrift + except ImportError: - sys.path.append(abspath(join(dirname(abspath(__file__)), "..", "..", "lib"))) + import platform + + if "64" in platform.machine(): + sys.path.append(os.path.join(pypath, "lib64")) + sys.path.append(os.path.join(pypath, "lib")) from thrift.transport import TTransport #from thrift.transport.TZlibTransport import TZlibTransport @@ -17,8 +21,8 @@ from Protocol import Protocol # modules should import ttypes from here, when want to avoid importing API -from thriftgen.pyload import Pyload -from thriftgen.pyload.ttypes import * +from pyload.remote.thriftbackend.thriftgen.pyload import Pyload +from pyload.remote.thriftbackend.thriftgen.pyload.ttypes import * ConnectionClosed = TTransport.TTransportException @@ -31,7 +35,7 @@ class NoConnection(Exception): class NoSSL(Exception): pass -class ThriftClient: +class ThriftClient(object): def __init__(self, host="localhost", port=7227, user="", password=""): self.createConnection(host, port) @@ -85,25 +89,3 @@ class ThriftClient: def __getattr__(self, item): return getattr(self.client, item) - -if __name__ == "__main__": - - client = ThriftClient(user="User", password="pwhere") - - print client.getServerVersion() - print client.statusServer() - print client.statusDownloads() - q = client.getQueue() - -# for p in q: -# data = client.getPackageData(p.pid) -# print data -# print "Package Name: ", data.name - - - print client.getServices() - print client.call(Pyload.ServiceCall("UpdateManager", "recheckForUpdates")) - - print client.getConfigValue("download", "limit_speed", "core") - - client.close()
\ No newline at end of file diff --git a/module/remote/thriftbackend/ThriftTest.py b/module/remote/thriftbackend/ThriftTest.py index 69ac6a745..c9c0d3cf3 100644 --- a/module/remote/thriftbackend/ThriftTest.py +++ b/module/remote/thriftbackend/ThriftTest.py @@ -1,14 +1,16 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- +import os +import platform import sys -from os.path import join,abspath,dirname -path = join((abspath(dirname(__file__))), "..","..", "lib") -sys.path.append(path) +if "64" in platform.machine(): + sys.path.append(os.path.join(pypath, "lib64")) +sys.path.append(os.path.join(pypath, "lib")) -from thriftgen.pyload import Pyload -from thriftgen.pyload.ttypes import * + +from pyload.remote.thriftbackend.thriftgen.pyload import Pyload +from pyload.remote.thriftbackend.thriftgen.pyload.ttypes import * from Socket import Socket from thrift import Thrift @@ -22,11 +24,11 @@ import xmlrpclib def bench(f, *args, **kwargs): s = time() - ret = [f(*args, **kwargs) for i in range(0,100)] + ret = [f(*args, **kwargs) for i in range(0, 100)] e = time() try: print "%s: %f s" % (f._Method__name, e-s) - except : + except Exception: print "%s: %f s" % (f.__name__, e-s) return ret diff --git a/module/remote/thriftbackend/Transport.py b/module/remote/thriftbackend/Transport.py index 5772c5a9e..7db4ba9d7 100644 --- a/module/remote/thriftbackend/Transport.py +++ b/module/remote/thriftbackend/Transport.py @@ -19,12 +19,12 @@ class TransportCompressed(TZlibTransport): self.handle = trans.handle self.remoteaddr = trans.handle.getpeername() -class TransportFactory: +class TransportFactory(object): def getTransport(self, trans): buffered = Transport(trans) return buffered -class TransportFactoryCompressed: +class TransportFactoryCompressed(object): _last_trans = None _last_z = None @@ -34,4 +34,4 @@ class TransportFactoryCompressed: ztrans = TransportCompressed(Transport(trans), compresslevel) self._last_trans = trans self._last_z = ztrans - return ztrans
\ No newline at end of file + return ztrans diff --git a/module/remote/thriftbackend/__init__.py b/module/remote/thriftbackend/__init__.py index e69de29bb..40a96afc6 100644 --- a/module/remote/thriftbackend/__init__.py +++ b/module/remote/thriftbackend/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- diff --git a/module/remote/thriftbackend/pyload.thrift b/module/remote/thriftbackend/pyload.thrift index 1542e651a..3aef7af00 100644 --- a/module/remote/thriftbackend/pyload.thrift +++ b/module/remote/thriftbackend/pyload.thrift @@ -194,7 +194,7 @@ struct OnlineStatus { 2: PluginName plugin, 3: string packagename, 4: DownloadStatus status, - 5: i64 size, // size <= 0 : unknown + 5: i64 size, // size <= 0: unknown } struct OnlineCheck { @@ -297,13 +297,13 @@ service Pyload { //events list<EventInfo> getEvents(1: string uuid) - + //accounts list<AccountInfo> getAccounts(1: bool refresh), list<string> getAccountTypes() void updateAccount(1: PluginName plugin, 2: string account, 3: string password, 4: map<string, string> options), void removeAccount(1: PluginName plugin, 2: string account), - + //auth bool login(1: string username, 2: string password), UserData getUserData(1: string username, 2:string password), @@ -311,7 +311,7 @@ service Pyload { //services - // servicename : description + // servicename: description map<PluginName, map<string, string>> getServices(), bool hasService(1: PluginName plugin, 2: string func), string call(1: ServiceCall info) throws (1: ServiceDoesNotExists ex, 2: ServiceException e), @@ -319,7 +319,7 @@ service Pyload { //info // {plugin: {name: value}} - map<PluginName, map<string,string>> getAllInfo(), + map<PluginName, map<string, string>> getAllInfo(), map<string, string> getInfoByPlugin(1: PluginName plugin), //scheduler diff --git a/module/remote/thriftbackend/thriftgen/__init__.py b/module/remote/thriftbackend/thriftgen/__init__.py index e69de29bb..40a96afc6 100644 --- a/module/remote/thriftbackend/thriftgen/__init__.py +++ b/module/remote/thriftbackend/thriftgen/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- diff --git a/module/remote/thriftbackend/thriftgen/pyload/Pyload-remote b/module/remote/thriftbackend/thriftgen/pyload/Pyload-remote index bfaf5b078..ddc1dd451 100755..100644 --- a/module/remote/thriftbackend/thriftgen/pyload/Pyload-remote +++ b/module/remote/thriftbackend/thriftgen/pyload/Pyload-remote @@ -1,10 +1,9 @@ -#!/usr/bin/env python # # Autogenerated by Thrift Compiler (0.9.0-dev) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # -# options string: py:slots,dynamic +# options string: py:slots, dynamic # import sys @@ -19,9 +18,9 @@ import Pyload from ttypes import * if len(sys.argv) <= 1 or sys.argv[1] == '--help': - print '' + print print 'Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] function [arg1 [arg2...]]' - print '' + print print 'Functions:' print ' string getConfigValue(string category, string option, string section)' print ' void setConfigValue(string category, string option, string value, string section)' @@ -93,7 +92,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help': print ' CaptchaTask getCaptchaTask(bool exclusive)' print ' string getCaptchaTaskStatus(TaskID tid)' print ' void setCaptchaResult(TaskID tid, string result)' - print '' + print sys.exit(0) pp = pprint.PrettyPrinter(indent = 2) @@ -148,13 +147,13 @@ if cmd == 'getConfigValue': if len(args) != 3: print 'getConfigValue requires 3 args' sys.exit(1) - pp.pprint(client.getConfigValue(args[0],args[1],args[2],)) + pp.pprint(client.getConfigValue(args[0], args[1], args[2],)) elif cmd == 'setConfigValue': if len(args) != 4: print 'setConfigValue requires 4 args' sys.exit(1) - pp.pprint(client.setConfigValue(args[0],args[1],args[2],args[3],)) + pp.pprint(client.setConfigValue(args[0], args[1], args[2], args[3],)) elif cmd == 'getConfig': if len(args) != 0: @@ -256,7 +255,7 @@ elif cmd == 'parseURLs': if len(args) != 2: print 'parseURLs requires 2 args' sys.exit(1) - pp.pprint(client.parseURLs(args[0],args[1],)) + pp.pprint(client.parseURLs(args[0], args[1],)) elif cmd == 'checkOnlineStatus': if len(args) != 1: @@ -268,7 +267,7 @@ elif cmd == 'checkOnlineStatusContainer': if len(args) != 3: print 'checkOnlineStatusContainer requires 3 args' sys.exit(1) - pp.pprint(client.checkOnlineStatusContainer(eval(args[0]),args[1],args[2],)) + pp.pprint(client.checkOnlineStatusContainer(eval(args[0]), args[1], args[2],)) elif cmd == 'pollResults': if len(args) != 1: @@ -340,25 +339,25 @@ elif cmd == 'generateAndAddPackages': if len(args) != 2: print 'generateAndAddPackages requires 2 args' sys.exit(1) - pp.pprint(client.generateAndAddPackages(eval(args[0]),eval(args[1]),)) + pp.pprint(client.generateAndAddPackages(eval(args[0]), eval(args[1]),)) elif cmd == 'addPackage': if len(args) != 3: print 'addPackage requires 3 args' sys.exit(1) - pp.pprint(client.addPackage(args[0],eval(args[1]),eval(args[2]),)) + pp.pprint(client.addPackage(args[0], eval(args[1]), eval(args[2]),)) elif cmd == 'addFiles': if len(args) != 2: print 'addFiles requires 2 args' sys.exit(1) - pp.pprint(client.addFiles(eval(args[0]),eval(args[1]),)) + pp.pprint(client.addFiles(eval(args[0]), eval(args[1]),)) elif cmd == 'uploadContainer': if len(args) != 2: print 'uploadContainer requires 2 args' sys.exit(1) - pp.pprint(client.uploadContainer(args[0],args[1],)) + pp.pprint(client.uploadContainer(args[0], args[1],)) elif cmd == 'deleteFiles': if len(args) != 1: @@ -418,37 +417,37 @@ elif cmd == 'setPackageName': if len(args) != 2: print 'setPackageName requires 2 args' sys.exit(1) - pp.pprint(client.setPackageName(eval(args[0]),args[1],)) + pp.pprint(client.setPackageName(eval(args[0]), args[1],)) elif cmd == 'movePackage': if len(args) != 2: print 'movePackage requires 2 args' sys.exit(1) - pp.pprint(client.movePackage(eval(args[0]),eval(args[1]),)) + pp.pprint(client.movePackage(eval(args[0]), eval(args[1]),)) elif cmd == 'moveFiles': if len(args) != 2: print 'moveFiles requires 2 args' sys.exit(1) - pp.pprint(client.moveFiles(eval(args[0]),eval(args[1]),)) + pp.pprint(client.moveFiles(eval(args[0]), eval(args[1]),)) elif cmd == 'orderPackage': if len(args) != 2: print 'orderPackage requires 2 args' sys.exit(1) - pp.pprint(client.orderPackage(eval(args[0]),eval(args[1]),)) + pp.pprint(client.orderPackage(eval(args[0]), eval(args[1]),)) elif cmd == 'orderFile': if len(args) != 2: print 'orderFile requires 2 args' sys.exit(1) - pp.pprint(client.orderFile(eval(args[0]),eval(args[1]),)) + pp.pprint(client.orderFile(eval(args[0]), eval(args[1]),)) elif cmd == 'setPackageData': if len(args) != 2: print 'setPackageData requires 2 args' sys.exit(1) - pp.pprint(client.setPackageData(eval(args[0]),eval(args[1]),)) + pp.pprint(client.setPackageData(eval(args[0]), eval(args[1]),)) elif cmd == 'deleteFinished': if len(args) != 0: @@ -484,25 +483,25 @@ elif cmd == 'updateAccount': if len(args) != 4: print 'updateAccount requires 4 args' sys.exit(1) - pp.pprint(client.updateAccount(eval(args[0]),args[1],args[2],eval(args[3]),)) + pp.pprint(client.updateAccount(eval(args[0]), args[1], args[2], eval(args[3]),)) elif cmd == 'removeAccount': if len(args) != 2: print 'removeAccount requires 2 args' sys.exit(1) - pp.pprint(client.removeAccount(eval(args[0]),args[1],)) + pp.pprint(client.removeAccount(eval(args[0]), args[1],)) elif cmd == 'login': if len(args) != 2: print 'login requires 2 args' sys.exit(1) - pp.pprint(client.login(args[0],args[1],)) + pp.pprint(client.login(args[0], args[1],)) elif cmd == 'getUserData': if len(args) != 2: print 'getUserData requires 2 args' sys.exit(1) - pp.pprint(client.getUserData(args[0],args[1],)) + pp.pprint(client.getUserData(args[0], args[1],)) elif cmd == 'getAllUserData': if len(args) != 0: @@ -520,7 +519,7 @@ elif cmd == 'hasService': if len(args) != 2: print 'hasService requires 2 args' sys.exit(1) - pp.pprint(client.hasService(eval(args[0]),args[1],)) + pp.pprint(client.hasService(eval(args[0]), args[1],)) elif cmd == 'call': if len(args) != 1: @@ -562,7 +561,7 @@ elif cmd == 'setCaptchaResult': if len(args) != 2: print 'setCaptchaResult requires 2 args' sys.exit(1) - pp.pprint(client.setCaptchaResult(eval(args[0]),args[1],)) + pp.pprint(client.setCaptchaResult(eval(args[0]), args[1],)) else: print 'Unrecognized method %s' % cmd diff --git a/module/remote/thriftbackend/thriftgen/pyload/Pyload.py b/module/remote/thriftbackend/thriftgen/pyload/Pyload.py index 78a42f16a..e8d2cf9af 100644 --- a/module/remote/thriftbackend/thriftgen/pyload/Pyload.py +++ b/module/remote/thriftbackend/thriftgen/pyload/Pyload.py @@ -3,7 +3,7 @@ # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # -# options string: py:slots,dynamic +# options string: py:slots, dynamic # from thrift.Thrift import TType, TMessageType, TException @@ -32,34 +32,34 @@ class Iface(object): """ pass - def getConfig(self, ): + def getConfig(self,): pass - def getPluginConfig(self, ): + def getPluginConfig(self,): pass - def pauseServer(self, ): + def pauseServer(self,): pass - def unpauseServer(self, ): + def unpauseServer(self,): pass - def togglePause(self, ): + def togglePause(self,): pass - def statusServer(self, ): + def statusServer(self,): pass - def freeSpace(self, ): + def freeSpace(self,): pass - def getServerVersion(self, ): + def getServerVersion(self,): pass - def kill(self, ): + def kill(self,): pass - def restart(self, ): + def restart(self,): pass def getLog(self, offset): @@ -69,13 +69,13 @@ class Iface(object): """ pass - def isTimeDownload(self, ): + def isTimeDownload(self,): pass - def isTimeReconnect(self, ): + def isTimeReconnect(self,): pass - def toggleReconnect(self, ): + def toggleReconnect(self,): pass def generatePackages(self, links): @@ -123,7 +123,7 @@ class Iface(object): """ pass - def statusDownloads(self, ): + def statusDownloads(self,): pass def getPackageData(self, pid): @@ -147,16 +147,16 @@ class Iface(object): """ pass - def getQueue(self, ): + def getQueue(self,): pass - def getCollector(self, ): + def getCollector(self,): pass - def getQueueData(self, ): + def getQueueData(self,): pass - def getCollectorData(self, ): + def getCollectorData(self,): pass def getPackageOrder(self, destination): @@ -255,7 +255,7 @@ class Iface(object): """ pass - def stopAllDownloads(self, ): + def stopAllDownloads(self,): pass def stopDownloads(self, fids): @@ -313,10 +313,10 @@ class Iface(object): """ pass - def deleteFinished(self, ): + def deleteFinished(self,): pass - def restartFailed(self, ): + def restartFailed(self,): pass def getEvents(self, uuid): @@ -333,7 +333,7 @@ class Iface(object): """ pass - def getAccountTypes(self, ): + def getAccountTypes(self,): pass def updateAccount(self, plugin, account, password, options): @@ -370,10 +370,10 @@ class Iface(object): """ pass - def getAllUserData(self, ): + def getAllUserData(self,): pass - def getServices(self, ): + def getServices(self,): pass def hasService(self, plugin, func): @@ -391,7 +391,7 @@ class Iface(object): """ pass - def getAllInfo(self, ): + def getAllInfo(self,): pass def getInfoByPlugin(self, plugin): @@ -401,7 +401,7 @@ class Iface(object): """ pass - def isCaptchaWaiting(self, ): + def isCaptchaWaiting(self,): pass def getCaptchaTask(self, exclusive): @@ -454,7 +454,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getConfigValue(self, ): + def recv_getConfigValue(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -490,7 +490,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_setConfigValue(self, ): + def recv_setConfigValue(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -502,18 +502,18 @@ class Client(Iface): self._iprot.readMessageEnd() return - def getConfig(self, ): + def getConfig(self,): self.send_getConfig() return self.recv_getConfig() - def send_getConfig(self, ): + def send_getConfig(self,): self._oprot.writeMessageBegin('getConfig', TMessageType.CALL, self._seqid) args = getConfig_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getConfig(self, ): + def recv_getConfig(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -527,18 +527,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getConfig failed: unknown result"); - def getPluginConfig(self, ): + def getPluginConfig(self,): self.send_getPluginConfig() return self.recv_getPluginConfig() - def send_getPluginConfig(self, ): + def send_getPluginConfig(self,): self._oprot.writeMessageBegin('getPluginConfig', TMessageType.CALL, self._seqid) args = getPluginConfig_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getPluginConfig(self, ): + def recv_getPluginConfig(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -552,18 +552,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getPluginConfig failed: unknown result"); - def pauseServer(self, ): + def pauseServer(self,): self.send_pauseServer() self.recv_pauseServer() - def send_pauseServer(self, ): + def send_pauseServer(self,): self._oprot.writeMessageBegin('pauseServer', TMessageType.CALL, self._seqid) args = pauseServer_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_pauseServer(self, ): + def recv_pauseServer(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -575,18 +575,18 @@ class Client(Iface): self._iprot.readMessageEnd() return - def unpauseServer(self, ): + def unpauseServer(self,): self.send_unpauseServer() self.recv_unpauseServer() - def send_unpauseServer(self, ): + def send_unpauseServer(self,): self._oprot.writeMessageBegin('unpauseServer', TMessageType.CALL, self._seqid) args = unpauseServer_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_unpauseServer(self, ): + def recv_unpauseServer(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -598,18 +598,18 @@ class Client(Iface): self._iprot.readMessageEnd() return - def togglePause(self, ): + def togglePause(self,): self.send_togglePause() return self.recv_togglePause() - def send_togglePause(self, ): + def send_togglePause(self,): self._oprot.writeMessageBegin('togglePause', TMessageType.CALL, self._seqid) args = togglePause_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_togglePause(self, ): + def recv_togglePause(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -623,18 +623,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "togglePause failed: unknown result"); - def statusServer(self, ): + def statusServer(self,): self.send_statusServer() return self.recv_statusServer() - def send_statusServer(self, ): + def send_statusServer(self,): self._oprot.writeMessageBegin('statusServer', TMessageType.CALL, self._seqid) args = statusServer_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_statusServer(self, ): + def recv_statusServer(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -648,18 +648,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "statusServer failed: unknown result"); - def freeSpace(self, ): + def freeSpace(self,): self.send_freeSpace() return self.recv_freeSpace() - def send_freeSpace(self, ): + def send_freeSpace(self,): self._oprot.writeMessageBegin('freeSpace', TMessageType.CALL, self._seqid) args = freeSpace_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_freeSpace(self, ): + def recv_freeSpace(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -673,18 +673,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "freeSpace failed: unknown result"); - def getServerVersion(self, ): + def getServerVersion(self,): self.send_getServerVersion() return self.recv_getServerVersion() - def send_getServerVersion(self, ): + def send_getServerVersion(self,): self._oprot.writeMessageBegin('getServerVersion', TMessageType.CALL, self._seqid) args = getServerVersion_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getServerVersion(self, ): + def recv_getServerVersion(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -698,18 +698,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getServerVersion failed: unknown result"); - def kill(self, ): + def kill(self,): self.send_kill() self.recv_kill() - def send_kill(self, ): + def send_kill(self,): self._oprot.writeMessageBegin('kill', TMessageType.CALL, self._seqid) args = kill_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_kill(self, ): + def recv_kill(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -721,18 +721,18 @@ class Client(Iface): self._iprot.readMessageEnd() return - def restart(self, ): + def restart(self,): self.send_restart() self.recv_restart() - def send_restart(self, ): + def send_restart(self,): self._oprot.writeMessageBegin('restart', TMessageType.CALL, self._seqid) args = restart_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_restart(self, ): + def recv_restart(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -760,7 +760,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getLog(self, ): + def recv_getLog(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -774,18 +774,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getLog failed: unknown result"); - def isTimeDownload(self, ): + def isTimeDownload(self,): self.send_isTimeDownload() return self.recv_isTimeDownload() - def send_isTimeDownload(self, ): + def send_isTimeDownload(self,): self._oprot.writeMessageBegin('isTimeDownload', TMessageType.CALL, self._seqid) args = isTimeDownload_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_isTimeDownload(self, ): + def recv_isTimeDownload(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -799,18 +799,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "isTimeDownload failed: unknown result"); - def isTimeReconnect(self, ): + def isTimeReconnect(self,): self.send_isTimeReconnect() return self.recv_isTimeReconnect() - def send_isTimeReconnect(self, ): + def send_isTimeReconnect(self,): self._oprot.writeMessageBegin('isTimeReconnect', TMessageType.CALL, self._seqid) args = isTimeReconnect_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_isTimeReconnect(self, ): + def recv_isTimeReconnect(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -824,18 +824,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "isTimeReconnect failed: unknown result"); - def toggleReconnect(self, ): + def toggleReconnect(self,): self.send_toggleReconnect() return self.recv_toggleReconnect() - def send_toggleReconnect(self, ): + def send_toggleReconnect(self,): self._oprot.writeMessageBegin('toggleReconnect', TMessageType.CALL, self._seqid) args = toggleReconnect_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_toggleReconnect(self, ): + def recv_toggleReconnect(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -865,7 +865,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_generatePackages(self, ): + def recv_generatePackages(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -895,7 +895,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_checkURLs(self, ): + def recv_checkURLs(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -927,7 +927,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_parseURLs(self, ): + def recv_parseURLs(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -957,7 +957,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_checkOnlineStatus(self, ): + def recv_checkOnlineStatus(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -991,7 +991,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_checkOnlineStatusContainer(self, ): + def recv_checkOnlineStatusContainer(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1021,7 +1021,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_pollResults(self, ): + def recv_pollResults(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1035,18 +1035,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "pollResults failed: unknown result"); - def statusDownloads(self, ): + def statusDownloads(self,): self.send_statusDownloads() return self.recv_statusDownloads() - def send_statusDownloads(self, ): + def send_statusDownloads(self,): self._oprot.writeMessageBegin('statusDownloads', TMessageType.CALL, self._seqid) args = statusDownloads_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_statusDownloads(self, ): + def recv_statusDownloads(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1076,7 +1076,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getPackageData(self, ): + def recv_getPackageData(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1108,7 +1108,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getPackageInfo(self, ): + def recv_getPackageInfo(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1140,7 +1140,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getFileData(self, ): + def recv_getFileData(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1156,18 +1156,18 @@ class Client(Iface): raise result.e raise TApplicationException(TApplicationException.MISSING_RESULT, "getFileData failed: unknown result"); - def getQueue(self, ): + def getQueue(self,): self.send_getQueue() return self.recv_getQueue() - def send_getQueue(self, ): + def send_getQueue(self,): self._oprot.writeMessageBegin('getQueue', TMessageType.CALL, self._seqid) args = getQueue_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getQueue(self, ): + def recv_getQueue(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1181,18 +1181,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getQueue failed: unknown result"); - def getCollector(self, ): + def getCollector(self,): self.send_getCollector() return self.recv_getCollector() - def send_getCollector(self, ): + def send_getCollector(self,): self._oprot.writeMessageBegin('getCollector', TMessageType.CALL, self._seqid) args = getCollector_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getCollector(self, ): + def recv_getCollector(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1206,18 +1206,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getCollector failed: unknown result"); - def getQueueData(self, ): + def getQueueData(self,): self.send_getQueueData() return self.recv_getQueueData() - def send_getQueueData(self, ): + def send_getQueueData(self,): self._oprot.writeMessageBegin('getQueueData', TMessageType.CALL, self._seqid) args = getQueueData_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getQueueData(self, ): + def recv_getQueueData(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1231,18 +1231,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getQueueData failed: unknown result"); - def getCollectorData(self, ): + def getCollectorData(self,): self.send_getCollectorData() return self.recv_getCollectorData() - def send_getCollectorData(self, ): + def send_getCollectorData(self,): self._oprot.writeMessageBegin('getCollectorData', TMessageType.CALL, self._seqid) args = getCollectorData_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getCollectorData(self, ): + def recv_getCollectorData(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1272,7 +1272,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getPackageOrder(self, ): + def recv_getPackageOrder(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1302,7 +1302,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getFileOrder(self, ): + def recv_getFileOrder(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1334,7 +1334,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_generateAndAddPackages(self, ): + def recv_generateAndAddPackages(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1368,7 +1368,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_addPackage(self, ): + def recv_addPackage(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1400,7 +1400,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_addFiles(self, ): + def recv_addFiles(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1430,7 +1430,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_uploadContainer(self, ): + def recv_uploadContainer(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1458,7 +1458,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_deleteFiles(self, ): + def recv_deleteFiles(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1486,7 +1486,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_deletePackages(self, ): + def recv_deletePackages(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1514,7 +1514,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_pushToQueue(self, ): + def recv_pushToQueue(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1542,7 +1542,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_pullFromQueue(self, ): + def recv_pullFromQueue(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1570,7 +1570,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_restartPackage(self, ): + def recv_restartPackage(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1598,7 +1598,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_restartFile(self, ): + def recv_restartFile(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1626,7 +1626,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_recheckPackage(self, ): + def recv_recheckPackage(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1638,18 +1638,18 @@ class Client(Iface): self._iprot.readMessageEnd() return - def stopAllDownloads(self, ): + def stopAllDownloads(self,): self.send_stopAllDownloads() self.recv_stopAllDownloads() - def send_stopAllDownloads(self, ): + def send_stopAllDownloads(self,): self._oprot.writeMessageBegin('stopAllDownloads', TMessageType.CALL, self._seqid) args = stopAllDownloads_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_stopAllDownloads(self, ): + def recv_stopAllDownloads(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1677,7 +1677,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_stopDownloads(self, ): + def recv_stopDownloads(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1707,7 +1707,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_setPackageName(self, ): + def recv_setPackageName(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1737,7 +1737,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_movePackage(self, ): + def recv_movePackage(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1767,7 +1767,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_moveFiles(self, ): + def recv_moveFiles(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1797,7 +1797,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_orderPackage(self, ): + def recv_orderPackage(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1827,7 +1827,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_orderFile(self, ): + def recv_orderFile(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1857,7 +1857,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_setPackageData(self, ): + def recv_setPackageData(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1871,18 +1871,18 @@ class Client(Iface): raise result.e return - def deleteFinished(self, ): + def deleteFinished(self,): self.send_deleteFinished() return self.recv_deleteFinished() - def send_deleteFinished(self, ): + def send_deleteFinished(self,): self._oprot.writeMessageBegin('deleteFinished', TMessageType.CALL, self._seqid) args = deleteFinished_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_deleteFinished(self, ): + def recv_deleteFinished(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1896,18 +1896,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteFinished failed: unknown result"); - def restartFailed(self, ): + def restartFailed(self,): self.send_restartFailed() self.recv_restartFailed() - def send_restartFailed(self, ): + def send_restartFailed(self,): self._oprot.writeMessageBegin('restartFailed', TMessageType.CALL, self._seqid) args = restartFailed_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_restartFailed(self, ): + def recv_restartFailed(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1935,7 +1935,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getEvents(self, ): + def recv_getEvents(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1965,7 +1965,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getAccounts(self, ): + def recv_getAccounts(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -1979,18 +1979,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getAccounts failed: unknown result"); - def getAccountTypes(self, ): + def getAccountTypes(self,): self.send_getAccountTypes() return self.recv_getAccountTypes() - def send_getAccountTypes(self, ): + def send_getAccountTypes(self,): self._oprot.writeMessageBegin('getAccountTypes', TMessageType.CALL, self._seqid) args = getAccountTypes_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getAccountTypes(self, ): + def recv_getAccountTypes(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2026,7 +2026,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_updateAccount(self, ): + def recv_updateAccount(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2056,7 +2056,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_removeAccount(self, ): + def recv_removeAccount(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2086,7 +2086,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_login(self, ): + def recv_login(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2118,7 +2118,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getUserData(self, ): + def recv_getUserData(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2132,18 +2132,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserData failed: unknown result"); - def getAllUserData(self, ): + def getAllUserData(self,): self.send_getAllUserData() return self.recv_getAllUserData() - def send_getAllUserData(self, ): + def send_getAllUserData(self,): self._oprot.writeMessageBegin('getAllUserData', TMessageType.CALL, self._seqid) args = getAllUserData_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getAllUserData(self, ): + def recv_getAllUserData(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2157,18 +2157,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserData failed: unknown result"); - def getServices(self, ): + def getServices(self,): self.send_getServices() return self.recv_getServices() - def send_getServices(self, ): + def send_getServices(self,): self._oprot.writeMessageBegin('getServices', TMessageType.CALL, self._seqid) args = getServices_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getServices(self, ): + def recv_getServices(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2200,7 +2200,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_hasService(self, ): + def recv_hasService(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2230,7 +2230,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_call(self, ): + def recv_call(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2248,18 +2248,18 @@ class Client(Iface): raise result.e raise TApplicationException(TApplicationException.MISSING_RESULT, "call failed: unknown result"); - def getAllInfo(self, ): + def getAllInfo(self,): self.send_getAllInfo() return self.recv_getAllInfo() - def send_getAllInfo(self, ): + def send_getAllInfo(self,): self._oprot.writeMessageBegin('getAllInfo', TMessageType.CALL, self._seqid) args = getAllInfo_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getAllInfo(self, ): + def recv_getAllInfo(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2289,7 +2289,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getInfoByPlugin(self, ): + def recv_getInfoByPlugin(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2303,18 +2303,18 @@ class Client(Iface): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getInfoByPlugin failed: unknown result"); - def isCaptchaWaiting(self, ): + def isCaptchaWaiting(self,): self.send_isCaptchaWaiting() return self.recv_isCaptchaWaiting() - def send_isCaptchaWaiting(self, ): + def send_isCaptchaWaiting(self,): self._oprot.writeMessageBegin('isCaptchaWaiting', TMessageType.CALL, self._seqid) args = isCaptchaWaiting_args() args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_isCaptchaWaiting(self, ): + def recv_isCaptchaWaiting(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2344,7 +2344,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getCaptchaTask(self, ): + def recv_getCaptchaTask(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2374,7 +2374,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_getCaptchaTaskStatus(self, ): + def recv_getCaptchaTaskStatus(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -2406,7 +2406,7 @@ class Client(Iface): self._oprot.writeMessageEnd() self._oprot.trans.flush() - def recv_setCaptchaResult(self, ): + def recv_setCaptchaResult(self,): (fname, mtype, rseqid) = self._iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() @@ -3307,7 +3307,7 @@ class getConfigValue_args(TBase): - section """ - __slots__ = [ + __slots__ = [ 'category', 'option', 'section', @@ -3315,9 +3315,9 @@ class getConfigValue_args(TBase): thrift_spec = ( None, # 0 - (1, TType.STRING, 'category', None, None, ), # 1 - (2, TType.STRING, 'option', None, None, ), # 2 - (3, TType.STRING, 'section', None, None, ), # 3 + (1, TType.STRING, 'category', None, None,), # 1 + (2, TType.STRING, 'option', None, None,), # 2 + (3, TType.STRING, 'section', None, None,), # 3 ) def __init__(self, category=None, option=None, section=None,): @@ -3332,12 +3332,12 @@ class getConfigValue_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.STRING, 'success', None, None, ), # 0 + (0, TType.STRING, 'success', None, None,), # 0 ) def __init__(self, success=None,): @@ -3353,7 +3353,7 @@ class setConfigValue_args(TBase): - section """ - __slots__ = [ + __slots__ = [ 'category', 'option', 'value', @@ -3362,10 +3362,10 @@ class setConfigValue_args(TBase): thrift_spec = ( None, # 0 - (1, TType.STRING, 'category', None, None, ), # 1 - (2, TType.STRING, 'option', None, None, ), # 2 - (3, TType.STRING, 'value', None, None, ), # 3 - (4, TType.STRING, 'section', None, None, ), # 4 + (1, TType.STRING, 'category', None, None,), # 1 + (2, TType.STRING, 'option', None, None,), # 2 + (3, TType.STRING, 'value', None, None,), # 3 + (4, TType.STRING, 'section', None, None,), # 4 ) def __init__(self, category=None, option=None, value=None, section=None,): @@ -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,12 +3399,12 @@ class getConfig_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.MAP, 'success', (TType.STRING,None,TType.STRUCT,(ConfigSection, ConfigSection.thrift_spec)), None, ), # 0 + (0, TType.MAP, 'success', (TType.STRING, None, TType.STRUCT, (ConfigSection, ConfigSection.thrift_spec)), None,), # 0 ) def __init__(self, success=None,): @@ -3413,7 +3413,7 @@ class getConfig_result(TBase): class getPluginConfig_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -3426,12 +3426,12 @@ class getPluginConfig_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.MAP, 'success', (TType.STRING,None,TType.STRUCT,(ConfigSection, ConfigSection.thrift_spec)), None, ), # 0 + (0, TType.MAP, 'success', (TType.STRING, None, TType.STRUCT, (ConfigSection, ConfigSection.thrift_spec)), None,), # 0 ) def __init__(self, success=None,): @@ -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,12 +3489,12 @@ class togglePause_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.BOOL, 'success', None, None, ), # 0 + (0, TType.BOOL, 'success', None, None,), # 0 ) def __init__(self, success=None,): @@ -3503,7 +3503,7 @@ class togglePause_result(TBase): class statusServer_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -3516,12 +3516,12 @@ class statusServer_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.STRUCT, 'success', (ServerStatus, ServerStatus.thrift_spec), None, ), # 0 + (0, TType.STRUCT, 'success', (ServerStatus, ServerStatus.thrift_spec), None,), # 0 ) def __init__(self, success=None,): @@ -3530,7 +3530,7 @@ class statusServer_result(TBase): class freeSpace_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -3543,12 +3543,12 @@ class freeSpace_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.I64, 'success', None, None, ), # 0 + (0, TType.I64, 'success', None, None,), # 0 ) def __init__(self, success=None,): @@ -3557,7 +3557,7 @@ class freeSpace_result(TBase): class getServerVersion_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -3570,12 +3570,12 @@ class getServerVersion_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.STRING, 'success', None, None, ), # 0 + (0, TType.STRING, 'success', None, None,), # 0 ) def __init__(self, success=None,): @@ -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,13 +3624,13 @@ class getLog_args(TBase): - offset """ - __slots__ = [ + __slots__ = [ 'offset', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'offset', None, None, ), # 1 + (1, TType.I32, 'offset', None, None,), # 1 ) def __init__(self, offset=None,): @@ -3643,12 +3643,12 @@ class getLog_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.LIST, 'success', (TType.STRING,None), None, ), # 0 + (0, TType.LIST, 'success', (TType.STRING, None), None,), # 0 ) def __init__(self, success=None,): @@ -3657,7 +3657,7 @@ class getLog_result(TBase): class isTimeDownload_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -3670,12 +3670,12 @@ class isTimeDownload_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.BOOL, 'success', None, None, ), # 0 + (0, TType.BOOL, 'success', None, None,), # 0 ) def __init__(self, success=None,): @@ -3684,7 +3684,7 @@ class isTimeDownload_result(TBase): class isTimeReconnect_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -3697,12 +3697,12 @@ class isTimeReconnect_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.BOOL, 'success', None, None, ), # 0 + (0, TType.BOOL, 'success', None, None,), # 0 ) def __init__(self, success=None,): @@ -3711,7 +3711,7 @@ class isTimeReconnect_result(TBase): class toggleReconnect_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -3724,12 +3724,12 @@ class toggleReconnect_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.BOOL, 'success', None, None, ), # 0 + (0, TType.BOOL, 'success', None, None,), # 0 ) def __init__(self, success=None,): @@ -3742,13 +3742,13 @@ class generatePackages_args(TBase): - links """ - __slots__ = [ + __slots__ = [ 'links', ] thrift_spec = ( None, # 0 - (1, TType.LIST, 'links', (TType.STRING,None), None, ), # 1 + (1, TType.LIST, 'links', (TType.STRING, None), None,), # 1 ) def __init__(self, links=None,): @@ -3761,12 +3761,12 @@ class generatePackages_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.MAP, 'success', (TType.STRING,None,TType.LIST,(TType.STRING,None)), None, ), # 0 + (0, TType.MAP, 'success', (TType.STRING, None, TType.LIST, (TType.STRING, None)), None,), # 0 ) def __init__(self, success=None,): @@ -3779,13 +3779,13 @@ class checkURLs_args(TBase): - urls """ - __slots__ = [ + __slots__ = [ 'urls', ] thrift_spec = ( None, # 0 - (1, TType.LIST, 'urls', (TType.STRING,None), None, ), # 1 + (1, TType.LIST, 'urls', (TType.STRING, None), None,), # 1 ) def __init__(self, urls=None,): @@ -3798,12 +3798,12 @@ class checkURLs_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.MAP, 'success', (TType.STRING,None,TType.LIST,(TType.STRING,None)), None, ), # 0 + (0, TType.MAP, 'success', (TType.STRING, None, TType.LIST, (TType.STRING, None)), None,), # 0 ) def __init__(self, success=None,): @@ -3817,15 +3817,15 @@ class parseURLs_args(TBase): - url """ - __slots__ = [ + __slots__ = [ 'html', 'url', ] thrift_spec = ( None, # 0 - (1, TType.STRING, 'html', None, None, ), # 1 - (2, TType.STRING, 'url', None, None, ), # 2 + (1, TType.STRING, 'html', None, None,), # 1 + (2, TType.STRING, 'url', None, None,), # 2 ) def __init__(self, html=None, url=None,): @@ -3839,12 +3839,12 @@ class parseURLs_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.MAP, 'success', (TType.STRING,None,TType.LIST,(TType.STRING,None)), None, ), # 0 + (0, TType.MAP, 'success', (TType.STRING, None, TType.LIST, (TType.STRING, None)), None,), # 0 ) def __init__(self, success=None,): @@ -3857,13 +3857,13 @@ class checkOnlineStatus_args(TBase): - urls """ - __slots__ = [ + __slots__ = [ 'urls', ] thrift_spec = ( None, # 0 - (1, TType.LIST, 'urls', (TType.STRING,None), None, ), # 1 + (1, TType.LIST, 'urls', (TType.STRING, None), None,), # 1 ) def __init__(self, urls=None,): @@ -3876,12 +3876,12 @@ class checkOnlineStatus_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.STRUCT, 'success', (OnlineCheck, OnlineCheck.thrift_spec), None, ), # 0 + (0, TType.STRUCT, 'success', (OnlineCheck, OnlineCheck.thrift_spec), None,), # 0 ) def __init__(self, success=None,): @@ -3896,7 +3896,7 @@ class checkOnlineStatusContainer_args(TBase): - data """ - __slots__ = [ + __slots__ = [ 'urls', 'filename', 'data', @@ -3904,9 +3904,9 @@ class checkOnlineStatusContainer_args(TBase): thrift_spec = ( None, # 0 - (1, TType.LIST, 'urls', (TType.STRING,None), None, ), # 1 - (2, TType.STRING, 'filename', None, None, ), # 2 - (3, TType.STRING, 'data', None, None, ), # 3 + (1, TType.LIST, 'urls', (TType.STRING, None), None,), # 1 + (2, TType.STRING, 'filename', None, None,), # 2 + (3, TType.STRING, 'data', None, None,), # 3 ) def __init__(self, urls=None, filename=None, data=None,): @@ -3921,12 +3921,12 @@ class checkOnlineStatusContainer_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.STRUCT, 'success', (OnlineCheck, OnlineCheck.thrift_spec), None, ), # 0 + (0, TType.STRUCT, 'success', (OnlineCheck, OnlineCheck.thrift_spec), None,), # 0 ) def __init__(self, success=None,): @@ -3939,13 +3939,13 @@ class pollResults_args(TBase): - rid """ - __slots__ = [ + __slots__ = [ 'rid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'rid', None, None, ), # 1 + (1, TType.I32, 'rid', None, None,), # 1 ) def __init__(self, rid=None,): @@ -3958,12 +3958,12 @@ class pollResults_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.STRUCT, 'success', (OnlineCheck, OnlineCheck.thrift_spec), None, ), # 0 + (0, TType.STRUCT, 'success', (OnlineCheck, OnlineCheck.thrift_spec), None,), # 0 ) def __init__(self, success=None,): @@ -3972,7 +3972,7 @@ class pollResults_result(TBase): class statusDownloads_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -3985,12 +3985,12 @@ class statusDownloads_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.LIST, 'success', (TType.STRUCT,(DownloadInfo, DownloadInfo.thrift_spec)), None, ), # 0 + (0, TType.LIST, 'success', (TType.STRUCT, (DownloadInfo, DownloadInfo.thrift_spec)), None,), # 0 ) def __init__(self, success=None,): @@ -4003,13 +4003,13 @@ class getPackageData_args(TBase): - pid """ - __slots__ = [ + __slots__ = [ 'pid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 + (1, TType.I32, 'pid', None, None,), # 1 ) def __init__(self, pid=None,): @@ -4023,14 +4023,14 @@ class getPackageData_result(TBase): - e """ - __slots__ = [ + __slots__ = [ 'success', 'e', ] thrift_spec = ( - (0, TType.STRUCT, 'success', (PackageData, PackageData.thrift_spec), None, ), # 0 - (1, TType.STRUCT, 'e', (PackageDoesNotExists, PackageDoesNotExists.thrift_spec), None, ), # 1 + (0, TType.STRUCT, 'success', (PackageData, PackageData.thrift_spec), None,), # 0 + (1, TType.STRUCT, 'e', (PackageDoesNotExists, PackageDoesNotExists.thrift_spec), None,), # 1 ) def __init__(self, success=None, e=None,): @@ -4044,13 +4044,13 @@ class getPackageInfo_args(TBase): - pid """ - __slots__ = [ + __slots__ = [ 'pid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 + (1, TType.I32, 'pid', None, None,), # 1 ) def __init__(self, pid=None,): @@ -4064,14 +4064,14 @@ class getPackageInfo_result(TBase): - e """ - __slots__ = [ + __slots__ = [ 'success', 'e', ] thrift_spec = ( - (0, TType.STRUCT, 'success', (PackageData, PackageData.thrift_spec), None, ), # 0 - (1, TType.STRUCT, 'e', (PackageDoesNotExists, PackageDoesNotExists.thrift_spec), None, ), # 1 + (0, TType.STRUCT, 'success', (PackageData, PackageData.thrift_spec), None,), # 0 + (1, TType.STRUCT, 'e', (PackageDoesNotExists, PackageDoesNotExists.thrift_spec), None,), # 1 ) def __init__(self, success=None, e=None,): @@ -4085,13 +4085,13 @@ class getFileData_args(TBase): - fid """ - __slots__ = [ + __slots__ = [ 'fid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'fid', None, None, ), # 1 + (1, TType.I32, 'fid', None, None,), # 1 ) def __init__(self, fid=None,): @@ -4105,14 +4105,14 @@ class getFileData_result(TBase): - e """ - __slots__ = [ + __slots__ = [ 'success', 'e', ] thrift_spec = ( - (0, TType.STRUCT, 'success', (FileData, FileData.thrift_spec), None, ), # 0 - (1, TType.STRUCT, 'e', (FileDoesNotExists, FileDoesNotExists.thrift_spec), None, ), # 1 + (0, TType.STRUCT, 'success', (FileData, FileData.thrift_spec), None,), # 0 + (1, TType.STRUCT, 'e', (FileDoesNotExists, FileDoesNotExists.thrift_spec), None,), # 1 ) def __init__(self, success=None, e=None,): @@ -4122,7 +4122,7 @@ class getFileData_result(TBase): class getQueue_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4135,12 +4135,12 @@ class getQueue_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.LIST, 'success', (TType.STRUCT,(PackageData, PackageData.thrift_spec)), None, ), # 0 + (0, TType.LIST, 'success', (TType.STRUCT, (PackageData, PackageData.thrift_spec)), None,), # 0 ) def __init__(self, success=None,): @@ -4149,7 +4149,7 @@ class getQueue_result(TBase): class getCollector_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4162,12 +4162,12 @@ class getCollector_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.LIST, 'success', (TType.STRUCT,(PackageData, PackageData.thrift_spec)), None, ), # 0 + (0, TType.LIST, 'success', (TType.STRUCT, (PackageData, PackageData.thrift_spec)), None,), # 0 ) def __init__(self, success=None,): @@ -4176,7 +4176,7 @@ class getCollector_result(TBase): class getQueueData_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4189,12 +4189,12 @@ class getQueueData_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.LIST, 'success', (TType.STRUCT,(PackageData, PackageData.thrift_spec)), None, ), # 0 + (0, TType.LIST, 'success', (TType.STRUCT, (PackageData, PackageData.thrift_spec)), None,), # 0 ) def __init__(self, success=None,): @@ -4203,7 +4203,7 @@ class getQueueData_result(TBase): class getCollectorData_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4216,12 +4216,12 @@ class getCollectorData_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.LIST, 'success', (TType.STRUCT,(PackageData, PackageData.thrift_spec)), None, ), # 0 + (0, TType.LIST, 'success', (TType.STRUCT, (PackageData, PackageData.thrift_spec)), None,), # 0 ) def __init__(self, success=None,): @@ -4234,13 +4234,13 @@ class getPackageOrder_args(TBase): - destination """ - __slots__ = [ + __slots__ = [ 'destination', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'destination', None, None, ), # 1 + (1, TType.I32, 'destination', None, None,), # 1 ) def __init__(self, destination=None,): @@ -4253,12 +4253,12 @@ class getPackageOrder_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.MAP, 'success', (TType.I16,None,TType.I32,None), None, ), # 0 + (0, TType.MAP, 'success', (TType.I16, None, TType.I32, None), None,), # 0 ) def __init__(self, success=None,): @@ -4271,13 +4271,13 @@ class getFileOrder_args(TBase): - pid """ - __slots__ = [ + __slots__ = [ 'pid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 + (1, TType.I32, 'pid', None, None,), # 1 ) def __init__(self, pid=None,): @@ -4290,12 +4290,12 @@ class getFileOrder_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.MAP, 'success', (TType.I16,None,TType.I32,None), None, ), # 0 + (0, TType.MAP, 'success', (TType.I16, None, TType.I32, None), None,), # 0 ) def __init__(self, success=None,): @@ -4309,15 +4309,15 @@ class generateAndAddPackages_args(TBase): - dest """ - __slots__ = [ + __slots__ = [ 'links', 'dest', ] thrift_spec = ( None, # 0 - (1, TType.LIST, 'links', (TType.STRING,None), None, ), # 1 - (2, TType.I32, 'dest', None, None, ), # 2 + (1, TType.LIST, 'links', (TType.STRING, None), None,), # 1 + (2, TType.I32, 'dest', None, None,), # 2 ) def __init__(self, links=None, dest=None,): @@ -4331,12 +4331,12 @@ class generateAndAddPackages_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.LIST, 'success', (TType.I32,None), None, ), # 0 + (0, TType.LIST, 'success', (TType.I32, None), None,), # 0 ) def __init__(self, success=None,): @@ -4351,7 +4351,7 @@ class addPackage_args(TBase): - dest """ - __slots__ = [ + __slots__ = [ 'name', 'links', 'dest', @@ -4359,9 +4359,9 @@ class addPackage_args(TBase): thrift_spec = ( None, # 0 - (1, TType.STRING, 'name', None, None, ), # 1 - (2, TType.LIST, 'links', (TType.STRING,None), None, ), # 2 - (3, TType.I32, 'dest', None, None, ), # 3 + (1, TType.STRING, 'name', None, None,), # 1 + (2, TType.LIST, 'links', (TType.STRING, None), None,), # 2 + (3, TType.I32, 'dest', None, None,), # 3 ) def __init__(self, name=None, links=None, dest=None,): @@ -4376,12 +4376,12 @@ class addPackage_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.I32, 'success', None, None, ), # 0 + (0, TType.I32, 'success', None, None,), # 0 ) def __init__(self, success=None,): @@ -4395,15 +4395,15 @@ class addFiles_args(TBase): - links """ - __slots__ = [ + __slots__ = [ 'pid', 'links', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 - (2, TType.LIST, 'links', (TType.STRING,None), None, ), # 2 + (1, TType.I32, 'pid', None, None,), # 1 + (2, TType.LIST, 'links', (TType.STRING, None), None,), # 2 ) def __init__(self, pid=None, links=None,): @@ -4413,7 +4413,7 @@ class addFiles_args(TBase): class addFiles_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4427,15 +4427,15 @@ class uploadContainer_args(TBase): - data """ - __slots__ = [ + __slots__ = [ 'filename', 'data', ] thrift_spec = ( None, # 0 - (1, TType.STRING, 'filename', None, None, ), # 1 - (2, TType.STRING, 'data', None, None, ), # 2 + (1, TType.STRING, 'filename', None, None,), # 1 + (2, TType.STRING, 'data', None, None,), # 2 ) def __init__(self, filename=None, data=None,): @@ -4445,7 +4445,7 @@ class uploadContainer_args(TBase): class uploadContainer_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4458,13 +4458,13 @@ class deleteFiles_args(TBase): - fids """ - __slots__ = [ + __slots__ = [ 'fids', ] thrift_spec = ( None, # 0 - (1, TType.LIST, 'fids', (TType.I32,None), None, ), # 1 + (1, TType.LIST, 'fids', (TType.I32, None), None,), # 1 ) def __init__(self, fids=None,): @@ -4473,7 +4473,7 @@ class deleteFiles_args(TBase): class deleteFiles_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4486,13 +4486,13 @@ class deletePackages_args(TBase): - pids """ - __slots__ = [ + __slots__ = [ 'pids', ] thrift_spec = ( None, # 0 - (1, TType.LIST, 'pids', (TType.I32,None), None, ), # 1 + (1, TType.LIST, 'pids', (TType.I32, None), None,), # 1 ) def __init__(self, pids=None,): @@ -4501,7 +4501,7 @@ class deletePackages_args(TBase): class deletePackages_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4514,13 +4514,13 @@ class pushToQueue_args(TBase): - pid """ - __slots__ = [ + __slots__ = [ 'pid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 + (1, TType.I32, 'pid', None, None,), # 1 ) def __init__(self, pid=None,): @@ -4529,7 +4529,7 @@ class pushToQueue_args(TBase): class pushToQueue_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4542,13 +4542,13 @@ class pullFromQueue_args(TBase): - pid """ - __slots__ = [ + __slots__ = [ 'pid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 + (1, TType.I32, 'pid', None, None,), # 1 ) def __init__(self, pid=None,): @@ -4557,7 +4557,7 @@ class pullFromQueue_args(TBase): class pullFromQueue_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4570,13 +4570,13 @@ class restartPackage_args(TBase): - pid """ - __slots__ = [ + __slots__ = [ 'pid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 + (1, TType.I32, 'pid', None, None,), # 1 ) def __init__(self, pid=None,): @@ -4585,7 +4585,7 @@ class restartPackage_args(TBase): class restartPackage_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4598,13 +4598,13 @@ class restartFile_args(TBase): - fid """ - __slots__ = [ + __slots__ = [ 'fid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'fid', None, None, ), # 1 + (1, TType.I32, 'fid', None, None,), # 1 ) def __init__(self, fid=None,): @@ -4613,7 +4613,7 @@ class restartFile_args(TBase): class restartFile_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4626,13 +4626,13 @@ class recheckPackage_args(TBase): - pid """ - __slots__ = [ + __slots__ = [ 'pid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 + (1, TType.I32, 'pid', None, None,), # 1 ) def __init__(self, pid=None,): @@ -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,13 +4672,13 @@ class stopDownloads_args(TBase): - fids """ - __slots__ = [ + __slots__ = [ 'fids', ] thrift_spec = ( None, # 0 - (1, TType.LIST, 'fids', (TType.I32,None), None, ), # 1 + (1, TType.LIST, 'fids', (TType.I32, None), None,), # 1 ) def __init__(self, fids=None,): @@ -4687,7 +4687,7 @@ class stopDownloads_args(TBase): class stopDownloads_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4701,15 +4701,15 @@ class setPackageName_args(TBase): - name """ - __slots__ = [ + __slots__ = [ 'pid', 'name', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 - (2, TType.STRING, 'name', None, None, ), # 2 + (1, TType.I32, 'pid', None, None,), # 1 + (2, TType.STRING, 'name', None, None,), # 2 ) def __init__(self, pid=None, name=None,): @@ -4719,7 +4719,7 @@ class setPackageName_args(TBase): class setPackageName_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4733,15 +4733,15 @@ class movePackage_args(TBase): - pid """ - __slots__ = [ + __slots__ = [ 'destination', 'pid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'destination', None, None, ), # 1 - (2, TType.I32, 'pid', None, None, ), # 2 + (1, TType.I32, 'destination', None, None,), # 1 + (2, TType.I32, 'pid', None, None,), # 2 ) def __init__(self, destination=None, pid=None,): @@ -4751,7 +4751,7 @@ class movePackage_args(TBase): class movePackage_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4765,15 +4765,15 @@ class moveFiles_args(TBase): - pid """ - __slots__ = [ + __slots__ = [ 'fids', 'pid', ] thrift_spec = ( None, # 0 - (1, TType.LIST, 'fids', (TType.I32,None), None, ), # 1 - (2, TType.I32, 'pid', None, None, ), # 2 + (1, TType.LIST, 'fids', (TType.I32, None), None,), # 1 + (2, TType.I32, 'pid', None, None,), # 2 ) def __init__(self, fids=None, pid=None,): @@ -4783,7 +4783,7 @@ class moveFiles_args(TBase): class moveFiles_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4797,15 +4797,15 @@ class orderPackage_args(TBase): - position """ - __slots__ = [ + __slots__ = [ 'pid', 'position', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 - (2, TType.I16, 'position', None, None, ), # 2 + (1, TType.I32, 'pid', None, None,), # 1 + (2, TType.I16, 'position', None, None,), # 2 ) def __init__(self, pid=None, position=None,): @@ -4815,7 +4815,7 @@ class orderPackage_args(TBase): class orderPackage_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4829,15 +4829,15 @@ class orderFile_args(TBase): - position """ - __slots__ = [ + __slots__ = [ 'fid', 'position', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'fid', None, None, ), # 1 - (2, TType.I16, 'position', None, None, ), # 2 + (1, TType.I32, 'fid', None, None,), # 1 + (2, TType.I16, 'position', None, None,), # 2 ) def __init__(self, fid=None, position=None,): @@ -4847,7 +4847,7 @@ class orderFile_args(TBase): class orderFile_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4861,15 +4861,15 @@ class setPackageData_args(TBase): - data """ - __slots__ = [ + __slots__ = [ 'pid', 'data', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 - (2, TType.MAP, 'data', (TType.STRING,None,TType.STRING,None), None, ), # 2 + (1, TType.I32, 'pid', None, None,), # 1 + (2, TType.MAP, 'data', (TType.STRING, None, TType.STRING, None), None,), # 2 ) def __init__(self, pid=None, data=None,): @@ -4883,13 +4883,13 @@ class setPackageData_result(TBase): - e """ - __slots__ = [ + __slots__ = [ 'e', ] thrift_spec = ( None, # 0 - (1, TType.STRUCT, 'e', (PackageDoesNotExists, PackageDoesNotExists.thrift_spec), None, ), # 1 + (1, TType.STRUCT, 'e', (PackageDoesNotExists, PackageDoesNotExists.thrift_spec), None,), # 1 ) def __init__(self, e=None,): @@ -4898,7 +4898,7 @@ class setPackageData_result(TBase): class deleteFinished_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -4911,12 +4911,12 @@ class deleteFinished_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.LIST, 'success', (TType.I32,None), None, ), # 0 + (0, TType.LIST, 'success', (TType.I32, None), None,), # 0 ) def __init__(self, success=None,): @@ -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,13 +4947,13 @@ class getEvents_args(TBase): - uuid """ - __slots__ = [ + __slots__ = [ 'uuid', ] thrift_spec = ( None, # 0 - (1, TType.STRING, 'uuid', None, None, ), # 1 + (1, TType.STRING, 'uuid', None, None,), # 1 ) def __init__(self, uuid=None,): @@ -4966,12 +4966,12 @@ class getEvents_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.LIST, 'success', (TType.STRUCT,(EventInfo, EventInfo.thrift_spec)), None, ), # 0 + (0, TType.LIST, 'success', (TType.STRUCT, (EventInfo, EventInfo.thrift_spec)), None,), # 0 ) def __init__(self, success=None,): @@ -4984,13 +4984,13 @@ class getAccounts_args(TBase): - refresh """ - __slots__ = [ + __slots__ = [ 'refresh', ] thrift_spec = ( None, # 0 - (1, TType.BOOL, 'refresh', None, None, ), # 1 + (1, TType.BOOL, 'refresh', None, None,), # 1 ) def __init__(self, refresh=None,): @@ -5003,12 +5003,12 @@ class getAccounts_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.LIST, 'success', (TType.STRUCT,(AccountInfo, AccountInfo.thrift_spec)), None, ), # 0 + (0, TType.LIST, 'success', (TType.STRUCT, (AccountInfo, AccountInfo.thrift_spec)), None,), # 0 ) def __init__(self, success=None,): @@ -5017,7 +5017,7 @@ class getAccounts_result(TBase): class getAccountTypes_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -5030,12 +5030,12 @@ class getAccountTypes_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.LIST, 'success', (TType.STRING,None), None, ), # 0 + (0, TType.LIST, 'success', (TType.STRING, None), None,), # 0 ) def __init__(self, success=None,): @@ -5051,7 +5051,7 @@ class updateAccount_args(TBase): - options """ - __slots__ = [ + __slots__ = [ 'plugin', 'account', 'password', @@ -5060,10 +5060,10 @@ class updateAccount_args(TBase): thrift_spec = ( None, # 0 - (1, TType.STRING, 'plugin', None, None, ), # 1 - (2, TType.STRING, 'account', None, None, ), # 2 - (3, TType.STRING, 'password', None, None, ), # 3 - (4, TType.MAP, 'options', (TType.STRING,None,TType.STRING,None), None, ), # 4 + (1, TType.STRING, 'plugin', None, None,), # 1 + (2, TType.STRING, 'account', None, None,), # 2 + (3, TType.STRING, 'password', None, None,), # 3 + (4, TType.MAP, 'options', (TType.STRING, None, TType.STRING, None), None,), # 4 ) def __init__(self, plugin=None, account=None, password=None, options=None,): @@ -5075,7 +5075,7 @@ class updateAccount_args(TBase): class updateAccount_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -5089,15 +5089,15 @@ class removeAccount_args(TBase): - account """ - __slots__ = [ + __slots__ = [ 'plugin', 'account', ] thrift_spec = ( None, # 0 - (1, TType.STRING, 'plugin', None, None, ), # 1 - (2, TType.STRING, 'account', None, None, ), # 2 + (1, TType.STRING, 'plugin', None, None,), # 1 + (2, TType.STRING, 'account', None, None,), # 2 ) def __init__(self, plugin=None, account=None,): @@ -5107,7 +5107,7 @@ class removeAccount_args(TBase): class removeAccount_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -5121,15 +5121,15 @@ class login_args(TBase): - password """ - __slots__ = [ + __slots__ = [ 'username', 'password', ] thrift_spec = ( None, # 0 - (1, TType.STRING, 'username', None, None, ), # 1 - (2, TType.STRING, 'password', None, None, ), # 2 + (1, TType.STRING, 'username', None, None,), # 1 + (2, TType.STRING, 'password', None, None,), # 2 ) def __init__(self, username=None, password=None,): @@ -5143,12 +5143,12 @@ class login_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.BOOL, 'success', None, None, ), # 0 + (0, TType.BOOL, 'success', None, None,), # 0 ) def __init__(self, success=None,): @@ -5162,15 +5162,15 @@ class getUserData_args(TBase): - password """ - __slots__ = [ + __slots__ = [ 'username', 'password', ] thrift_spec = ( None, # 0 - (1, TType.STRING, 'username', None, None, ), # 1 - (2, TType.STRING, 'password', None, None, ), # 2 + (1, TType.STRING, 'username', None, None,), # 1 + (2, TType.STRING, 'password', None, None,), # 2 ) def __init__(self, username=None, password=None,): @@ -5184,12 +5184,12 @@ class getUserData_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.STRUCT, 'success', (UserData, UserData.thrift_spec), None, ), # 0 + (0, TType.STRUCT, 'success', (UserData, UserData.thrift_spec), None,), # 0 ) def __init__(self, success=None,): @@ -5198,7 +5198,7 @@ class getUserData_result(TBase): class getAllUserData_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -5211,12 +5211,12 @@ class getAllUserData_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.MAP, 'success', (TType.STRING,None,TType.STRUCT,(UserData, UserData.thrift_spec)), None, ), # 0 + (0, TType.MAP, 'success', (TType.STRING, None, TType.STRUCT, (UserData, UserData.thrift_spec)), None,), # 0 ) def __init__(self, success=None,): @@ -5225,7 +5225,7 @@ class getAllUserData_result(TBase): class getServices_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -5238,12 +5238,12 @@ class getServices_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.MAP, 'success', (TType.STRING,None,TType.MAP,(TType.STRING,None,TType.STRING,None)), None, ), # 0 + (0, TType.MAP, 'success', (TType.STRING, None, TType.MAP, (TType.STRING, None, TType.STRING, None)), None,), # 0 ) def __init__(self, success=None,): @@ -5257,15 +5257,15 @@ class hasService_args(TBase): - func """ - __slots__ = [ + __slots__ = [ 'plugin', 'func', ] thrift_spec = ( None, # 0 - (1, TType.STRING, 'plugin', None, None, ), # 1 - (2, TType.STRING, 'func', None, None, ), # 2 + (1, TType.STRING, 'plugin', None, None,), # 1 + (2, TType.STRING, 'func', None, None,), # 2 ) def __init__(self, plugin=None, func=None,): @@ -5279,12 +5279,12 @@ class hasService_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.BOOL, 'success', None, None, ), # 0 + (0, TType.BOOL, 'success', None, None,), # 0 ) def __init__(self, success=None,): @@ -5297,13 +5297,13 @@ class call_args(TBase): - info """ - __slots__ = [ + __slots__ = [ 'info', ] thrift_spec = ( None, # 0 - (1, TType.STRUCT, 'info', (ServiceCall, ServiceCall.thrift_spec), None, ), # 1 + (1, TType.STRUCT, 'info', (ServiceCall, ServiceCall.thrift_spec), None,), # 1 ) def __init__(self, info=None,): @@ -5318,16 +5318,16 @@ class call_result(TBase): - e """ - __slots__ = [ + __slots__ = [ 'success', 'ex', 'e', ] thrift_spec = ( - (0, TType.STRING, 'success', None, None, ), # 0 - (1, TType.STRUCT, 'ex', (ServiceDoesNotExists, ServiceDoesNotExists.thrift_spec), None, ), # 1 - (2, TType.STRUCT, 'e', (ServiceException, ServiceException.thrift_spec), None, ), # 2 + (0, TType.STRING, 'success', None, None,), # 0 + (1, TType.STRUCT, 'ex', (ServiceDoesNotExists, ServiceDoesNotExists.thrift_spec), None,), # 1 + (2, TType.STRUCT, 'e', (ServiceException, ServiceException.thrift_spec), None,), # 2 ) def __init__(self, success=None, ex=None, e=None,): @@ -5338,7 +5338,7 @@ class call_result(TBase): class getAllInfo_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -5351,12 +5351,12 @@ class getAllInfo_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.MAP, 'success', (TType.STRING,None,TType.MAP,(TType.STRING,None,TType.STRING,None)), None, ), # 0 + (0, TType.MAP, 'success', (TType.STRING, None, TType.MAP, (TType.STRING, None, TType.STRING, None)), None,), # 0 ) def __init__(self, success=None,): @@ -5369,13 +5369,13 @@ class getInfoByPlugin_args(TBase): - plugin """ - __slots__ = [ + __slots__ = [ 'plugin', ] thrift_spec = ( None, # 0 - (1, TType.STRING, 'plugin', None, None, ), # 1 + (1, TType.STRING, 'plugin', None, None,), # 1 ) def __init__(self, plugin=None,): @@ -5388,12 +5388,12 @@ class getInfoByPlugin_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.MAP, 'success', (TType.STRING,None,TType.STRING,None), None, ), # 0 + (0, TType.MAP, 'success', (TType.STRING, None, TType.STRING, None), None,), # 0 ) def __init__(self, success=None,): @@ -5402,7 +5402,7 @@ class getInfoByPlugin_result(TBase): class isCaptchaWaiting_args(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( @@ -5415,12 +5415,12 @@ class isCaptchaWaiting_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.BOOL, 'success', None, None, ), # 0 + (0, TType.BOOL, 'success', None, None,), # 0 ) def __init__(self, success=None,): @@ -5433,13 +5433,13 @@ class getCaptchaTask_args(TBase): - exclusive """ - __slots__ = [ + __slots__ = [ 'exclusive', ] thrift_spec = ( None, # 0 - (1, TType.BOOL, 'exclusive', None, None, ), # 1 + (1, TType.BOOL, 'exclusive', None, None,), # 1 ) def __init__(self, exclusive=None,): @@ -5452,12 +5452,12 @@ class getCaptchaTask_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.STRUCT, 'success', (CaptchaTask, CaptchaTask.thrift_spec), None, ), # 0 + (0, TType.STRUCT, 'success', (CaptchaTask, CaptchaTask.thrift_spec), None,), # 0 ) def __init__(self, success=None,): @@ -5470,13 +5470,13 @@ class getCaptchaTaskStatus_args(TBase): - tid """ - __slots__ = [ + __slots__ = [ 'tid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'tid', None, None, ), # 1 + (1, TType.I32, 'tid', None, None,), # 1 ) def __init__(self, tid=None,): @@ -5489,12 +5489,12 @@ class getCaptchaTaskStatus_result(TBase): - success """ - __slots__ = [ + __slots__ = [ 'success', ] thrift_spec = ( - (0, TType.STRING, 'success', None, None, ), # 0 + (0, TType.STRING, 'success', None, None,), # 0 ) def __init__(self, success=None,): @@ -5508,15 +5508,15 @@ class setCaptchaResult_args(TBase): - result """ - __slots__ = [ + __slots__ = [ 'tid', 'result', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'tid', None, None, ), # 1 - (2, TType.STRING, 'result', None, None, ), # 2 + (1, TType.I32, 'tid', None, None,), # 1 + (2, TType.STRING, 'result', None, None,), # 2 ) def __init__(self, tid=None, result=None,): @@ -5526,9 +5526,8 @@ class setCaptchaResult_args(TBase): class setCaptchaResult_result(TBase): - __slots__ = [ + __slots__ = [ ] thrift_spec = ( ) - diff --git a/module/remote/thriftbackend/thriftgen/pyload/__init__.py b/module/remote/thriftbackend/thriftgen/pyload/__init__.py index ce7f52598..9a0fb88bf 100644 --- a/module/remote/thriftbackend/thriftgen/pyload/__init__.py +++ b/module/remote/thriftbackend/thriftgen/pyload/__init__.py @@ -1 +1,3 @@ +# -*- coding: utf-8 -*- + __all__ = ['ttypes', 'constants', 'Pyload'] diff --git a/module/remote/thriftbackend/thriftgen/pyload/constants.py b/module/remote/thriftbackend/thriftgen/pyload/constants.py index f8960dc63..3bdd64cc1 100644 --- a/module/remote/thriftbackend/thriftgen/pyload/constants.py +++ b/module/remote/thriftbackend/thriftgen/pyload/constants.py @@ -3,9 +3,8 @@ # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # -# options string: py:slots,dynamic +# options string: py:slots, dynamic # from thrift.Thrift import TType, TMessageType, TException from ttypes import * - diff --git a/module/remote/thriftbackend/thriftgen/pyload/ttypes.py b/module/remote/thriftbackend/thriftgen/pyload/ttypes.py index 1299b515d..67d23161d 100644 --- a/module/remote/thriftbackend/thriftgen/pyload/ttypes.py +++ b/module/remote/thriftbackend/thriftgen/pyload/ttypes.py @@ -3,7 +3,7 @@ # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # -# options string: py:slots,dynamic +# options string: py:slots, dynamic # from thrift.Thrift import TType, TMessageType, TException @@ -169,7 +169,7 @@ class DownloadInfo(TBase): - plugin """ - __slots__ = [ + __slots__ = [ 'fid', 'name', 'speed', @@ -190,22 +190,22 @@ class DownloadInfo(TBase): thrift_spec = ( None, # 0 - (1, TType.I32, 'fid', None, None, ), # 1 - (2, TType.STRING, 'name', None, None, ), # 2 - (3, TType.I64, 'speed', None, None, ), # 3 - (4, TType.I32, 'eta', None, None, ), # 4 - (5, TType.STRING, 'format_eta', None, None, ), # 5 - (6, TType.I64, 'bleft', None, None, ), # 6 - (7, TType.I64, 'size', None, None, ), # 7 - (8, TType.STRING, 'format_size', None, None, ), # 8 - (9, TType.BYTE, 'percent', None, None, ), # 9 - (10, TType.I32, 'status', None, None, ), # 10 - (11, TType.STRING, 'statusmsg', None, None, ), # 11 - (12, TType.STRING, 'format_wait', None, None, ), # 12 - (13, TType.I64, 'wait_until', None, None, ), # 13 - (14, TType.I32, 'packageID', None, None, ), # 14 - (15, TType.STRING, 'packageName', None, None, ), # 15 - (16, TType.STRING, 'plugin', None, None, ), # 16 + (1, TType.I32, 'fid', None, None,), # 1 + (2, TType.STRING, 'name', None, None,), # 2 + (3, TType.I64, 'speed', None, None,), # 3 + (4, TType.I32, 'eta', None, None,), # 4 + (5, TType.STRING, 'format_eta', None, None,), # 5 + (6, TType.I64, 'bleft', None, None,), # 6 + (7, TType.I64, 'size', None, None,), # 7 + (8, TType.STRING, 'format_size', None, None,), # 8 + (9, TType.BYTE, 'percent', None, None,), # 9 + (10, TType.I32, 'status', None, None,), # 10 + (11, TType.STRING, 'statusmsg', None, None,), # 11 + (12, TType.STRING, 'format_wait', None, None,), # 12 + (13, TType.I64, 'wait_until', None, None,), # 13 + (14, TType.I32, 'packageID', None, None,), # 14 + (15, TType.STRING, 'packageName', None, None,), # 15 + (16, TType.STRING, 'plugin', None, None,), # 16 ) def __init__(self, fid=None, name=None, speed=None, eta=None, format_eta=None, bleft=None, size=None, format_size=None, percent=None, status=None, statusmsg=None, format_wait=None, wait_until=None, packageID=None, packageName=None, plugin=None,): @@ -239,7 +239,7 @@ class ServerStatus(TBase): - reconnect """ - __slots__ = [ + __slots__ = [ 'pause', 'active', 'queue', @@ -251,13 +251,13 @@ class ServerStatus(TBase): thrift_spec = ( None, # 0 - (1, TType.BOOL, 'pause', None, None, ), # 1 - (2, TType.I16, 'active', None, None, ), # 2 - (3, TType.I16, 'queue', None, None, ), # 3 - (4, TType.I16, 'total', None, None, ), # 4 - (5, TType.I64, 'speed', None, None, ), # 5 - (6, TType.BOOL, 'download', None, None, ), # 6 - (7, TType.BOOL, 'reconnect', None, None, ), # 7 + (1, TType.BOOL, 'pause', None, None,), # 1 + (2, TType.I16, 'active', None, None,), # 2 + (3, TType.I16, 'queue', None, None,), # 3 + (4, TType.I16, 'total', None, None,), # 4 + (5, TType.I64, 'speed', None, None,), # 5 + (6, TType.BOOL, 'download', None, None,), # 6 + (7, TType.BOOL, 'reconnect', None, None,), # 7 ) def __init__(self, pause=None, active=None, queue=None, total=None, speed=None, download=None, reconnect=None,): @@ -279,7 +279,7 @@ class ConfigItem(TBase): - type """ - __slots__ = [ + __slots__ = [ 'name', 'description', 'value', @@ -288,10 +288,10 @@ class ConfigItem(TBase): thrift_spec = ( None, # 0 - (1, TType.STRING, 'name', None, None, ), # 1 - (2, TType.STRING, 'description', None, None, ), # 2 - (3, TType.STRING, 'value', None, None, ), # 3 - (4, TType.STRING, 'type', None, None, ), # 4 + (1, TType.STRING, 'name', None, None,), # 1 + (2, TType.STRING, 'description', None, None,), # 2 + (3, TType.STRING, 'value', None, None,), # 3 + (4, TType.STRING, 'type', None, None,), # 4 ) def __init__(self, name=None, description=None, value=None, type=None,): @@ -310,7 +310,7 @@ class ConfigSection(TBase): - outline """ - __slots__ = [ + __slots__ = [ 'name', 'description', 'items', @@ -319,10 +319,10 @@ class ConfigSection(TBase): thrift_spec = ( None, # 0 - (1, TType.STRING, 'name', None, None, ), # 1 - (2, TType.STRING, 'description', None, None, ), # 2 - (3, TType.LIST, 'items', (TType.STRUCT,(ConfigItem, ConfigItem.thrift_spec)), None, ), # 3 - (4, TType.STRING, 'outline', None, None, ), # 4 + (1, TType.STRING, 'name', None, None,), # 1 + (2, TType.STRING, 'description', None, None,), # 2 + (3, TType.LIST, 'items', (TType.STRUCT, (ConfigItem, ConfigItem.thrift_spec)), None,), # 3 + (4, TType.STRING, 'outline', None, None,), # 4 ) def __init__(self, name=None, description=None, items=None, outline=None,): @@ -348,7 +348,7 @@ class FileData(TBase): - order """ - __slots__ = [ + __slots__ = [ 'fid', 'url', 'name', @@ -364,17 +364,17 @@ class FileData(TBase): thrift_spec = ( None, # 0 - (1, TType.I32, 'fid', None, None, ), # 1 - (2, TType.STRING, 'url', None, None, ), # 2 - (3, TType.STRING, 'name', None, None, ), # 3 - (4, TType.STRING, 'plugin', None, None, ), # 4 - (5, TType.I64, 'size', None, None, ), # 5 - (6, TType.STRING, 'format_size', None, None, ), # 6 - (7, TType.I32, 'status', None, None, ), # 7 - (8, TType.STRING, 'statusmsg', None, None, ), # 8 - (9, TType.I32, 'packageID', None, None, ), # 9 - (10, TType.STRING, 'error', None, None, ), # 10 - (11, TType.I16, 'order', None, None, ), # 11 + (1, TType.I32, 'fid', None, None,), # 1 + (2, TType.STRING, 'url', None, None,), # 2 + (3, TType.STRING, 'name', None, None,), # 3 + (4, TType.STRING, 'plugin', None, None,), # 4 + (5, TType.I64, 'size', None, None,), # 5 + (6, TType.STRING, 'format_size', None, None,), # 6 + (7, TType.I32, 'status', None, None,), # 7 + (8, TType.STRING, 'statusmsg', None, None,), # 8 + (9, TType.I32, 'packageID', None, None,), # 9 + (10, TType.STRING, 'error', None, None,), # 10 + (11, TType.I16, 'order', None, None,), # 11 ) def __init__(self, fid=None, url=None, name=None, plugin=None, size=None, format_size=None, status=None, statusmsg=None, packageID=None, error=None, order=None,): @@ -409,7 +409,7 @@ class PackageData(TBase): - fids """ - __slots__ = [ + __slots__ = [ 'pid', 'name', 'folder', @@ -427,19 +427,19 @@ class PackageData(TBase): thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 - (2, TType.STRING, 'name', None, None, ), # 2 - (3, TType.STRING, 'folder', None, None, ), # 3 - (4, TType.STRING, 'site', None, None, ), # 4 - (5, TType.STRING, 'password', None, None, ), # 5 - (6, TType.I32, 'dest', None, None, ), # 6 - (7, TType.I16, 'order', None, None, ), # 7 - (8, TType.I16, 'linksdone', None, None, ), # 8 - (9, TType.I64, 'sizedone', None, None, ), # 9 - (10, TType.I64, 'sizetotal', None, None, ), # 10 - (11, TType.I16, 'linkstotal', None, None, ), # 11 - (12, TType.LIST, 'links', (TType.STRUCT,(FileData, FileData.thrift_spec)), None, ), # 12 - (13, TType.LIST, 'fids', (TType.I32,None), None, ), # 13 + (1, TType.I32, 'pid', None, None,), # 1 + (2, TType.STRING, 'name', None, None,), # 2 + (3, TType.STRING, 'folder', None, None,), # 3 + (4, TType.STRING, 'site', None, None,), # 4 + (5, TType.STRING, 'password', None, None,), # 5 + (6, TType.I32, 'dest', None, None,), # 6 + (7, TType.I16, 'order', None, None,), # 7 + (8, TType.I16, 'linksdone', None, None,), # 8 + (9, TType.I64, 'sizedone', None, None,), # 9 + (10, TType.I64, 'sizetotal', None, None,), # 10 + (11, TType.I16, 'linkstotal', None, None,), # 11 + (12, TType.LIST, 'links', (TType.STRUCT, (FileData, FileData.thrift_spec)), None,), # 12 + (13, TType.LIST, 'fids', (TType.I32, None), None,), # 13 ) def __init__(self, pid=None, name=None, folder=None, site=None, password=None, dest=None, order=None, linksdone=None, sizedone=None, sizetotal=None, linkstotal=None, links=None, fids=None,): @@ -472,7 +472,7 @@ class InteractionTask(TBase): - plugin """ - __slots__ = [ + __slots__ = [ 'iid', 'input', 'structure', @@ -486,15 +486,15 @@ class InteractionTask(TBase): thrift_spec = ( None, # 0 - (1, TType.I32, 'iid', None, None, ), # 1 - (2, TType.I32, 'input', None, None, ), # 2 - (3, TType.LIST, 'structure', (TType.STRING,None), None, ), # 3 - (4, TType.LIST, 'preset', (TType.STRING,None), None, ), # 4 - (5, TType.I32, 'output', None, None, ), # 5 - (6, TType.LIST, 'data', (TType.STRING,None), None, ), # 6 - (7, TType.STRING, 'title', None, None, ), # 7 - (8, TType.STRING, 'description', None, None, ), # 8 - (9, TType.STRING, 'plugin', None, None, ), # 9 + (1, TType.I32, 'iid', None, None,), # 1 + (2, TType.I32, 'input', None, None,), # 2 + (3, TType.LIST, 'structure', (TType.STRING, None), None,), # 3 + (4, TType.LIST, 'preset', (TType.STRING, None), None,), # 4 + (5, TType.I32, 'output', None, None,), # 5 + (6, TType.LIST, 'data', (TType.STRING, None), None,), # 6 + (7, TType.STRING, 'title', None, None,), # 7 + (8, TType.STRING, 'description', None, None,), # 8 + (9, TType.STRING, 'plugin', None, None,), # 9 ) def __init__(self, iid=None, input=None, structure=None, preset=None, output=None, data=None, title=None, description=None, plugin=None,): @@ -518,7 +518,7 @@ class CaptchaTask(TBase): - resultType """ - __slots__ = [ + __slots__ = [ 'tid', 'data', 'type', @@ -527,10 +527,10 @@ class CaptchaTask(TBase): thrift_spec = ( None, # 0 - (1, TType.I16, 'tid', None, None, ), # 1 - (2, TType.STRING, 'data', None, None, ), # 2 - (3, TType.STRING, 'type', None, None, ), # 3 - (4, TType.STRING, 'resultType', None, None, ), # 4 + (1, TType.I16, 'tid', None, None,), # 1 + (2, TType.STRING, 'data', None, None,), # 2 + (3, TType.STRING, 'type', None, None,), # 3 + (4, TType.STRING, 'resultType', None, None,), # 4 ) def __init__(self, tid=None, data=None, type=None, resultType=None,): @@ -549,7 +549,7 @@ class EventInfo(TBase): - destination """ - __slots__ = [ + __slots__ = [ 'eventname', 'id', 'type', @@ -558,10 +558,10 @@ class EventInfo(TBase): thrift_spec = ( None, # 0 - (1, TType.STRING, 'eventname', None, None, ), # 1 - (2, TType.I32, 'id', None, None, ), # 2 - (3, TType.I32, 'type', None, None, ), # 3 - (4, TType.I32, 'destination', None, None, ), # 4 + (1, TType.STRING, 'eventname', None, None,), # 1 + (2, TType.I32, 'id', None, None,), # 2 + (3, TType.I32, 'type', None, None,), # 3 + (4, TType.I32, 'destination', None, None,), # 4 ) def __init__(self, eventname=None, id=None, type=None, destination=None,): @@ -581,7 +581,7 @@ class UserData(TBase): - templateName """ - __slots__ = [ + __slots__ = [ 'name', 'email', 'role', @@ -591,11 +591,11 @@ class UserData(TBase): thrift_spec = ( None, # 0 - (1, TType.STRING, 'name', None, None, ), # 1 - (2, TType.STRING, 'email', None, None, ), # 2 - (3, TType.I32, 'role', None, None, ), # 3 - (4, TType.I32, 'permission', None, None, ), # 4 - (5, TType.STRING, 'templateName', None, None, ), # 5 + (1, TType.STRING, 'name', None, None,), # 1 + (2, TType.STRING, 'email', None, None,), # 2 + (3, TType.I32, 'role', None, None,), # 3 + (4, TType.I32, 'permission', None, None,), # 4 + (5, TType.STRING, 'templateName', None, None,), # 5 ) def __init__(self, name=None, email=None, role=None, permission=None, templateName=None,): @@ -619,7 +619,7 @@ class AccountInfo(TBase): - type """ - __slots__ = [ + __slots__ = [ 'validuntil', 'login', 'options', @@ -632,14 +632,14 @@ class AccountInfo(TBase): thrift_spec = ( None, # 0 - (1, TType.I64, 'validuntil', None, None, ), # 1 - (2, TType.STRING, 'login', None, None, ), # 2 - (3, TType.MAP, 'options', (TType.STRING,None,TType.LIST,(TType.STRING,None)), None, ), # 3 - (4, TType.BOOL, 'valid', None, None, ), # 4 - (5, TType.I64, 'trafficleft', None, None, ), # 5 - (6, TType.I64, 'maxtraffic', None, None, ), # 6 - (7, TType.BOOL, 'premium', None, None, ), # 7 - (8, TType.STRING, 'type', None, None, ), # 8 + (1, TType.I64, 'validuntil', None, None,), # 1 + (2, TType.STRING, 'login', None, None,), # 2 + (3, TType.MAP, 'options', (TType.STRING, None, TType.LIST, (TType.STRING, None)), None,), # 3 + (4, TType.BOOL, 'valid', None, None,), # 4 + (5, TType.I64, 'trafficleft', None, None,), # 5 + (6, TType.I64, 'maxtraffic', None, None,), # 6 + (7, TType.BOOL, 'premium', None, None,), # 7 + (8, TType.STRING, 'type', None, None,), # 8 ) def __init__(self, validuntil=None, login=None, options=None, valid=None, trafficleft=None, maxtraffic=None, premium=None, type=None,): @@ -662,7 +662,7 @@ class ServiceCall(TBase): - parseArguments """ - __slots__ = [ + __slots__ = [ 'plugin', 'func', 'arguments', @@ -671,10 +671,10 @@ class ServiceCall(TBase): thrift_spec = ( None, # 0 - (1, TType.STRING, 'plugin', None, None, ), # 1 - (2, TType.STRING, 'func', None, None, ), # 2 - (3, TType.LIST, 'arguments', (TType.STRING,None), None, ), # 3 - (4, TType.BOOL, 'parseArguments', None, None, ), # 4 + (1, TType.STRING, 'plugin', None, None,), # 1 + (2, TType.STRING, 'func', None, None,), # 2 + (3, TType.LIST, 'arguments', (TType.STRING, None), None,), # 3 + (4, TType.BOOL, 'parseArguments', None, None,), # 4 ) def __init__(self, plugin=None, func=None, arguments=None, parseArguments=None,): @@ -694,7 +694,7 @@ class OnlineStatus(TBase): - size """ - __slots__ = [ + __slots__ = [ 'name', 'plugin', 'packagename', @@ -704,11 +704,11 @@ class OnlineStatus(TBase): thrift_spec = ( None, # 0 - (1, TType.STRING, 'name', None, None, ), # 1 - (2, TType.STRING, 'plugin', None, None, ), # 2 - (3, TType.STRING, 'packagename', None, None, ), # 3 - (4, TType.I32, 'status', None, None, ), # 4 - (5, TType.I64, 'size', None, None, ), # 5 + (1, TType.STRING, 'name', None, None,), # 1 + (2, TType.STRING, 'plugin', None, None,), # 2 + (3, TType.STRING, 'packagename', None, None,), # 3 + (4, TType.I32, 'status', None, None,), # 4 + (5, TType.I64, 'size', None, None,), # 5 ) def __init__(self, name=None, plugin=None, packagename=None, status=None, size=None,): @@ -726,15 +726,15 @@ class OnlineCheck(TBase): - data """ - __slots__ = [ + __slots__ = [ 'rid', 'data', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'rid', None, None, ), # 1 - (2, TType.MAP, 'data', (TType.STRING,None,TType.STRUCT,(OnlineStatus, OnlineStatus.thrift_spec)), None, ), # 2 + (1, TType.I32, 'rid', None, None,), # 1 + (2, TType.MAP, 'data', (TType.STRING, None, TType.STRUCT, (OnlineStatus, OnlineStatus.thrift_spec)), None,), # 2 ) def __init__(self, rid=None, data=None,): @@ -748,13 +748,13 @@ class PackageDoesNotExists(TExceptionBase): - pid """ - __slots__ = [ + __slots__ = [ 'pid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'pid', None, None, ), # 1 + (1, TType.I32, 'pid', None, None,), # 1 ) def __init__(self, pid=None,): @@ -770,13 +770,13 @@ class FileDoesNotExists(TExceptionBase): - fid """ - __slots__ = [ + __slots__ = [ 'fid', ] thrift_spec = ( None, # 0 - (1, TType.I32, 'fid', None, None, ), # 1 + (1, TType.I32, 'fid', None, None,), # 1 ) def __init__(self, fid=None,): @@ -793,15 +793,15 @@ class ServiceDoesNotExists(TExceptionBase): - func """ - __slots__ = [ + __slots__ = [ 'plugin', 'func', ] thrift_spec = ( None, # 0 - (1, TType.STRING, 'plugin', None, None, ), # 1 - (2, TType.STRING, 'func', None, None, ), # 2 + (1, TType.STRING, 'plugin', None, None,), # 1 + (2, TType.STRING, 'func', None, None,), # 2 ) def __init__(self, plugin=None, func=None,): @@ -818,13 +818,13 @@ class ServiceException(TExceptionBase): - msg """ - __slots__ = [ + __slots__ = [ 'msg', ] thrift_spec = ( None, # 0 - (1, TType.STRING, 'msg', None, None, ), # 1 + (1, TType.STRING, 'msg', None, None,), # 1 ) def __init__(self, msg=None,): @@ -832,4 +832,3 @@ class ServiceException(TExceptionBase): def __str__(self): return repr(self) - |