merged stable into default

1 files changed, 286 insertions, 166 deletions

diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py
index f8ea121fa..06f051fc7 100644
--- a/module/remote/socketbackend/ttypes.py
+++ b/module/remote/socketbackend/ttypes.py
@@ -6,133 +6,169 @@
 class BaseObject(object):
 	__slots__ = []
 
-class Destination:
-	Collector = 0
-	Queue = 1
-
 class DownloadStatus:
-	Aborted = 9
-	Custom = 11
-	Decrypting = 10
-	Downloading = 12
-	Failed = 8
-	Finished = 0
+	Aborted = 12
+	Custom = 15
+	Decrypting = 13
+	Downloading = 10
+	Failed = 7
+	Finished = 5
+	NA = 0
 	Offline = 1
 	Online = 2
-	Processing = 13
+	Paused = 4
+	Processing = 14
 	Queued = 3
-	Skipped = 4
-	Starting = 7
-	TempOffline = 6
-	Unknown = 14
-	Waiting = 5
+	Skipped = 6
+	Starting = 8
+	TempOffline = 11
+	Unknown = 16
+	Waiting = 9
 
-class ElementType:
-	File = 1
-	Package = 0
+class FileStatus:
+	Missing = 1
+	Ok = 0
+	Remote = 2
 
 class Input:
-	BOOL = 4
-	CHOICE = 6
-	CLICK = 5
-	LIST = 8
-	MULTIPLE = 7
-	NONE = 0
-	PASSWORD = 3
-	TABLE = 9
-	TEXT = 1
-	TEXTBOX = 2
+	Bool = 4
+	Click = 5
+	List = 8
+	Multiple = 7
+	NA = 0
+	Password = 3
+	Select = 6
+	Table = 9
+	Text = 1
+	Textbox = 2
+
+class MediaType:
+	All = 0
+	Archive = 32
+	Audio = 2
+	Document = 16
+	Image = 4
+	Other = 1
+	Video = 8
 
 class Output:
-	CAPTCHA = 1
-	NOTIFICATION = 4
-	QUESTION = 2
+	All = 0
+	Captcha = 2
+	Notification = 1
+	Query = 4
+
+class PackageStatus:
+	Folder = 2
+	Ok = 0
+	Paused = 1
+	Remote = 3
+
+class Permission:
+	Accounts = 16
+	Add = 1
+	All = 0
+	Delete = 2
+	Download = 8
+	Interaction = 32
+	Modify = 4
+	Plugins = 64
+
+class Role:
+	Admin = 0
+	User = 1
 
 class AccountInfo(BaseObject):
-	__slots__ = ['validuntil', 'login', 'options', 'valid', 'trafficleft', 'maxtraffic', 'premium', 'type']
+	__slots__ = ['plugin', 'loginname', 'owner', 'valid', 'validuntil', 'trafficleft', 'maxtraffic', 'premium', 'activated', 'shared', 'options']
 
-	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
+	def __init__(self, plugin=None, loginname=None, owner=None, valid=None, validuntil=None, trafficleft=None, maxtraffic=None, premium=None, activated=None, shared=None, options=None):
+		self.plugin = plugin
+		self.loginname = loginname
+		self.owner = owner
 		self.valid = valid
+		self.validuntil = validuntil
 		self.trafficleft = trafficleft
 		self.maxtraffic = maxtraffic
 		self.premium = premium
-		self.type = type
+		self.activated = activated
+		self.shared = shared
+		self.options = options
 
-class CaptchaTask(BaseObject):
-	__slots__ = ['tid', 'data', 'type', 'resultType']
+class AddonInfo(BaseObject):
+	__slots__ = ['func_name', 'description', 'value']
 
-	def __init__(self, tid=None, data=None, type=None, resultType=None):
-		self.tid = tid
-		self.data = data
-		self.type = type
-		self.resultType = resultType
+	def __init__(self, func_name=None, description=None, value=None):
+		self.func_name = func_name
+		self.description = description
+		self.value = value
 
