public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding another youtube url style: https://www.youtube.com/feeds/videos.xml?user=SciShow

Browse source
This commit is contained in:
Samuel Clay 2015-04-29 17:58:44 -07:00
parent bb100fa0d8
commit d7daf21694
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
utils/feed_fetcher.py
View file

@ -93,7 +93,7 @@ class FetchFeed:
self.feed.title[:30]))
return FEED_OK, self.fpf
if 'gdata.youtube.com' in address:
if 'gdata.youtube.com' in address or 'youtube.com/feeds/videos.xml?user=' in address:
youtube_feed = self.fetch_youtube(address)
if not youtube_feed:
logging.debug(u' ***> [%-30s] ~FRYouTube fetch failed: %s.' %
@ -130,13 +130,22 @@ class FetchFeed:
return identity
def fetch_youtube(self, address):
try:
username_groups = re.search('gdata.youtube.com/feeds/\w+/users/(\w+)/uploads', address)
if not username_groups:
if 'gdata.youtube.com' in address:
try:
username_groups = re.search('gdata.youtube.com/feeds/\w+/users/(\w+)/uploads', address)
if not username_groups:
return
username = username_groups.group(1)
except IndexError:
return
username = username_groups.group(1)
except IndexError:
return
elif 'youtube.com/feeds/videos.xml?user=' in address:
try:
username_groups = re.search('youtube.com/feeds/videos.xml\?user=(\w+)', address)
if not username_groups:
return
username = username_groups.group(1)
except IndexError:
return
video_ids_xml = requests.get("https://www.youtube.com/feeds/videos.xml?user=%s" % username)
if video_ids_xml.status_code != 200: