From 6eae782f13953dd0ba2bbe1b582cf33fd4d7d90a Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 19 Dec 2011 23:10:49 +0100 Subject: configparser v2, warning CONFIG will be DELETED. --- module/remote/socketbackend/ttypes.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'module/remote/socketbackend/ttypes.py') diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index f8ea121fa..ff5ae2467 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -71,22 +71,26 @@ class CaptchaTask(BaseObject): self.resultType = resultType class ConfigItem(BaseObject): - __slots__ = ['name', 'description', 'value', 'type'] + __slots__ = ['name', 'long_name', 'description', 'type', 'default_value', 'value'] - def __init__(self, name=None, description=None, value=None, type=None): + def __init__(self, name=None, long_name=None, description=None, type=None, default_value=None, value=None): self.name = name + self.long_name = long_name self.description = description - self.value = value self.type = type + self.default_value = default_value + self.value = value class ConfigSection(BaseObject): - __slots__ = ['name', 'description', 'items', 'outline'] + __slots__ = ['name', 'long_name', 'description', 'long_description', 'items', 'handler'] - def __init__(self, name=None, description=None, items=None, outline=None): + def __init__(self, name=None, long_name=None, description=None, long_description=None, items=None, handler=None): self.name = name + self.long_name = long_name self.description = description + self.long_description = long_description self.items = items - self.outline = outline + 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'] @@ -252,6 +256,8 @@ class Iface: pass def checkURLs(self, urls): pass + def configureSection(self, section): + pass def deleteFiles(self, fids): pass def deleteFinished(self): @@ -282,7 +288,7 @@ class Iface: pass def getConfig(self): pass - def getConfigValue(self, category, option, section): + def getConfigValue(self, section, option): pass def getEvents(self, uuid): pass @@ -356,7 +362,7 @@ class Iface: pass def setCaptchaResult(self, tid, result): pass - def setConfigValue(self, category, option, value, section): + def setConfigValue(self, section, option, value): pass def setPackageData(self, pid, data): pass -- cgit v1.2.3 From 958bf611f5d9d117f19f824990ec6fd6b537e967 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Thu, 22 Dec 2011 23:45:38 +0100 Subject: accountmanager v2, delete your accounts.conf and re-enter them in pyload, new nice debug functions, try core.shell() and core.breakpoint() --- module/remote/socketbackend/ttypes.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'module/remote/socketbackend/ttypes.py') diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index ff5ae2467..6589e5923 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -27,10 +27,6 @@ class DownloadStatus: Unknown = 14 Waiting = 5 -class ElementType: - File = 1 - Package = 0 - class Input: BOOL = 4 CHOICE = 6 @@ -49,17 +45,18 @@ class Output: QUESTION = 2 class AccountInfo(BaseObject): - __slots__ = ['validuntil', 'login', 'options', 'valid', 'trafficleft', 'maxtraffic', 'premium', 'type'] + __slots__ = ['plugin', 'loginname', 'valid', 'validuntil', 'trafficleft', 'maxtraffic', 'premium', 'activated', '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, valid=None, validuntil=None, trafficleft=None, maxtraffic=None, premium=None, activated=None, options=None): + self.plugin = plugin + self.loginname = loginname self.valid = valid + self.validuntil = validuntil self.trafficleft = trafficleft self.maxtraffic = maxtraffic self.premium = premium - self.type = type + self.activated = activated + self.options = options class CaptchaTask(BaseObject): __slots__ = ['tid', 'data', 'type', 'resultType'] @@ -114,13 +111,11 @@ class DownloadInfo(BaseObject): self.plugin = plugin class EventInfo(BaseObject): - __slots__ = ['eventname', 'id', 'type', 'destination'] + __slots__ = ['eventname', 'event_args'] - def __init__(self, eventname=None, id=None, type=None, destination=None): + def __init__(self, eventname=None, event_args=None): self.eventname = eventname - self.id = id - self.type = type - self.destination = destination + self.event_args = event_args class FileData(BaseObject): __slots__ = ['fid', 'url', 'name', 'plugin', 'size', 'format_size', 'status', 'statusmsg', 'packageID', 'error', 'order'] -- cgit v1.2.3 From d35c003cc53d4723d1dfe0d81eeb9bea78cee594 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 31 Dec 2011 16:01:24 +0100 Subject: new crypter plugin API, now decrypting possible for now. --- module/remote/socketbackend/ttypes.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'module/remote/socketbackend/ttypes.py') diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index 6589e5923..682b2b52a 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -207,13 +207,12 @@ class ServerStatus(BaseObject): self.reconnect = reconnect class ServiceCall(BaseObject): - __slots__ = ['plugin', 'func', 'arguments', 'parseArguments'] + __slots__ = ['plugin', 'func', 'arguments'] - def __init__(self, plugin=None, func=None, arguments=None, parseArguments=None): + def __init__(self, plugin=None, func=None, arguments=None): self.plugin = plugin self.func = func self.arguments = arguments - self.parseArguments = parseArguments class ServiceDoesNotExists(Exception): __slots__ = ['plugin', 'func'] @@ -238,10 +237,16 @@ class UserData(BaseObject): self.permission = permission self.templateName = templateName +class UserDoesNotExists(Exception): + __slots__ = ['user'] + + def __init__(self, user=None): + self.user = user + class Iface: def addFiles(self, pid, links): pass - def addPackage(self, name, links, dest): + def addPackage(self, name, links, dest, password): pass def call(self, info): pass -- cgit v1.2.3 From 4df2b77fdf42046fe19bd371be7c7255986b5980 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 6 Mar 2012 13:36:39 +0100 Subject: renamed hooks to addons, new filemanager and database, many new api methods you will loose ALL your LINKS, webinterface will NOT work --- module/remote/socketbackend/ttypes.py | 347 ++++++++++++++++++++-------------- 1 file changed, 208 insertions(+), 139 deletions(-) (limited to 'module/remote/socketbackend/ttypes.py') diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index 682b2b52a..91430d720 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -6,43 +6,61 @@ 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 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 + Choice = 6 + Click = 5 + List = 8 + Multiple = 7 + NA = 0 + Password = 3 + 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: + Ok = 0 + Paused = 1 + Remote = 2 class AccountInfo(BaseObject): __slots__ = ['plugin', 'loginname', 'valid', 'validuntil', 'trafficleft', 'maxtraffic', 'premium', 'activated', 'options'] @@ -58,57 +76,56 @@ class AccountInfo(BaseObject): self.activated = activated 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 AddonService(BaseObject): + __slots__ = ['func_name', 'description', 'media', 'package'] + + def __init__(self, func_name=None, description=None, media=None, package=None): + self.func_name = func_name + self.description = description + self.media = media + self.package = package class ConfigItem(BaseObject): - __slots__ = ['name', 'long_name', 'description', 'type', 'default_value', 'value'] + __slots__ = ['name', 'display_name', 'description', 'type', 'default_value', 'value'] - def __init__(self, name=None, long_name=None, description=None, type=None, default_value=None, value=None): + def __init__(self, name=None, display_name=None, description=None, type=None, default_value=None, value=None): self.name = name - self.long_name = long_name + self.display_name = display_name self.description = description self.type = type self.default_value = default_value self.value = value class ConfigSection(BaseObject): - __slots__ = ['name', 'long_name', 'description', 'long_description', 'items', 'handler'] + __slots__ = ['name', 'display_name', 'description', 'long_description', 'items', 'info', 'handler'] - def __init__(self, name=None, long_name=None, description=None, long_description=None, items=None, handler=None): + def __init__(self, name=None, display_name=None, description=None, long_description=None, items=None, info=None, handler=None): self.name = name - self.long_name = long_name + self.display_name = display_name self.description = description self.long_description = long_description self.items = items + 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'] + __slots__ = ['url', 'plugin', 'hash', 'status', 'statusmsg', 'error'] - 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 + def __init__(self, url=None, plugin=None, hash=None, status=None, statusmsg=None, error=None): + self.url = url + self.plugin = plugin + self.hash = hash 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.error = error class EventInfo(BaseObject): __slots__ = ['eventname', 'event_args'] @@ -117,42 +134,50 @@ class EventInfo(BaseObject): self.eventname = eventname self.event_args = event_args -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 FileInfo(BaseObject): + __slots__ = ['fid', 'name', 'package', 'size', 'status', 'media', 'added', 'fileorder', 'download'] + + def __init__(self, fid=None, name=None, package=None, size=None, status=None, media=None, added=None, fileorder=None, download=None): + self.fid = fid + self.name = name + self.package = package + 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'] @@ -160,39 +185,67 @@ 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', '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, 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.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 PackageView(BaseObject): + __slots__ = ['root', 'files', 'packages'] - def __init__(self, pid=None): - self.pid = pid + def __init__(self, root=None, files=None, packages=None): + self.root = root + self.files = files + self.packages = packages + +class ProgressInfo(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 ServerStatus(BaseObject): __slots__ = ['pause', 'active', 'queue', 'total', 'speed', 'download', 'reconnect'] @@ -206,14 +259,6 @@ class ServerStatus(BaseObject): self.download = download self.reconnect = reconnect -class ServiceCall(BaseObject): - __slots__ = ['plugin', 'func', 'arguments'] - - def __init__(self, plugin=None, func=None, arguments=None): - self.plugin = plugin - self.func = func - self.arguments = arguments - class ServiceDoesNotExists(Exception): __slots__ = ['plugin', 'func'] @@ -244,11 +289,23 @@ class UserDoesNotExists(Exception): self.user = user class Iface: - def addFiles(self, pid, links): + def addFromCollector(self, name, paused): + pass + def addLinks(self, pid, links): + pass + def addPackage(self, name, links, password): + pass + def addPackageChild(self, name, links, password, root, paused): + pass + def addPackageP(self, name, links, password, paused): pass - def addPackage(self, name, links, dest, password): + def addToCollector(self, links): pass - def call(self, info): + def autoAddLinks(self, links): + pass + def call(self, plugin, func, arguments): + pass + def callAddonHandler(self, plugin, func, pid_or_fid): pass def checkOnlineStatus(self, urls): pass @@ -258,15 +315,23 @@ class Iface: pass def configureSection(self, section): pass - def deleteFiles(self, fids): + def createPackage(self, name, folder, root, password, site, comment, paused): + pass + def deleteCollLink(self, url): pass - def deleteFinished(self): + def deleteCollPack(self, name): + 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 @@ -274,17 +339,17 @@ 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 @@ -292,35 +357,35 @@ class Iface: 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): pass + def getInteractionTask(self, mode): + pass def getLog(self, offset): pass - def getPackageData(self, pid): + def getPackageContent(self, pid): pass def getPackageInfo(self, pid): pass - def getPackageOrder(self, destination): - pass def getPluginConfig(self): pass - def getQueue(self): - pass - def getQueueData(self): + def getProgressInfo(self): pass def getServerVersion(self): pass def getServices(self): pass + def getUnfinishedFileTree(self, pid, full): + pass def getUserData(self, username, password): pass def hasService(self, plugin, func): pass - def isCaptchaWaiting(self): + def isInteractionWaiting(self, mode): pass def isTimeDownload(self): pass @@ -332,11 +397,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 @@ -344,14 +409,12 @@ 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 renameCollPack(self, name, new_name): + pass def restart(self): pass def restartFailed(self): @@ -360,15 +423,21 @@ class Iface: pass def restartPackage(self, pid): pass - def setCaptchaResult(self, tid, result): + def scanDownloadFolder(self): + pass + def setConfigHandler(self, plugin, iid, value): pass def setConfigValue(self, section, option, value): pass + def setFilePaused(self, fid, paused): + 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 statusDownloads(self): + def setPackagePaused(self, pid, paused): pass def statusServer(self): pass -- cgit v1.2.3 From 50d4df8b4d48b855bd18e9922355b7f3f2b4da4e Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 20 Mar 2012 14:57:45 +0100 Subject: captcha decrypting for all plugin types, new interaction manager --- module/remote/socketbackend/ttypes.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'module/remote/socketbackend/ttypes.py') diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index 91430d720..1fd61ae72 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -367,6 +367,8 @@ class Iface: pass def getLog(self, offset): pass + def getNotifications(self): + pass def getPackageContent(self, pid): pass def getPackageInfo(self, pid): -- cgit v1.2.3 From 84efa9d5ccd46a0adddc256a5eba4f8e33c76afd Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 7 May 2012 18:42:29 +0200 Subject: new multiuser api methods --- module/remote/socketbackend/ttypes.py | 41 ++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) (limited to 'module/remote/socketbackend/ttypes.py') diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index 1fd61ae72..36f2b01ef 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -62,18 +62,36 @@ class PackageStatus: Paused = 1 Remote = 2 +class Permission: + Accounts = 128 + Add = 1 + Addons = 512 + All = 0 + Delete = 2 + Download = 64 + Interaction = 256 + List = 16 + Modify = 32 + Status = 4 + +class Role: + Admin = 0 + User = 1 + class AccountInfo(BaseObject): - __slots__ = ['plugin', 'loginname', 'valid', 'validuntil', 'trafficleft', 'maxtraffic', 'premium', 'activated', 'options'] + __slots__ = ['plugin', 'loginname', 'owner', 'valid', 'validuntil', 'trafficleft', 'maxtraffic', 'premium', 'activated', 'shared', 'options'] - def __init__(self, plugin=None, loginname=None, valid=None, validuntil=None, trafficleft=None, maxtraffic=None, premium=None, activated=None, options=None): + 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.activated = activated + self.shared = shared self.options = options class AddonInfo(BaseObject): @@ -273,13 +291,18 @@ class ServiceException(Exception): self.msg = msg class UserData(BaseObject): - __slots__ = ['name', 'email', 'role', 'permission', 'templateName'] + __slots__ = ['uid', 'name', 'email', 'role', 'permission', 'folder', 'traffic', 'limit', '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, limit=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.limit = limit + self.user = user self.templateName = templateName class UserDoesNotExists(Exception): @@ -301,6 +324,8 @@ class Iface: pass def addToCollector(self, links): pass + def addUser(self, username, password): + pass def autoAddLinks(self, links): pass def call(self, plugin, func, arguments): @@ -383,7 +408,7 @@ class Iface: pass def getUnfinishedFileTree(self, pid, full): pass - def getUserData(self, username, password): + def getUserData(self): pass def hasService(self, plugin, func): pass @@ -415,6 +440,8 @@ class Iface: pass def removeAccount(self, plugin, account): pass + def removeUser(self, uid): + pass def renameCollPack(self, name, new_name): pass def restart(self): @@ -441,6 +468,8 @@ class Iface: pass def setPackagePaused(self, pid, paused): pass + def setPassword(self, username, old_password, new_password): + pass def statusServer(self): pass def stopAllDownloads(self): @@ -455,6 +484,8 @@ class Iface: pass def updateAccount(self, plugin, account, password, options): pass + def updateUserData(self, data): + pass def uploadContainer(self, filename, data): pass -- cgit v1.2.3 From 829244a6140763712d50ed046c33f415f2b04301 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 15 May 2012 19:22:34 +0200 Subject: some multiuser db changes --- module/remote/socketbackend/ttypes.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'module/remote/socketbackend/ttypes.py') diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index 36f2b01ef..127098ec3 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -159,12 +159,13 @@ class FileDoesNotExists(Exception): self.fid = fid class FileInfo(BaseObject): - __slots__ = ['fid', 'name', 'package', 'size', 'status', 'media', 'added', 'fileorder', 'download'] + __slots__ = ['fid', 'name', 'package', 'owner', 'size', 'status', 'media', 'added', 'fileorder', 'download'] - def __init__(self, fid=None, name=None, package=None, size=None, status=None, media=None, added=None, fileorder=None, download=None): + 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 @@ -210,13 +211,14 @@ class PackageDoesNotExists(Exception): self.pid = pid class PackageInfo(BaseObject): - __slots__ = ['pid', 'name', 'folder', 'root', 'site', 'comment', 'password', 'added', 'status', 'packageorder', 'stats', 'fids', 'pids'] + __slots__ = ['pid', 'name', 'folder', 'root', 'owner', 'site', 'comment', 'password', 'added', 'status', 'packageorder', 'stats', 'fids', 'pids'] - def __init__(self, pid=None, name=None, folder=None, root=None, site=None, comment=None, password=None, added=None, status=None, packageorder=None, stats=None, fids=None, pids=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 @@ -291,9 +293,9 @@ class ServiceException(Exception): self.msg = msg class UserData(BaseObject): - __slots__ = ['uid', 'name', 'email', 'role', 'permission', 'folder', 'traffic', 'limit', 'user', 'templateName'] + __slots__ = ['uid', 'name', 'email', 'role', 'permission', 'folder', 'traffic', 'dllimit', 'user', 'templateName'] - def __init__(self, uid=None, name=None, email=None, role=None, permission=None, folder=None, traffic=None, limit=None, user=None, templateName=None): + def __init__(self, uid=None, name=None, email=None, role=None, permission=None, folder=None, traffic=None, dllimit=None, user=None, templateName=None): self.uid = uid self.name = name self.email = email @@ -301,7 +303,7 @@ class UserData(BaseObject): self.permission = permission self.folder = folder self.traffic = traffic - self.limit = limit + self.dllimit = dllimit self.user = user self.templateName = templateName -- cgit v1.2.3 From 0d2d6daef850ac6bcc7fafccd230e52d2a862c2c Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 3 Jun 2012 17:45:10 +0200 Subject: updates for database + api --- module/remote/socketbackend/ttypes.py | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'module/remote/socketbackend/ttypes.py') diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index 127098ec3..b7e0d7f3d 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -63,16 +63,15 @@ class PackageStatus: Remote = 2 class Permission: - Accounts = 128 + Accounts = 32 Add = 1 - Addons = 512 + Addons = 128 All = 0 Delete = 2 - Download = 64 - Interaction = 256 - List = 16 - Modify = 32 - Status = 4 + Download = 16 + Interaction = 64 + Modify = 4 + Status = 8 class Role: Admin = 0 @@ -103,13 +102,13 @@ class AddonInfo(BaseObject): self.value = value class AddonService(BaseObject): - __slots__ = ['func_name', 'description', 'media', 'package'] + __slots__ = ['func_name', 'description', 'arguments', 'media'] - def __init__(self, func_name=None, description=None, media=None, package=None): + def __init__(self, func_name=None, description=None, arguments=None, media=None): self.func_name = func_name self.description = description + self.arguments = arguments self.media = media - self.package = package class ConfigItem(BaseObject): __slots__ = ['name', 'display_name', 'description', 'type', 'default_value', 'value'] @@ -293,9 +292,9 @@ class ServiceException(Exception): self.msg = msg class UserData(BaseObject): - __slots__ = ['uid', 'name', 'email', 'role', 'permission', 'folder', 'traffic', 'dllimit', 'user', 'templateName'] + __slots__ = ['uid', 'name', 'email', 'role', 'permission', 'folder', 'traffic', 'dllimit', 'dlquota', 'hddquota', 'user', 'templateName'] - def __init__(self, uid=None, name=None, email=None, role=None, permission=None, folder=None, traffic=None, dllimit=None, user=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 @@ -304,6 +303,8 @@ class UserData(BaseObject): self.folder = folder self.traffic = traffic self.dllimit = dllimit + self.dlquota = dlquota + self.hddquota = hddquota self.user = user self.templateName = templateName @@ -318,6 +319,8 @@ class Iface: pass def addLinks(self, pid, links): pass + def addLocalFile(self, pid, name, path): + pass def addPackage(self, name, links, password): pass def addPackageChild(self, name, links, password, root, paused): @@ -328,9 +331,7 @@ class Iface: pass def addUser(self, username, password): pass - def autoAddLinks(self, links): - pass - def call(self, plugin, func, arguments): + def callAddon(self, plugin, func, arguments): pass def callAddonHandler(self, plugin, func, pid_or_fid): pass @@ -406,13 +407,11 @@ class Iface: pass def getServerVersion(self): pass - def getServices(self): - pass def getUnfinishedFileTree(self, pid, full): pass def getUserData(self): pass - def hasService(self, plugin, func): + def hasAddonHandler(self, plugin, func): pass def isInteractionWaiting(self, mode): pass -- cgit v1.2.3 From cbd4f4b5375f89362733e10a9b98e5a74c2a5734 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Fri, 31 Aug 2012 23:25:26 +0200 Subject: first js models/views --- module/remote/socketbackend/ttypes.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'module/remote/socketbackend/ttypes.py') diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index b7e0d7f3d..569c758fe 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -32,15 +32,15 @@ class FileStatus: class Input: Bool = 4 - Choice = 6 Click = 5 List = 8 Multiple = 7 NA = 0 Password = 3 + Select = 6 Table = 9 Text = 1 - TextBox = 2 + Textbox = 2 class MediaType: All = 0 @@ -58,20 +58,20 @@ class Output: Query = 4 class PackageStatus: + Folder = 2 Ok = 0 Paused = 1 - Remote = 2 + Remote = 3 class Permission: - Accounts = 32 + Accounts = 16 Add = 1 - Addons = 128 + Addons = 64 All = 0 Delete = 2 - Download = 16 - Interaction = 64 + Download = 8 + Interaction = 32 Modify = 4 - Status = 8 class Role: Admin = 0 @@ -237,14 +237,6 @@ class PackageStats(BaseObject): self.sizetotal = sizetotal self.sizedone = sizedone -class PackageView(BaseObject): - __slots__ = ['root', 'files', 'packages'] - - def __init__(self, root=None, files=None, packages=None): - self.root = root - self.files = files - self.packages = packages - class ProgressInfo(BaseObject): __slots__ = ['fid', 'name', 'speed', 'eta', 'format_eta', 'bleft', 'size', 'format_size', 'percent', 'status', 'statusmsg', 'format_wait', 'wait_until', 'packageID', 'packageName', 'plugin'] @@ -291,6 +283,14 @@ 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__ = ['uid', 'name', 'email', 'role', 'permission', 'folder', 'traffic', 'dllimit', 'dlquota', 'hddquota', 'user', 'templateName'] -- cgit v1.2.3 From 560958b70043ea5b7e0e32d41cb51bd44696d775 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 9 Sep 2012 15:39:50 +0200 Subject: new config api --- module/remote/socketbackend/ttypes.py | 62 +++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 25 deletions(-) (limited to 'module/remote/socketbackend/ttypes.py') diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index 569c758fe..fd520f418 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -66,12 +66,12 @@ class PackageStatus: class Permission: Accounts = 16 Add = 1 - Addons = 64 All = 0 Delete = 2 Download = 8 Interaction = 32 Modify = 4 + Plugins = 64 class Role: Admin = 0 @@ -110,29 +110,39 @@ class AddonService(BaseObject): self.arguments = arguments self.media = media -class ConfigItem(BaseObject): - __slots__ = ['name', 'display_name', 'description', 'type', 'default_value', 'value'] - - def __init__(self, name=None, display_name=None, description=None, type=None, default_value=None, value=None): - self.name = name - self.display_name = display_name - self.description = description - self.type = type - self.default_value = default_value - self.value = value +class ConfigHolder(BaseObject): + __slots__ = ['name', 'label', 'description', 'long_description', 'items', 'info', 'handler'] -class ConfigSection(BaseObject): - __slots__ = ['name', 'display_name', 'description', 'long_description', 'items', 'info', 'handler'] - - def __init__(self, name=None, display_name=None, description=None, long_description=None, items=None, info=None, handler=None): + def __init__(self, name=None, label=None, description=None, long_description=None, items=None, info=None, handler=None): self.name = name - self.display_name = display_name + self.label = label self.description = description self.long_description = long_description self.items = items self.info = info self.handler = handler +class ConfigInfo(BaseObject): + __slots__ = ['name', 'label', 'description', 'saved', 'activated'] + + def __init__(self, name=None, label=None, description=None, saved=None, activated=None): + self.name = name + self.label = label + self.description = description + self.saved = saved + self.activated = activated + +class ConfigItem(BaseObject): + __slots__ = ['name', 'label', 'description', 'type', 'default_value', 'value'] + + 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.default_value = default_value + self.value = value + class DownloadInfo(BaseObject): __slots__ = ['url', 'plugin', 'hash', 'status', 'statusmsg', 'error'] @@ -341,7 +351,7 @@ class Iface: pass def checkURLs(self, urls): pass - def configureSection(self, section): + def configurePlugin(self, plugin): pass def createPackage(self, name, folder, root, password, site, comment, paused): pass @@ -349,6 +359,8 @@ class Iface: pass def deleteCollPack(self, name): pass + def deleteConfig(self, config): + pass def deleteFiles(self, fids): pass def deletePackages(self, pids): @@ -381,14 +393,14 @@ class Iface: pass def getConfig(self): pass - def getConfigValue(self, section, option): - pass def getEvents(self, uuid): pass def getFileInfo(self, fid): pass def getFileTree(self, pid, full): pass + def getGlobalPlugins(self): + pass def getInfoByPlugin(self, plugin): pass def getInteractionTask(self, mode): @@ -401,8 +413,6 @@ class Iface: pass def getPackageInfo(self, pid): pass - def getPluginConfig(self): - pass def getProgressInfo(self): pass def getServerVersion(self): @@ -411,6 +421,8 @@ class Iface: pass def getUserData(self): pass + def getUserPlugins(self): + pass def hasAddonHandler(self, plugin, func): pass def isInteractionWaiting(self, mode): @@ -453,12 +465,10 @@ class Iface: pass def restartPackage(self, pid): pass - def scanDownloadFolder(self): + def saveConfig(self, config): pass def setConfigHandler(self, plugin, iid, value): pass - def setConfigValue(self, section, option, value): - pass def setFilePaused(self, fid, paused): pass def setInteractionResult(self, iid, result): @@ -483,7 +493,9 @@ 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 -- cgit v1.2.3 From 54bc92b4c5e0b3543a313f497cbc2276403c5980 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 10 Sep 2012 11:49:35 +0200 Subject: changed config + progress api --- module/remote/socketbackend/ttypes.py | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'module/remote/socketbackend/ttypes.py') diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index fd520f418..f4697e39e 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -154,6 +154,15 @@ class DownloadInfo(BaseObject): self.statusmsg = statusmsg self.error = error +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'] @@ -248,25 +257,17 @@ class PackageStats(BaseObject): self.sizedone = sizedone class ProgressInfo(BaseObject): - __slots__ = ['fid', 'name', 'speed', 'eta', 'format_eta', 'bleft', 'size', 'format_size', 'percent', 'status', 'statusmsg', 'format_wait', 'wait_until', 'packageID', 'packageName', 'plugin'] + __slots__ = ['plugin', 'name', 'statusmsg', 'eta', 'format_eta', 'done', 'total', 'download'] - 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, plugin=None, name=None, statusmsg=None, eta=None, format_eta=None, done=None, total=None, download=None): + self.plugin = plugin self.name = name - self.speed = speed + self.statusmsg = statusmsg 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.done = done + self.total = total + self.download = download class ServerStatus(BaseObject): __slots__ = ['pause', 'active', 'queue', 'total', 'speed', 'download', 'reconnect'] @@ -359,7 +360,7 @@ class Iface: pass def deleteCollPack(self, name): pass - def deleteConfig(self, config): + def deleteConfig(self, plugin): pass def deleteFiles(self, fids): pass @@ -469,8 +470,6 @@ class Iface: pass def setConfigHandler(self, plugin, iid, value): pass - def setFilePaused(self, fid, paused): - pass def setInteractionResult(self, iid, result): pass def setPackageData(self, pid, data): -- cgit v1.2.3 From cd99410a04685bbffed04091a7ad03e017140277 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 10 Sep 2012 13:36:09 +0200 Subject: cosmetic fixed, changed default server to threaded --- module/remote/socketbackend/ttypes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/remote/socketbackend/ttypes.py') diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index f4697e39e..06f051fc7 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -325,7 +325,7 @@ class UserDoesNotExists(Exception): def __init__(self, user=None): self.user = user -class Iface: +class Iface(object): def addFromCollector(self, name, paused): pass def addLinks(self, pid, links): -- cgit v1.2.3