route window read through frame_store (#1196)

* route window read through frame_store

* update proper id

* restore todos

* restore todos

tests/test_frame_store.py

@@ -18,7 +18,8 @@ def before_all() -> None:
 
 @pytest.fixture(scope = 'function', autouse = True)
 def before_each() -> None:
-	clear_frames()
+	clear_frames('reader-1')
+	clear_frames('reader-2')
 
 
 def test_get_frame_store() -> None:
@@ -65,6 +66,8 @@ def test_clear_frames() -> None:
 	target_frame = read_video_frame(get_test_example_file('target-240p.mp4'), 0)
 
 	set_frame('reader-1', 0, target_frame)
-	clear_frames()
+	set_frame('reader-2', 0, target_frame)
+	clear_frames('reader-1')
 
 	assert get_frame_store('reader-1') == {}
+	assert get_frame_store('reader-2').get(0) is target_frame

tests/test_video_manager.py

@@ -6,6 +6,7 @@ import pytest
 from facefusion import ffmpeg, ffmpeg_builder, process_manager, state_manager
 from facefusion.download import conditional_download
 from facefusion.ffprobe import extract_video_metadata
+from facefusion.frame_store import get_frame_store
 from facefusion.temp_helper import create_temp_directory, get_temp_file_path
 from facefusion.video_manager import clear_video_pool, close_video_writer, conditional_set_video_reader_position, get_reader, get_writer, read_video_reader_frame, read_video_reader_window, refresh_video_reader, write_video_writer_frame
 from .helper import get_test_example_file, get_test_examples_directory
@@ -112,26 +113,22 @@ def test_read_video_reader_window() -> None:
 
 	assert sorted(frame_set) == [ 0, 1, 2, 3, 4 ]
 
-	frame_set = read_video_reader_window(video_reader, 100, 104)
+	position = video_reader.get('position')
+	frame_set = read_video_reader_window(video_reader, 1, 3)
 
-	assert sorted(frame_set) == [ 100, 101, 102, 103, 104 ]
+	assert video_reader.get('position') == position
+	assert sorted(frame_set) == [ 1, 2, 3 ]
+
+	read_video_reader_window(video_reader, 21, 25)
+
+	assert min(get_frame_store(video_reader.get('id'))) == 5
+	assert max(get_frame_store(video_reader.get('id'))) == 25
 
 	frame_set = read_video_reader_window(video_reader, 268, 275)
 
 	assert sorted(frame_set) == [ 268, 269 ]
 
 
-#todo: needs review - [testing] question if the assertions are good
-#todo: run mutation testing, strip down to the minimum, test with real data
-def test_evict_video_reader_buffer() -> None:
-	video_reader = get_reader(get_test_example_file('target-240p-25fps.mp4'))
-	read_video_reader_window(video_reader, 0, 4)
-	frame_set = read_video_reader_window(video_reader, 21, 25)
-
-	assert min(frame_set) == 5
-	assert max(frame_set) == 25
-
-
 #todo: needs review - [testing] question if the assertions are good
 #todo: run mutation testing, strip down to the minimum, test with real data
 def test_get_writer() -> None: