maryjane
/
gpodder
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Combine feed autodiscovery conditionals

This commit is contained in:
Mel Collins 2017-04-02 13:24:36 +02:00
parent 8e70acaceb
commit 8fb2c35e64
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/gpodder/feedcore.py
View File

@ -174,26 +174,25 @@ class Fetcher(object):
return self._check_statuscode(e, e.geturl())
data = stream
if not is_local and stream.headers.get('content-type', '').startswith('text/html'):
if autodiscovery:
# We use StringIO in case the stream needs to be read again
data = StringIO(stream.read())
ad = FeedAutodiscovery(url)
ad.feed(data.read())
if ad._resolved_url:
try:
self._parse_feed(ad._resolved_url, None, None, False)
return Result(NEW_LOCATION, ad._resolved_url)
except Exception as e:
logger.warn('Feed autodiscovery failed', exc_info=True)
if autodiscovery and not is_local and stream.headers.get('content-type', '').startswith('text/html'):
# We use StringIO in case the stream needs to be read again
data = StringIO(stream.read())
ad = FeedAutodiscovery(url)
ad.feed(data.read())
if ad._resolved_url:
try:
self._parse_feed(ad._resolved_url, None, None, False)
return Result(NEW_LOCATION, ad._resolved_url)
except Exception as e:
logger.warn('Feed autodiscovery failed', exc_info=True)
# Second, try to resolve the URL
url = self._resolve_url(url)
if url:
return Result(NEW_LOCATION, url)
# Reset the stream so podcastparser can give it a go
data.seek(0)
# Second, try to resolve the URL
url = self._resolve_url(url)
if url:
return Result(NEW_LOCATION, url)
# Reset the stream so podcastparser can give it a go
data.seek(0)
try:
feed = podcastparser.parse(url, data)