diff options
| author | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-07-10 14:10:34 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-07-10 14:10:34 +0200 |
| commit | 3cb10b3a240d0419338f4f8df26c684ef3ebdf92 (patch) | |
| tree | 12b8cc24e0ef68c95c6950e306c4494ed3c1f273 /pyaggr3g470r/lib/feed_utils.py | |
| parent | Merge branch 'master' of bitbucket.org:cedricbonhomme/pyaggr3g470r (diff) | |
| parent | rebuilding feed url as well (diff) | |
| download | newspipe-3cb10b3a240d0419338f4f8df26c684ef3ebdf92.tar.gz newspipe-3cb10b3a240d0419338f4f8df26c684ef3ebdf92.tar.bz2 newspipe-3cb10b3a240d0419338f4f8df26c684ef3ebdf92.zip | |
Merged in jaesivsm/pyaggr3g470r (pull request #18)
bookmarlet & navbar form improvement
Diffstat (limited to 'pyaggr3g470r/lib/feed_utils.py')
| -rw-r--r-- | pyaggr3g470r/lib/feed_utils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pyaggr3g470r/lib/feed_utils.py b/pyaggr3g470r/lib/feed_utils.py index a7149d79..367fd4b5 100644 --- a/pyaggr3g470r/lib/feed_utils.py +++ b/pyaggr3g470r/lib/feed_utils.py @@ -23,6 +23,7 @@ def construct_feed_from(url=None, fp_parsed=None, feed=None, query_site=True): assert url is not None and fp_parsed is not None feed = feed or {} feed_split = urllib.parse.urlsplit(url) + site_split = None if not fp_parsed['bozo']: feed['link'] = url feed['site_link'] = try_keys(fp_parsed['feed'], 'href', 'link') @@ -82,8 +83,8 @@ def construct_feed_from(url=None, fp_parsed=None, feed=None, query_site=True): del feed['icon'] if not feed.get('link'): - alternate = bs_parsed.find_all(check_keys(rel=['alternate'], + alternates = bs_parsed.find_all(check_keys(rel=['alternate'], type=['application/rss+xml'])) - if len(alternate) >= 1: - feed['link'] = alternate[0].attrs['href'] + if len(alternates) >= 1: + feed['link'] = rebuild_url(alternates[0].attrs['href'], feed_split) return feed |