tsr/planet
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Only searches for name if planet_name is set. Prints a warning if no matching

Browse Source 
config is found.
This commit is contained in:
David Sveningsson 2011-02-15 15:28:14 +01:00
parent c88afaacb0
commit 2cde902af3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
planet/shell/_genshi.py
View File

@ -3,7 +3,9 @@ from xml.sax.saxutils import escape
from genshi.input import HTMLParser, XMLParser
from genshi.template import Context, MarkupTemplate
import planet
log = planet.logger
subscriptions = []
feed_types = [
'application/atom+xml',
@ -28,13 +30,15 @@ def find_config(config, feed):
if link.has_key('type') and link.type in feed_types:
if link.has_key('href') and link.href in subscriptions:
return norm(dict(config.parser.items(link.href)))
# match based on name
for sub in subscriptions:
if config.parser.has_option(sub, 'name') and \
norm(config.parser.get(sub, 'name')) == feed.planet_name:
return norm(dict(config.parser.items(sub)))
if 'planet_name' in feed:
for sub in subscriptions:
if config.parser.has_option(sub, 'name') and \
norm(config.parser.get(sub, 'name')) == feed.planet_name:
return norm(dict(config.parser.items(sub)))
log.warning('Could not match subscription to config: %s', feed.link)
return {}
class XHTMLParser(object):