changed config + progress api

1 files changed, 17 insertions, 18 deletions

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):