-class ConfigItem(BaseObject):
-	__slots__ = ['name', 'description', 'value', 'type']
+class AddonService(BaseObject):
+	__slots__ = ['func_name', 'description', 'arguments', 'media']
 
-	def __init__(self, name=None, description=None, value=None, type=None):
-		self.name = name
+	def __init__(self, func_name=None, description=None, arguments=None, media=None):
+		self.func_name = func_name
 		self.description = description
-		self.value = value
-		self.type = type
+		self.arguments = arguments
+		self.media = media
 
-class ConfigSection(BaseObject):
-	__slots__ = ['name', 'description', 'items', 'outline']
+class ConfigHolder(BaseObject):
+	__slots__ = ['name', 'label', 'description', 'long_description', 'items', 'info', 'handler']
 
-	def __init__(self, name=None, description=None, items=None, outline=None):
+	def __init__(self, name=None, label=None, description=None, long_description=None, items=None, info=None, handler=None):
 		self.name = name
+		self.label = label
 		self.description = description
+		self.long_description = long_description
 		self.items = items
-		self.outline = outline
+		self.info = info
+		self.handler = handler
 
-class DownloadInfo(BaseObject):
-	__slots__ = ['fid', 'name', 'speed', 'eta', 'format_eta', 'bleft', 'size', 'format_size', 'percent', 'status', 'statusmsg', 'format_wait', 'wait_until', 'packageID', 'packageName', 'plugin']
+class ConfigInfo(BaseObject):
+	__slots__ = ['name', 'label', 'description', 'saved', 'activated']
 
-	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
+	def __init__(self, name=None, label=None, description=None, saved=None, activated=None):
 		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
+		self.label = label
+		self.description = description
+		self.saved = saved
+		self.activated = activated
 
-class EventInfo(BaseObject):
-	__slots__ = ['eventname', 'id', 'type', 'destination']
+class ConfigItem(BaseObject):
+	__slots__ = ['name', 'label', 'description', 'type', 'default_value', 'value']
 
-	def __init__(self, eventname=None, id=None, type=None, destination=None):
-		self.eventname = eventname
-		self.id = id
+	def __init__(self, name=None, label=None, description=None, type=None, default_value=None, value=None):
+		self.name = name
+		self.label = label
+		self.description = description
 		self.type = type
-		self.destination = destination
+		self.default_value = default_value
+		self.value = value
 
-class FileData(BaseObject):
-	__slots__ = ['fid', 'url', 'name', 'plugin', 'size', 'format_size', 'status', 'statusmsg', 'packageID', 'error', 'order']
+class DownloadInfo(BaseObject):
+	__slots__ = ['url', 'plugin', 'hash', 'status', 'statusmsg', 'error']
 
-	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
+	def __init__(self, url=None, plugin=None, hash=None, status=None, statusmsg=None, error=None):
 		self.url = url
-		self.name = name
 		self.plugin = plugin
-		self.size = size
-		self.format_size = format_size
+		self.hash = hash
 		self.status = status
 		self.statusmsg = statusmsg
-		self.packageID = packageID
 		self.error = error
-		self.order = order
+
+class DownloadProgress(BaseObject):
+	__slots__ = ['fid', 'pid', 'speed', 'status']
+
+	def __init__(self, fid=None, pid=None, speed=None, status=None):
+		self.fid = fid
+		self.pid = pid
+		self.speed = speed
+		self.status = status
+
+class EventInfo(BaseObject):
+	__slots__ = ['eventname', 'event_args']
+
+	def __init__(self, eventname=None, event_args=None):
+		self.eventname = eventname
+		self.event_args = event_args
 
 class FileDoesNotExists(Exception):
 	__slots__ = ['fid']
@@ -140,20 +176,45 @@ class FileDoesNotExists(Exception):
 	def __init__(self, fid=None):
 		self.fid = fid
 
