Browse Source

Prevent unwanted change of queue order after editing job details.

When an explicit priority is set, the category evaluation should not temporarily change the priority,
which will cause a re-sort within the priority group.
pull/142/head
shypike 11 years ago
parent
commit
2d92069a3c
  1. 2
      sabnzbd/interface.py
  2. 5
      sabnzbd/nzbqueue.py

2
sabnzbd/interface.py

@ -613,7 +613,7 @@ class NzoPage(object):
if name != None: if name != None:
NzbQueue.do.change_name(nzo_id, special_fixer(name), password) NzbQueue.do.change_name(nzo_id, special_fixer(name), password)
if cat != None: if cat != None:
NzbQueue.do.change_cat(nzo_id,cat) NzbQueue.do.change_cat(nzo_id, cat, priority)
if script != None: if script != None:
NzbQueue.do.change_script(nzo_id,script) NzbQueue.do.change_script(nzo_id,script)
if pp != None: if pp != None:

5
sabnzbd/nzbqueue.py

@ -299,13 +299,14 @@ class NzbQueue(TryList):
self.__nzo_table[nzo_id].script = script self.__nzo_table[nzo_id].script = script
@synchronized(NZBQUEUE_LOCK) @synchronized(NZBQUEUE_LOCK)
def change_cat(self, nzo_ids, cat): def change_cat(self, nzo_ids, cat, explicit_priority=None):
for nzo_id in [item.strip() for item in nzo_ids.split(',')]: for nzo_id in [item.strip() for item in nzo_ids.split(',')]:
if nzo_id in self.__nzo_table: if nzo_id in self.__nzo_table:
nzo = self.__nzo_table[nzo_id] nzo = self.__nzo_table[nzo_id]
nzo.cat, pp, nzo.script, prio = cat_to_opts(cat) nzo.cat, pp, nzo.script, prio = cat_to_opts(cat)
nzo.set_pp(pp) nzo.set_pp(pp)
self.set_priority(nzo_id, prio) if explicit_priority is None:
self.set_priority(nzo_id, prio)
@synchronized(NZBQUEUE_LOCK) @synchronized(NZBQUEUE_LOCK)
def change_name(self, nzo_id, name, password=None): def change_name(self, nzo_id, name, password=None):

Loading…
Cancel
Save