Handling when skip_urls is a None. Logging a warning (and ignoring) when duplicate json files are in a Video FileGroup.

modules/videos/common.py

@@ -345,7 +345,7 @@ async def update_view_counts_and_censored(channel_id: int):
         logger.info(f'No info_json for channel {channel.name}')
         return
 
-    view_counts = [{'id': i['id'], 'view_count': i['view_count']} for i in info['entries']]
+    view_counts = [{'id': i['id'], 'view_count': i['view_count']} for i in info['entries'] if i.get('view_count') is not None]
     view_counts_str = json.dumps(view_counts)
 
     with get_db_curs(commit=True) as curs:

modules/videos/test/test_common.py

@@ -129,6 +129,26 @@ async def test_update_view_count(test_session, channel_factory, video_factory):
     check_view_counts({'vid1': 10, 'vid2': 11, 'vid3': 13, 'vid4': 14})
 
 
+@pytest.mark.asyncio
+async def test_update_view_count_missing_view_count(test_session, channel_factory, video_factory):
+    """Entries without a view_count key (e.g. private/unavailable videos) are skipped without error."""
+    channel = channel_factory()
+    video_factory(channel_id=channel.id, with_poster_ext='jpg', title='vid1')
+    channel.info_json = {'entries': [
+        {'id': 'vid1', 'view_count': 42},
+        {'id': 'vid_private'},  # No view_count key.
+        {'id': 'vid_null', 'view_count': None},
+    ]}
+    test_session.commit()
+
+    # Should not raise KeyError.
+    await update_view_counts_and_censored(channel.id)
+
+    test_session.expire_all()
+    video = test_session.query(Video).filter_by(source_id='vid1').one()
+    assert video.view_count == 42
+
+
 def test_generate_video_poster(video_file):
     """
     A poster can be generated from a video file.

modules/videos/test/test_models.py

@@ -69,22 +69,43 @@ def test_replace_info_json_compact(test_session, make_files_structure):
 
 
 def test_replace_info_json_multiple_json_files(test_session, make_files_structure):
-    """FileGroup.replace_info_json raises ValueError when multiple .info.json files are tracked."""
+    """FileGroup.replace_info_json raises ValueError when multiple ambiguous .info.json files are tracked."""
     make_files_structure({
         'video.mp4': 'fake video',
-        'video.info.json': '{"title": "one"}',
-        'video.other.info.json': '{"title": "two"}',
+        'video.a.info.json': '{"title": "one"}',
+        'video.b.info.json': '{"title": "two"}',
     })
     fg = FileGroup.from_paths(test_session, get_media_directory() / 'video.mp4')
     test_session.add(fg)
     test_session.flush()
 
-    fg.append_files(get_media_directory() / 'video.info.json', get_media_directory() / 'video.other.info.json')
+    fg.append_files(get_media_directory() / 'video.a.info.json', get_media_directory() / 'video.b.info.json')
 
+    # Both have dots in their stems, so neither is "clean" — still raises ValueError.
     with pytest.raises(ValueError, match='multiple .info.json files'):
         fg.replace_info_json({'title': 'new'})
 
 
+def test_find_unique_json_cleans_double_extension(test_session, make_files_structure):
+    """When both stem.info.json and stem.mp4.info.json exist, the clean one is preferred and duplicates are ignored."""
+    make_files_structure({
+        'video.mp4': 'fake video',
+        'video.info.json': '{"title": "clean"}',
+        'video.mp4.info.json': '{"title": "double"}',
+    })
+    fg = FileGroup.from_paths(test_session, get_media_directory() / 'video.mp4')
+    test_session.add(fg)
+    test_session.flush()
+
+    fg.append_files(get_media_directory() / 'video.info.json', get_media_directory() / 'video.mp4.info.json')
+
+    # Should return the clean one and ignore the double-extension file.
+    result = fg.info_json_path
+    assert result == get_media_directory() / 'video.info.json'
+    # The duplicate file still exists on disk, it's just ignored.
+    assert (get_media_directory() / 'video.mp4.info.json').exists()
+
+
 def test_update_wrolpi_json_merges(test_session, make_files_structure):
     """FileGroup.update_wrolpi_json merges new keys without clobbering existing ones."""
     make_files_structure({'video.mp4': 'fake video'})