+class FileInfo(BaseObject):
+	__slots__ = ['fid', 'name', 'package', 'owner', 'size', 'status', 'media', 'added', 'fileorder', 'download']
+
+	def __init__(self, fid=None, name=None, package=None, owner=None, size=None, status=None, media=None, added=None, fileorder=None, download=None):
+		self.fid = fid
+		self.name = name
+		self.package = package
+		self.owner = owner
+		self.size = size
+		self.status = status
+		self.media = media
+		self.added = added
+		self.fileorder = fileorder
+		self.download = download
+
 class InteractionTask(BaseObject):
-	__slots__ = ['iid', 'input', 'structure', 'preset', 'output', 'data', 'title', 'description', 'plugin']
+	__slots__ = ['iid', 'input', 'data', 'output', 'default_value', 'title', 'description', 'plugin']
 
-	def __init__(self, iid=None, input=None, structure=None, preset=None, output=None, data=None, title=None, description=None, plugin=None):
+	def __init__(self, iid=None, input=None, data=None, output=None, default_value=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.output = output
+		self.default_value = default_value
 		self.title = title
 		self.description = description
 		self.plugin = plugin
 
+class LinkStatus(BaseObject):
+	__slots__ = ['url', 'name', 'plugin', 'size', 'status', 'packagename']
+
+	def __init__(self, url=None, name=None, plugin=None, size=None, status=None, packagename=None):
+		self.url = url
+		self.name = name
+		self.plugin = plugin
+		self.size = size
+		self.status = status
+		self.packagename = packagename
+
 class OnlineCheck(BaseObject):
 	__slots__ = ['rid', 'data']
 
@@ -161,39 +222,52 @@ class OnlineCheck(BaseObject):
 		self.rid = rid
 		self.data = data
 
-class OnlineStatus(BaseObject):
-	__slots__ = ['name', 'plugin', 'packagename', 'status', 'size']
+class PackageDoesNotExists(Exception):
+	__slots__ = ['pid']
 
-	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
+	def __init__(self, pid=None):
+		self.pid = pid
 
-class PackageData(BaseObject):
-	__slots__ = ['pid', 'name', 'folder', 'site', 'password', 'dest', 'order', 'linksdone', 'sizedone', 'sizetotal', 'linkstotal', 'links', 'fids']
+class PackageInfo(BaseObject):
+	__slots__ = ['pid', 'name', 'folder', 'root', 'owner', 'site', 'comment', 'password', 'added', 'status', 'packageorder', 'stats', 'fids', 'pids']
 
-	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):
+	def __init__(self, pid=None, name=None, folder=None, root=None, owner=None, site=None, comment=None, password=None, added=None, status=None, packageorder=None, stats=None, fids=None, pids=None):
 		self.pid = pid
 		self.name = name
 		self.folder = folder
+		self.root = root
+		self.owner = owner
 		self.site = site
+		self.comment = comment
 		self.password = password
-		self.dest = dest
-		self.order = order
+		self.added = added
+		self.status = status
+		self.packageorder = packageorder
+		self.stats = stats
+		self.fids = fids
+		self.pids = pids
+
+class PackageStats(BaseObject):
+	__slots__ = ['linkstotal', 'linksdone', 'sizetotal', 'sizedone']
+
+	def __init__(self, linkstotal=None, linksdone=None, sizetotal=None, sizedone=None):
+		self.linkstotal = linkstotal
 		self.linksdone = linksdone
-		self.sizedone = sizedone
 		self.sizetotal = sizetotal
-		self.linkstotal = linkstotal
-		self.links = links
-		self.fids = fids
+		self.sizedone = sizedone
 
-class PackageDoesNotExists(Exception):
-	__slots__ = ['pid']
+class ProgressInfo(BaseObject):
+	__slots__ = ['plugin', 'name', 'statusmsg', 'eta', 'format_eta', 'done', 'total', 'download']
 
