some multiuser db changes

4 files changed, 64 insertions, 54 deletions

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
 
diff --git a/module/remote/thriftbackend/pyload.thrift b/module/remote/thriftbackend/pyload.thrift
index 254f41068..181ca4204 100644
--- a/module/remote/thriftbackend/pyload.thrift
+++ b/module/remote/thriftbackend/pyload.thrift
@@ -84,13 +84,12 @@ enum Permission {
     All = 0,  // requires no permission, but login
     Add = 1,  // can add packages
     Delete = 2, // can delete packages
-    Status = 4,   // see and change server status
-    List = 16,  // see listed downloads
-    Modify = 32, // modify some attribute of downloads
-    Download = 64,  // can download from webinterface
-    Accounts = 128, // can access accounts
-    Interaction = 256, // can interact with plugins
-    Addons = 512 // user can activate addons
+    Modify = 4, // modify some attribute of downloads
+    Status = 8,   // see and change server status
+    Download = 16,  // can download from webinterface
+    Accounts = 32, // can access accounts
+    Interaction = 64, // can interact with plugins
+    Addons = 128 // user can activate addons
 }
 
 enum Role {
@@ -141,12 +140,13 @@ struct FileInfo {
   1: FileID fid,
   2: string name,
   3: PackageID package,
-  4: ByteCount size,
-  5: FileStatus status,
-  6: MediaType media,
-  7: UTCDate added,
-  8: i16 fileorder,
-  9: optional DownloadInfo download,
+  4: UserID owner,
+  5: ByteCount size,
+  6: FileStatus status,
+  7: MediaType media,
+  8: UTCDate added,
+  9: i16 fileorder,
+  10: optional DownloadInfo download,
 }
 
 struct PackageStats {
@@ -161,15 +161,16 @@ struct PackageInfo {
   2: string name,
   3: string folder,
   4: PackageID root,
-  5: string site,
-  6: string comment,
-  7: string password,
-  8: UTCDate added,
-  9: PackageStatus status,
-  10: i16 packageorder,
-  11: PackageStats stats,
-  12: list<FileID> fids,
-  13: list<PackageID> pids,
+  5: UserID owner,
+  6: string site,
+  7: string comment,
+  8: string password,
+  9: UTCDate added,
+  10: PackageStatus status,
+  11: i16 packageorder,
+  12: PackageStats stats,
+  13: list<FileID> fids,
+  14: list<PackageID> pids,
 }
 
 // thrift does not allow recursive datatypes, so all data is accumulated and mapped with id
@@ -266,10 +267,9 @@ struct AddonService {
 
 struct OnlineCheck {
   1: ResultID rid, // -1 -> nothing more to get
-  2: map<string, LinkStatus> data, //url to result
+  2: map<string, LinkStatus> data, // url to result
 }
 
-
 // exceptions
 
 exception PackageDoesNotExists {
diff --git a/module/remote/thriftbackend/thriftgen/pyload/Pyload.py b/module/remote/thriftbackend/thriftgen/pyload/Pyload.py
index c45663d25..dd446cfc3 100644
--- a/module/remote/thriftbackend/thriftgen/pyload/Pyload.py
+++ b/module/remote/thriftbackend/thriftgen/pyload/Pyload.py
@@ -9,7 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TException
 from ttypes import *
 from thrift.Thrift import TProcessor
-from thrift.protocol.TBase import TBase, TExceptionBase, TApplicationException
+from thrift.protocol.TBase import TBase, TExceptionBase
 
 
 class Iface(object):
diff --git a/module/remote/thriftbackend/thriftgen/pyload/ttypes.py b/module/remote/thriftbackend/thriftgen/pyload/ttypes.py
index c177a9dd2..d170f4688 100644
--- a/module/remote/thriftbackend/thriftgen/pyload/ttypes.py
+++ b/module/remote/thriftbackend/thriftgen/pyload/ttypes.py
@@ -411,6 +411,7 @@ class FileInfo(TBase):
    - fid
    - name
    - package
+   - owner
    - size
    - status
    - media
@@ -423,6 +424,7 @@ class FileInfo(TBase):
     'fid',
     'name',
     'package',
+    'owner',
     'size',
     'status',
     'media',
@@ -436,18 +438,20 @@ class FileInfo(TBase):
     (1, TType.I32, 'fid', None, None, ), # 1
     (2, TType.STRING, 'name', None, None, ), # 2
     (3, TType.I32, 'package', None, None, ), # 3
-    (4, TType.I64, 'size', None, None, ), # 4
-    (5, TType.I32, 'status', None, None, ), # 5
-    (6, TType.I32, 'media', None, None, ), # 6
-    (7, TType.I64, 'added', None, None, ), # 7
-    (8, TType.I16, 'fileorder', None, None, ), # 8
-    (9, TType.STRUCT, 'download', (DownloadInfo, DownloadInfo.thrift_spec), None, ), # 9
+    (4, TType.I32, 'owner', None, None, ), # 4
+    (5, TType.I64, 'size', None, None, ), # 5
+    (6, TType.I32, 'status', None, None, ), # 6
+    (7, TType.I32, 'media', None, None, ), # 7
+    (8, TType.I64, 'added', None, None, ), # 8
+    (9, TType.I16, 'fileorder', None, None, ), # 9
+    (10, TType.STRUCT, 'download', (DownloadInfo, DownloadInfo.thrift_spec), None, ), # 10
   )
 
-  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
@@ -494,6 +498,7 @@ class PackageInfo(TBase):
    - name
    - folder
    - root
+   - owner
    - site
    - comment
    - password
@@ -510,6 +515,7 @@ class PackageInfo(TBase):
     'name',
     'folder',
     'root',
+    'owner',
     'site',
     'comment',
     'password',
@@ -527,22 +533,24 @@ class PackageInfo(TBase):
     (2, TType.STRING, 'name', None, None, ), # 2
     (3, TType.STRING, 'folder', None, None, ), # 3
     (4, TType.I32, 'root', None, None, ), # 4
-    (5, TType.STRING, 'site', None, None, ), # 5
-    (6, TType.STRING, 'comment', None, None, ), # 6
-    (7, TType.STRING, 'password', None, None, ), # 7
-    (8, TType.I64, 'added', None, None, ), # 8
-    (9, TType.I32, 'status', None, None, ), # 9
-    (10, TType.I16, 'packageorder', None, None, ), # 10
-    (11, TType.STRUCT, 'stats', (PackageStats, PackageStats.thrift_spec), None, ), # 11
-    (12, TType.LIST, 'fids', (TType.I32,None), None, ), # 12
-    (13, TType.LIST, 'pids', (TType.I32,None), None, ), # 13
+    (5, TType.I32, 'owner', None, None, ), # 5
+    (6, TType.STRING, 'site', None, None, ), # 6
+    (7, TType.STRING, 'comment', None, None, ), # 7
+    (8, TType.STRING, 'password', None, None, ), # 8
+    (9, TType.I64, 'added', None, None, ), # 9
+    (10, TType.I32, 'status', None, None, ), # 10
+    (11, TType.I16, 'packageorder', None, None, ), # 11
+    (12, TType.STRUCT, 'stats', (PackageStats, PackageStats.thrift_spec), None, ), # 12
+    (13, TType.LIST, 'fids', (TType.I32,None), None, ), # 13
+    (14, TType.LIST, 'pids', (TType.I32,None), None, ), # 14
   )
 
-  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
@@ -809,7 +817,7 @@ class UserData(TBase):
    - permission
    - folder
    - traffic
-   - limit
+   - dllimit
    - user
    - templateName
   """
@@ -822,7 +830,7 @@ class UserData(TBase):
     'permission',
     'folder',
     'traffic',
-    'limit',
+    'dllimit',
     'user',
     'templateName',
    ]
@@ -836,12 +844,12 @@ class UserData(TBase):
     (5, TType.I16, 'permission', None, None, ), # 5
     (6, TType.STRING, 'folder', None, None, ), # 6
     (7, TType.I64, 'traffic', None, None, ), # 7
-    (8, TType.I16, 'limit', None, None, ), # 8
+    (8, TType.I16, 'dllimit', None, None, ), # 8
     (9, TType.I32, 'user', None, None, ), # 9
     (10, TType.STRING, 'templateName', None, None, ), # 10
   )
 
-  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
@@ -849,7 +857,7 @@ class UserData(TBase):
     self.permission = permission
     self.folder = folder
     self.traffic = traffic
-    self.limit = limit
+    self.dllimit = dllimit
     self.user = user
     self.templateName = templateName