Browse Source

The default category '*' should not override the indexer's category.

tags/0.6.0
ShyPike 15 years ago
parent
commit
49b2e87b95
  1. 2
      sabnzbd/newzbin.py
  2. 2
      sabnzbd/rss.py
  3. 2
      sabnzbd/urlgrabber.py

2
sabnzbd/newzbin.py

@ -111,7 +111,7 @@ class MSGIDGrabber(Thread):
pp = nzo.pp
script = nzo.script
cat = nzo.cat
if not cat:
if cat == '*' or not cat:
cat = cat_convert(newzbin_cat)
priority = nzo.priority

2
sabnzbd/rss.py

@ -95,7 +95,7 @@ def clear_feed(feed):
def notdefault(item):
""" Return True if not None/"None"/"Default"/""
"""
return bool(item) and isinstance(item, str) and item.lower() not in ('default', 'none')
return bool(item) and isinstance(item, str) and item.lower() not in ('default', 'none', '*')
def ListUris():

2
sabnzbd/urlgrabber.py

@ -160,7 +160,7 @@ class URLGrabber(Thread):
pp = future_nzo.pp
script = future_nzo.script
cat = future_nzo.cat
if cat is None and category:
if (cat is None or cat == '*') and category:
cat = misc.cat_convert(category)
priority = future_nzo.priority
nzbname = future_nzo.custom_name

Loading…
Cancel
Save