-	def __init__(self, pid=None):
-		self.pid = pid
+	def __init__(self, plugin=None, name=None, statusmsg=None, eta=None, format_eta=None, done=None, total=None, download=None):
+		self.plugin = plugin
+		self.name = name
+		self.statusmsg = statusmsg
+		self.eta = eta
+		self.format_eta = format_eta
+		self.done = done
+		self.total = total
+		self.download = download
 
 class ServerStatus(BaseObject):
 	__slots__ = ['pause', 'active', 'queue', 'total', 'speed', 'download', 'reconnect']
@@ -207,15 +281,6 @@ class ServerStatus(BaseObject):
 		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']
 
@@ -229,22 +294,57 @@ class ServiceException(Exception):
 	def __init__(self, msg=None):
 		self.msg = msg
 
+class TreeCollection(BaseObject):
+	__slots__ = ['root', 'files', 'packages']
+
+	def __init__(self, root=None, files=None, packages=None):
+		self.root = root
+		self.files = files
+		self.packages = packages
+
 class UserData(BaseObject):
-	__slots__ = ['name', 'email', 'role', 'permission', 'templateName']
+	__slots__ = ['uid', 'name', 'email', 'role', 'permission', 'folder', 'traffic', 'dllimit', 'dlquota', 'hddquota', 'user', 'templateName']
 
-	def __init__(self, name=None, email=None, role=None, permission=None, templateName=None):
+	def __init__(self, uid=None, name=None, email=None, role=None, permission=None, folder=None, traffic=None, dllimit=None, dlquota=None, hddquota=None, user=None, templateName=None):
+		self.uid = uid
 		self.name = name
 		self.email = email
 		self.role = role
 		self.permission = permission
+		self.folder = folder
+		self.traffic = traffic
+		self.dllimit = dllimit
+		self.dlquota = dlquota
+		self.hddquota = hddquota
+		self.user = user
 		self.templateName = templateName
 
-class Iface:
-	def addFiles(self, pid, links):
+class UserDoesNotExists(Exception):
+	__slots__ = ['user']
+
+	def __init__(self, user=None):
+		self.user = user
+
+class Iface(object):
+	def addFromCollector(self, name, paused):
+		pass
+	def addLinks(self, pid, links):
+		pass
+	def addLocalFile(self, pid, name, path):
+		pass
+	def addPackage(self, name, links, password):
 		pass
-	def addPackage(self, name, links, dest):
+	def addPackageChild(self, name, links, password, root, paused):
 		pass
-	def call(self, info):
+	def addPackageP(self, name, links, password, paused):
+		pass
+	def addToCollector(self, links):
+		pass
+	def addUser(self, username, password):
+		pass
+	def callAddon(self, plugin, func, arguments):
+		pass
+	def callAddonHandler(self, plugin, func, pid_or_fid):
 		pass
 	def checkOnlineStatus(self, urls):
 		pass
@@ -252,15 +352,27 @@ class Iface:
 		pass
 	def checkURLs(self, urls):
 		pass
-	def deleteFiles(self, fids):
+	def configurePlugin(self, plugin):
 		pass
-	def deleteFinished(self):
+	def createPackage(self, name, folder, root, password, site, comment, paused):
+		pass
+	def deleteCollLink(self, url):
+		pass
+	def deleteCollPack(self, name):
+		pass
+	def deleteConfig(self, plugin):
+		pass
+	def deleteFiles(self, fids):
 		pass
 	def deletePackages(self, pids):
 		pass
+	def findFiles(self, pattern):
+		pass
 	def freeSpace(self):
 		pass
-	def generateAndAddPackages(self, links, dest):
+	def generateAndAddPackages(self, links, paused):
+		pass
+	def generateDownloadLink(self, fid, timeout):
 		pass
 	def generatePackages(self, links):
 		pass
@@ -268,53 +380,53 @@ class Iface:
 		pass
 	def getAccounts(self, refresh):
 		pass
