Improve usage of generators in ytapi.

ycdl/objects.py

@@ -88,7 +88,8 @@ class Channel(Base):
         else:
             try:
                 video_generator = self._rss_assisted_videos()
-            except exceptions.RSSAssistFailed:
+            except exceptions.RSSAssistFailed as exc:
+                self.ycdldb.log.debug('Caught %s.', exc)
                 video_generator = self.ycdldb.youtube.get_playlist_videos(self.uploads_playlist)
 
         seen_ids = set()
@@ -96,7 +97,7 @@ class Channel(Base):
             seen_ids.add(video.id)
             status = self.ycdldb.ingest_video(video, commit=False)
 
-            if not (force or status['new']):
+            if (not status['new']) and (not force):
                 break
 
         # Now we will refresh some other IDs that may not have been refreshed

ycdl/ytapi.py

@@ -80,9 +80,7 @@ class Youtube:
         paginator = self._playlist_paginator(playlist_id)
         video_ids = (item['contentDetails']['videoId'] for item in paginator)
         videos = self.get_videos(video_ids)
-        videos.sort(key=lambda x: x.published, reverse=True)
-
-        yield from videos
+        return videos
 
     def get_related_videos(self, video_id, count=50):
         if isinstance(video_id, Video):
@@ -121,15 +119,13 @@ class Youtube:
         yield from self.get_playlist_videos(self.get_user_uploads_playlist_id(uid))
 
     def get_video(self, video_id):
-        videos = self.get_videos([video_id])
-
-        if len(videos) == 1:
-            return videos[0]
-        elif len(videos) == 0:
-            raise VideoNotFound(video_id)
+        try:
+            video = next(self.get_videos([video_id]))
+            return video
+        except StopIteration:
+            raise VideoNotFound(video_id) from None
 
     def get_videos(self, video_ids):
-        snippets = []
         chunks = gentools.chunk_generator(video_ids, 50)
         for chunk in chunks:
             self.log.debug('Requesting batch of %d video ids.', len(chunk))
@@ -139,20 +135,12 @@ class Youtube:
                 part='id,contentDetails,snippet,statistics',
                 id=chunk,
             ).execute()
-            items = data['items']
-            self.log.debug('Got %d snippets.', len(items))
-            self.log.loud(items)
-            snippets.extend(items)
-
-        videos = []
-        broken = []
-        for snippet in snippets:
-            try:
-                videos.append(Video(snippet))
-            except KeyError as exc:
-                print(f'KEYERROR: {exc} not in {snippet}')
-                broken.append(snippet)
-        if broken:
-            # print('broken:', broken)
-            pass
-        return videos
+            snippets = data['items']
+            self.log.debug('Got %d snippets.', len(snippets))
+            self.log.loud(snippets)
+            for snippet in snippets:
+                try:
+                    video = Video(snippet)
+                    yield video
+                except KeyError as exc:
+                    self.log.warning(f'KEYERROR: {exc} not in {snippet}')