public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding channel_id youtube.com video feeds.

Browse source
This commit is contained in:
Samuel Clay 2015-05-08 14:50:44 -07:00
parent 93cf7e5baf
commit 23fd3cccc1
2 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/rss_feeds/models.py
View file

@ -363,6 +363,9 @@ class Feed(models.Model):
if url and 'www.youtube.com/user/' in url: if url and 'www.youtube.com/user/' in url:
username = re.search('youtube.com/user/(\w+)', url).group(1) username = re.search('youtube.com/user/(\w+)', url).group(1)
url = "http://gdata.youtube.com/feeds/base/users/%s/uploads" % username url = "http://gdata.youtube.com/feeds/base/users/%s/uploads" % username
if url and 'www.youtube.com/channel/' in url:
channel_id = re.search('youtube.com/channel/([-_\w]+)', url).group(1)
url = "https://www.youtube.com/feeds/videos.xml?channel_id=%s" % channel_id
def criteria(key, value): def criteria(key, value):
if aggressive: if aggressive:

36
utils/feed_fetcher.py
View file

@ -93,14 +93,15 @@ class FetchFeed:
self.feed.title[:30])) self.feed.title[:30]))
return FEED_OK, self.fpf return FEED_OK, self.fpf
if 'gdata.youtube.com' in address or 'youtube.com/feeds/videos.xml?user=' in address: if 'youtube.com' in address:
youtube_feed = self.fetch_youtube(address) youtube_feed = self.fetch_youtube(address)
if not youtube_feed: if not youtube_feed:
logging.debug(u' ***> [%-30s] ~FRYouTube fetch failed: %s.' % logging.debug(u' ***> [%-30s] ~FRYouTube fetch failed: %s.' %
(self.feed.title[:30], address)) (self.feed.title[:30], address))
return FEED_ERRHTTP, None return FEED_ERRHTTP, None
self.fpf = feedparser.parse(youtube_feed) self.fpf = feedparser.parse(youtube_feed)
else:
if not self.fpf:
try: try:
self.fpf = feedparser.parse(address, self.fpf = feedparser.parse(address,
agent=USER_AGENT, agent=USER_AGENT,
@ -130,9 +131,12 @@ class FetchFeed:
return identity return identity
def fetch_youtube(self, address): def fetch_youtube(self, address):
username = None
channel_id = None
if 'gdata.youtube.com' in address: if 'gdata.youtube.com' in address:
try: try:
username_groups = re.search('gdata.youtube.com/feeds/\w+/users/(\w+)/uploads', address) username_groups = re.search('gdata.youtube.com/feeds/\w+/users/(\w+)/', address)
if not username_groups: if not username_groups:
return return
username = username_groups.group(1) username = username_groups.group(1)
@ -146,8 +150,28 @@ class FetchFeed:
username = username_groups.group(1) username = username_groups.group(1)
except IndexError: except IndexError:
return return
elif 'youtube.com/feeds/videos.xml?channel_id=' in address:
try:
channel_groups = re.search('youtube.com/feeds/videos.xml\?channel_id=([-_\w]+)', address)
if not channel_groups:
return
channel_id = channel_groups.group(1)
except IndexError:
return
video_ids_xml = requests.get("https://www.youtube.com/feeds/videos.xml?user=%s" % username) if channel_id:
video_ids_xml = requests.get("https://www.youtube.com/feeds/videos.xml?channel_id=%s" % channel_id)
channel_json = requests.get("https://www.googleapis.com/youtube/v3/channels?part=snippet&id=%s&key=%s" %
(channel_id, settings.YOUTUBE_API_KEY))
channel = json.decode(channel_json.content)
username = channel['items'][0]['snippet']['title']
description = channel['items'][0]['snippet']['description']
elif username:
video_ids_xml = requests.get("https://www.youtube.com/feeds/videos.xml?user=%s" % username)
description = "YouTube videos uploaded by %s" % username
else:
return
if video_ids_xml.status_code != 200: if video_ids_xml.status_code != 200:
return return
@ -163,7 +187,7 @@ class FetchFeed:
data = {} data = {}
data['title'] = "%s's YouTube Videos" % username data['title'] = "%s's YouTube Videos" % username
data['link'] = video_ids_soup.find('author').find('uri').getText() data['link'] = video_ids_soup.find('author').find('uri').getText()
data['description'] = "YouTube videos uploaded by %s" % username data['description'] = description
data['lastBuildDate'] = datetime.datetime.utcnow() data['lastBuildDate'] = datetime.datetime.utcnow()
data['generator'] = 'NewsBlur YouTube API v3 Decrapifier - %s' % settings.NEWSBLUR_URL data['generator'] = 'NewsBlur YouTube API v3 Decrapifier - %s' % settings.NEWSBLUR_URL
data['docs'] = None data['docs'] = None
@ -184,7 +208,7 @@ class FetchFeed:
thumbnail['url'] if thumbnail else "", thumbnail['url'] if thumbnail else "",
) )
link = "http://www.youtube.com/watch?v=%s&feature=youtube_gdata" % video['id'] link = "http://www.youtube.com/watch?v=%s" % video['id']
story_data = { story_data = {
'title': video['snippet']['title'], 'title': video['snippet']['title'],
'link': link, 'link': link,