-	def getAllInfo(self):
+	def getAddonHandler(self):
 		pass
-	def getAllUserData(self):
+	def getAllFiles(self):
 		pass
-	def getCaptchaTask(self, exclusive):
+	def getAllInfo(self):
 		pass
-	def getCaptchaTaskStatus(self, tid):
+	def getAllUnfinishedFiles(self):
 		pass
-	def getCollector(self):
+	def getAllUserData(self):
 		pass
-	def getCollectorData(self):
+	def getCollector(self):
 		pass
 	def getConfig(self):
 		pass
-	def getConfigValue(self, category, option, section):
-		pass
 	def getEvents(self, uuid):
 		pass
-	def getFileData(self, fid):
+	def getFileInfo(self, fid):
 		pass
-	def getFileOrder(self, pid):
+	def getFileTree(self, pid, full):
 		pass
-	def getInfoByPlugin(self, plugin):
+	def getGlobalPlugins(self):
 		pass
-	def getLog(self, offset):
+	def getInfoByPlugin(self, plugin):
 		pass
-	def getPackageData(self, pid):
+	def getInteractionTask(self, mode):
 		pass
-	def getPackageInfo(self, pid):
+	def getLog(self, offset):
 		pass
-	def getPackageOrder(self, destination):
+	def getNotifications(self):
 		pass
-	def getPluginConfig(self):
+	def getPackageContent(self, pid):
 		pass
-	def getQueue(self):
+	def getPackageInfo(self, pid):
 		pass
-	def getQueueData(self):
+	def getProgressInfo(self):
 		pass
 	def getServerVersion(self):
 		pass
-	def getServices(self):
+	def getUnfinishedFileTree(self, pid, full):
+		pass
+	def getUserData(self):
 		pass
-	def getUserData(self, username, password):
+	def getUserPlugins(self):
 		pass
-	def hasService(self, plugin, func):
+	def hasAddonHandler(self, plugin, func):
 		pass
-	def isCaptchaWaiting(self):
+	def isInteractionWaiting(self, mode):
 		pass
 	def isTimeDownload(self):
 		pass
@@ -326,11 +438,11 @@ class Iface:
 		pass
 	def moveFiles(self, fids, pid):
 		pass
-	def movePackage(self, destination, pid):
+	def movePackage(self, pid, root):
 		pass
-	def orderFile(self, fid, position):
+	def orderFiles(self, fids, pid, position):
 		pass
-	def orderPackage(self, pid, position):
+	def orderPackage(self, pids, position):
 		pass
 	def parseURLs(self, html, url):
 		pass
@@ -338,14 +450,14 @@ class Iface:
 		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 removeUser(self, uid):
+		pass
+	def renameCollPack(self, name, new_name):
+		pass
 	def restart(self):
 		pass
 	def restartFailed(self):
@@ -354,15 +466,19 @@ class Iface:
 		pass
 	def restartPackage(self, pid):
 		pass
-	def setCaptchaResult(self, tid, result):
+	def saveConfig(self, config):
 		pass
-	def setConfigValue(self, category, option, value, section):
+	def setConfigHandler(self, plugin, iid, value):
+		pass
+	def setInteractionResult(self, iid, result):
 		pass
 	def setPackageData(self, pid, data):
 		pass
-	def setPackageName(self, pid, name):
+	def setPackageFolder(self, pid, path):
+		pass
+	def setPackagePaused(self, pid, paused):
 		pass
-	def statusDownloads(self):
+	def setPassword(self, username, old_password, new_password):
 		pass
 	def statusServer(self):
 		pass
@@ -376,7 +492,11 @@ class Iface:
 		pass
 	def unpauseServer(self):
 		pass
-	def updateAccount(self, plugin, account, password, options):
+	def updateAccount(self, plugin, account, password):
+		pass
+	def updateAccountInfo(self, account):
+		pass
+	def updateUserData(self, data):
 		pass
 	def uploadContainer(self, filename, data):
 		pass