diff --git a/utils/feed_fetcher.py b/utils/feed_fetcher.py index 5c2173820..3c54a6878 100644 --- a/utils/feed_fetcher.py +++ b/utils/feed_fetcher.py @@ -131,10 +131,17 @@ class FetchFeed: def fetch_youtube(self, address): try: - username = re.search('gdata.youtube.com/feeds/\w+/users/(\w+)/uploads', address).group(1) + 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 + video_ids_xml = requests.get("https://www.youtube.com/feeds/videos.xml?user=%s" % username) + if video_ids_xml.status_code != 200: + return + video_ids_soup = BeautifulSoup(video_ids_xml.content) video_ids = [] for video_id in video_ids_soup.findAll('yt:videoid'): @@ -160,11 +167,14 @@ class FetchFeed: thumbnail = video['snippet']['thumbnails'].get('high') if not thumbnail: thumbnail = video['snippet']['thumbnails'].get('medium') - content = """