tons of renaming

tests/test_video_manager.py

@@ -9,7 +9,7 @@ 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
+from facefusion.video_manager import clear_video_pool, close_video_writer, get_reader, get_writer, read_video_frame, read_video_frames, refresh_video_reader, seek_video_reader, write_video_frame
 from .helper import get_test_example_file, get_test_examples_directory
 
 
@@ -52,26 +52,26 @@ def test_get_reader() -> None:
 	assert video_metadata.get('resolution') == (426, 226)
 	assert video_metadata.get('fps') == 25.0
 	assert video_metadata.get('frame_total') == 270
-	assert video_reader.get('position') == 0
+	assert video_reader.get('frame_number') == 0
 	assert get_reader(get_test_example_file('target-240p-25fps.mp4')) is video_reader
 
 
 #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_conditional_set_video_reader_position() -> None:
+def test_seek_video_reader() -> None:
 	video_reader = get_reader(get_test_example_file('target-240p-25fps.mp4'))
 
-	conditional_set_video_reader_position(video_reader, 50)
+	seek_video_reader(video_reader, 50)
 
-	assert video_reader.get('position') == 50
+	assert video_reader.get('frame_number') == 50
 
-	conditional_set_video_reader_position(video_reader, 10)
+	seek_video_reader(video_reader, 10)
 
-	assert video_reader.get('position') == 10
+	assert video_reader.get('frame_number') == 10
 
-	conditional_set_video_reader_position(video_reader, 200)
+	seek_video_reader(video_reader, 200)
 
-	assert video_reader.get('position') == 200
+	assert video_reader.get('frame_number') == 200
 
 
 #todo: needs review - [testing] question if the assertions are good
@@ -81,51 +81,51 @@ def test_refresh_video_reader() -> None:
 	sequential_frames = {}
 
 	for frame_number in range(30):
-		sequential_frames[frame_number] = read_video_reader_frame(video_reader)
+		sequential_frames[frame_number] = read_video_frame(video_reader)
 
 	for frame_number in [ 5, 17, 29 ]:
 		refresh_video_reader(video_reader, frame_number)
-		vision_frame = read_video_reader_frame(video_reader)
+		vision_frame = read_video_frame(video_reader)
 
 		assert numpy.array_equal(vision_frame, sequential_frames.get(frame_number)) is True
 
 
 #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_read_video_reader_frame() -> None:
+def test_read_video_frame() -> None:
 	video_reader = get_reader(get_test_example_file('target-240p-25fps.mp4'))
-	vision_frame = read_video_reader_frame(video_reader)
+	vision_frame = read_video_frame(video_reader)
 
 	assert vision_frame.shape == (226, 426, 3)
-	assert video_reader.get('position') == 1
+	assert video_reader.get('frame_number') == 1
 
-	conditional_set_video_reader_position(video_reader, 269)
-	vision_frame = read_video_reader_frame(video_reader)
+	seek_video_reader(video_reader, 269)
+	vision_frame = read_video_frame(video_reader)
 
 	assert vision_frame.shape == (226, 426, 3)
-	assert read_video_reader_frame(video_reader) is None
+	assert read_video_frame(video_reader) is None
 
 
 #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_read_video_reader_window() -> None:
+def test_read_video_frames() -> None:
 	video_reader = get_reader(get_test_example_file('target-240p-25fps.mp4'))
-	frame_set = read_video_reader_window(video_reader, 0, 4)
+	frame_set = read_video_frames(video_reader, 0, 4)
 
 	assert sorted(frame_set) == [ 0, 1, 2, 3, 4 ]
 
-	position = video_reader.get('position')
-	frame_set = read_video_reader_window(video_reader, 1, 3)
+	frame_number = video_reader.get('frame_number')
+	frame_set = read_video_frames(video_reader, 1, 3)
 
-	assert video_reader.get('position') == position
+	assert video_reader.get('frame_number') == frame_number
 	assert sorted(frame_set) == [ 1, 2, 3 ]
 
-	read_video_reader_window(video_reader, 21, 25)
+	read_video_frames(video_reader, 21, 25)
 
 	assert min(get_frame_store(video_reader.get('id'))) == 17
 	assert max(get_frame_store(video_reader.get('id'))) == 25
 
-	frame_set = read_video_reader_window(video_reader, 268, 275)
+	frame_set = read_video_frames(video_reader, 268, 275)
 
 	assert sorted(frame_set) == [ 268, 269 ]
 
@@ -142,15 +142,15 @@ def test_get_writer() -> None:
 
 #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_write_video_writer() -> None:
+def test_write_video_frame() -> None:
 	target_path = get_test_example_file('target-240p-25fps.mp4')
 	create_temp_directory(target_path)
 	video_reader = get_reader(target_path)
 	video_writer = get_writer(target_path, 25.0, (426, 226), (426, 226), 25.0)
 
 	for frame_number in range(25):
-		vision_frame = read_video_reader_frame(video_reader)
-		write_video_writer(video_writer, vision_frame)
+		vision_frame = read_video_frame(video_reader)
+		write_video_frame(video_writer, vision_frame)
 
 	assert close_video_writer(video_writer) is True
 
@@ -170,8 +170,8 @@ def test_close_video_writer() -> None:
 	create_temp_directory(target_path)
 	video_reader = get_reader(target_path)
 	video_writer = get_writer(target_path, 30.0, (426, 226), (426, 226), 30.0)
-	vision_frame = read_video_reader_frame(video_reader)
-	write_video_writer(video_writer, vision_frame)
+	vision_frame = read_video_frame(video_reader)
+	write_video_frame(video_writer, vision_frame)
 
 	assert close_video_writer(video_writer) is True
 
@@ -183,8 +183,8 @@ def test_clear_video_pool() -> None:
 	create_temp_directory(target_path)
 	video_reader = get_reader(target_path)
 	video_writer = get_writer(target_path, 25.0, (426, 226), (426, 226), 25.0)
-	vision_frame = read_video_reader_frame(video_reader)
-	write_video_writer(video_writer, vision_frame)
+	vision_frame = read_video_frame(video_reader)
+	write_video_frame(video_writer, vision_frame)
 	clear_video_pool()
 
 	if is_windows():