summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--module/FileDatabase.py2
-rwxr-xr-xpyLoadCore.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/module/FileDatabase.py b/module/FileDatabase.py
index 6798eb47f..d45763c05 100644
--- a/module/FileDatabase.py
+++ b/module/FileDatabase.py
@@ -790,7 +790,7 @@ class FileDatabaseBackend(Thread):
cmd += ")"
- cmd = "SELECT l.id FROM links as l INNER JOIN packages as p ON l.package=p.id WHERE p.queue=1 AND l.plugin NOT IN %s AND l.status IN (2,3,6,14) ORDER BY p.packageorder, l.linkorder LIMIT 5" % cmd
+ cmd = "SELECT l.id FROM links as l INNER JOIN packages as p ON l.package=p.id WHERE p.queue=1 AND l.plugin NOT IN %s AND l.status IN (2,3,6,14) ORDER BY p.priority, p.packageorder, l.linkorder LIMIT 5" % cmd
self.c.execute(cmd) # very bad!
diff --git a/pyLoadCore.py b/pyLoadCore.py
index 246bdadc6..0f6cc4268 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -569,8 +569,9 @@ class ServerMethods():
def set_package_name(self, pid, name):
- #@TODO
- self.core.file_list.packager.setPackageData(pid, package_name=name)
+ pack = self.core.files.getPackage(pid)
+ pack.name = name
+ pack.sync()
def pull_out_package(self, pid):
"""put package back to collector"""