added tags attribute to packages

4 files changed, 18 insertions, 12 deletions

diff --git a/module/remote/create_ttypes.py b/module/remote/create_ttypes.py
index fc4d75d32..c50142322 100644
--- a/module/remote/create_ttypes.py
+++ b/module/remote/create_ttypes.py
@@ -83,6 +83,9 @@ def main():
 class BaseObject(object):
 \t__slots__ = []
 
+\tdef __str__(self):
+\t\treturn "<%s %s>" % (self.__class__.__name__, ", ".join("%s=%s" % (k,getattr(self,k)) for k in self.__slots__))
+
 """)
 
     dev = open(join(path, "ttypes_debug.py"), "wb")
diff --git a/module/remote/pyload.thrift b/module/remote/pyload.thrift
index 50164c292..183fd3af8 100644
--- a/module/remote/pyload.thrift
+++ b/module/remote/pyload.thrift
@@ -427,7 +427,9 @@ service Pyload {
 
   PackageInfo getPackageInfo(1: PackageID pid) throws (1: PackageDoesNotExists e),
   FileInfo getFileInfo(1: FileID fid) throws (1: FileDoesNotExists e),
+
   TreeCollection findFiles(1: string pattern),
+  TreeCollection findPackages(1: list<string> tags),
 
   ///////////////////////
   // Modify Downloads
@@ -445,9 +447,8 @@ service Pyload {
   /////////////////////////
 
   // moving package while downloading is not possible, so they will return bool to indicate success
-  void setPackagePaused(1: PackageID pid, 2: bool paused) throws (1: PackageDoesNotExists e),
+  void updatePackage(1: PackageInfo pack) throws (1: PackageDoesNotExists e),
   bool setPackageFolder(1: PackageID pid, 2: string path) throws (1: PackageDoesNotExists e),
-  void setPackageData(1: PackageID pid, 2: map<string, string> data) throws (1: PackageDoesNotExists e),
 
   // as above, this will move files on disk
   bool movePackage(1: PackageID pid, 2: PackageID root) throws (1: PackageDoesNotExists e),
diff --git a/module/remote/ttypes.py b/module/remote/ttypes.py
index 4368479fd..eb990f2e8 100644
--- a/module/remote/ttypes.py
+++ b/module/remote/ttypes.py
@@ -6,6 +6,9 @@
 class BaseObject(object):
 	__slots__ = []
 
+	def __str__(self):
+		return "<%s %s>" % (self.__class__.__name__, ", ".join("%s=%s" % (k,getattr(self,k)) for k in self.__slots__))
+
 class DownloadState:
 	All = 0
 	Finished = 1
@@ -271,14 +274,13 @@ class PackageStats(BaseObject):
 		self.sizedone = sizedone
 
 class ProgressInfo(BaseObject):
-	__slots__ = ['plugin', 'name', 'statusmsg', 'eta', 'format_eta', 'done', 'total', 'download']
+	__slots__ = ['plugin', 'name', 'statusmsg', 'eta', 'done', 'total', 'download']
 
-	def __init__(self, plugin=None, name=None, statusmsg=None, eta=None, format_eta=None, done=None, total=None, download=None):
+	def __init__(self, plugin=None, name=None, statusmsg=None, 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
@@ -384,6 +386,8 @@ class Iface(object):
 		pass
 	def findFiles(self, pattern):
 		pass
+	def findPackages(self, tags):
+		pass
 	def freeSpace(self):
 		pass
 	def generateAndAddPackages(self, links, paused):
@@ -486,12 +490,8 @@ class Iface(object):
 		pass
 	def setInteractionResult(self, iid, result):
 		pass
-	def setPackageData(self, pid, data):
-		pass
 	def setPackageFolder(self, pid, path):
 		pass
-	def setPackagePaused(self, pid, paused):
-		pass
 	def setPassword(self, username, old_password, new_password):
 		pass
 	def stop(self):
@@ -510,6 +510,8 @@ class Iface(object):
 		pass
 	def updateAccountInfo(self, account):
 		pass
+	def updatePackage(self, pack):
+		pass
 	def updateUserData(self, data):
 		pass
 	def uploadContainer(self, filename, data):
diff --git a/module/remote/ttypes_debug.py b/module/remote/ttypes_debug.py
index 6ca9e892a..807a8451b 100644
--- a/module/remote/ttypes_debug.py
+++ b/module/remote/ttypes_debug.py
@@ -23,7 +23,7 @@ classes = {
 	'PackageDoesNotExists' : [int],
 	'PackageInfo' : [int, basestring, basestring, int, int, basestring, basestring, basestring, int, (list, basestring), int, int, PackageStats, (list, int), (list, int)],
 	'PackageStats' : [int, int, int, int],
-	'ProgressInfo' : [basestring, basestring, basestring, int, basestring, int, int, (None, DownloadProgress)],
+	'ProgressInfo' : [basestring, basestring, basestring, int, int, int, (None, DownloadProgress)],
 	'ServerStatus' : [int, int, int, bool, bool, bool],
 	'ServiceDoesNotExists' : [basestring, basestring],
 	'ServiceException' : [basestring],
@@ -54,6 +54,7 @@ methods = {
 	'deleteFiles': None,
 	'deletePackages': None,
 	'findFiles': TreeCollection,
+	'findPackages': TreeCollection,
 	'freeSpace': int,
 	'generateAndAddPackages': (list, int),
 	'generateDownloadLink': basestring,
@@ -105,9 +106,7 @@ methods = {
 	'saveConfig': None,
 	'setConfigHandler': None,
 	'setInteractionResult': None,
-	'setPackageData': None,
 	'setPackageFolder': bool,
-	'setPackagePaused': None,
 	'setPassword': bool,
 	'stop': None,
 	'stopAllDownloads': None,
@@ -117,6 +116,7 @@ methods = {
 	'unpauseServer': None,
 	'updateAccount': None,
 	'updateAccountInfo': None,
+	'updatePackage': None,
 	'updateUserData': None,
 	'uploadContainer': int,
 }