From 313bad0316684fed4d1e347ebbb4e42e4e6e49dd Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 19 Apr 2014 15:31:18 +0200 Subject: major bugfix for link and packing adding --- pyload/api/DownloadApi.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'pyload/api/DownloadApi.py') diff --git a/pyload/api/DownloadApi.py b/pyload/api/DownloadApi.py index 299609e35..df573c6bb 100644 --- a/pyload/api/DownloadApi.py +++ b/pyload/api/DownloadApi.py @@ -3,15 +3,21 @@ from os.path import isabs -from pyload.Api import Api, RequirePerm, Permission +from pyload.Api import Api, RequirePerm, Permission, Role from pyload.utils.fs import join from ApiComponent import ApiComponent - class DownloadApi(ApiComponent): """ Component to create, add, delete or modify downloads.""" + # TODO: workaround for link adding without owner + def truePrimary(self): + if self.user: + return self.user.true_primary + else: + return self.core.db.getUserData(role=Role.Admin).uid + @RequirePerm(Permission.Add) def createPackage(self, name, folder, root, password="", site="", comment="", paused=False): """Create a new package. @@ -32,7 +38,7 @@ class DownloadApi(ApiComponent): folder = folder.replace("http://", "").replace(":", "").replace("\\", "_").replace("..", "") self.core.log.info(_("Added package %(name)s as folder %(folder)s") % {"name": name, "folder": folder}) - pid = self.core.files.addPackage(name, folder, root, password, site, comment, paused, self.user.true_primary) + pid = self.core.files.addPackage(name, folder, root, password, site, comment, paused, self.truePrimary()) return pid @@ -76,7 +82,7 @@ class DownloadApi(ApiComponent): """ hoster, crypter = self.core.pluginManager.parseUrls(links) - self.core.files.addLinks(hoster + crypter, pid, self.user.true_primary) + self.core.files.addLinks(hoster + crypter, pid, self.truePrimary()) if hoster: self.core.threadManager.createInfoThread(hoster, pid) -- cgit v1.2.3