Merge branch 'develop' of git://github.com/gthicks/CouchPotatoServer into gthicks-develop

This commit is contained in:
Ruud
2013-07-09 23:04:28 +02:00
2 changed files with 10 additions and 0 deletions
@@ -34,6 +34,15 @@ config = [{
'label': 'Category', 'label': 'Category',
'description': 'The category CP places the nzb in. Like <strong>movies</strong> or <strong>couchpotato</strong>', 'description': 'The category CP places the nzb in. Like <strong>movies</strong> or <strong>couchpotato</strong>',
}, },
{
'name': 'priority',
'label': 'Priority',
'type': 'dropdown',
'default': '0',
'advanced': True,
'values': [('Paused', -2), ('Low', -1), ('Normal', 0), ('High', 1), ('Forced', 2)],
'description': 'Priority in the SABnzbd queue. Option to add paused.',
},
{ {
'name': 'manual', 'name': 'manual',
'default': False, 'default': False,
@@ -23,6 +23,7 @@ class Sabnzbd(Downloader):
'cat': self.conf('category'), 'cat': self.conf('category'),
'mode': 'addurl', 'mode': 'addurl',
'nzbname': self.createNzbName(data, movie), 'nzbname': self.createNzbName(data, movie),
'priority': self.conf('priority'),
} }
if filedata: if filedata: