Prepare installer, Prevent infinite loop for sanitize_path_for_windows

facefusion · May 18, 2024 · 176da11 · 176da11
1 parent ee6e9b2
commit 176da11
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.install/facefusion.nsi b/.install/facefusion.nsi
@@ -4,8 +4,8 @@
 
 RequestExecutionLevel admin
 
-Name 'FaceFusion NEXT'
-OutFile 'FaceFusion_NEXT.exe'
+Name 'FaceFusion 2.6.0'
+OutFile 'FaceFusion_2.6.0.exe'
 
 !define MUI_ICON 'facefusion.ico'
 
@@ -90,7 +90,7 @@ Section 'Download Your Copy'
 
 	DetailPrint 'Download Your Copy'
 	RMDir /r $INSTDIR
-	nsExec::Exec '$LOCALAPPDATA\Programs\Git\cmd\git.exe clone https://github.com/facefusion/facefusion --branch next .'
+	nsExec::Exec '$LOCALAPPDATA\Programs\Git\cmd\git.exe clone https://github.com/facefusion/facefusion --branch 2.6.0 .'
 SectionEnd
 
 Section 'Setup Your Environment'
@@ -160,7 +160,7 @@ Section 'Register The Application'
 	WriteUninstaller $INSTDIR\Uninstall.exe
 
 	WriteRegStr HKLM SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FaceFusion DisplayName 'FaceFusion'
-	WriteRegStr HKLM SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FaceFusion DisplayVersion 'NEXT'
+	WriteRegStr HKLM SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FaceFusion DisplayVersion '2.6.0'
 	WriteRegStr HKLM SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FaceFusion Publisher 'Henry Ruhs'
 	WriteRegStr HKLM SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FaceFusion InstallLocation $INSTDIR
 	WriteRegStr HKLM SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\FaceFusion UninstallString $INSTDIR\uninstall.exe

diff --git a/facefusion/filesystem.py b/facefusion/filesystem.py
@@ -121,7 +121,7 @@ def list_directory(directory_path : str) -> Optional[List[str]]:
 	return None
 
 
-def sanitize_path_for_windows(full_path : str) -> str:
+def sanitize_path_for_windows(full_path : str) -> Optional[str]:
 	buffer_size = 0
 
 	while True:
@@ -130,4 +130,6 @@ def sanitize_path_for_windows(full_path : str) -> str:
 
 		if buffer_size > buffer_threshold:
 			return unicode_buffer.value
+		if buffer_threshold == 0:
+			return None
 		buffer_size = buffer_threshold
diff --git a/tests/test_filesystem.py b/tests/test_filesystem.py
@@ -1,3 +1,4 @@
+import shutil
 import pytest
 
 from facefusion.common_helper import is_windows
@@ -13,6 +14,7 @@ def before_all() -> None:
 		'https://github.com/facefusion/facefusion-assets/releases/download/examples/source.mp3',
 		'https://github.com/facefusion/facefusion-assets/releases/download/examples/target-240p.mp4'
 	])
+	shutil.copyfile('.assets/examples/source.jpg', '.assets/examples/söurce.jpg')
 
 
 def test_get_file_size() -> None:
@@ -84,4 +86,5 @@ def test_list_directory() -> None:
 
 def test_sanitize_path_for_windows() -> None:
 	if is_windows():
-		assert sanitize_path_for_windows('.assets/examples/source.jpg').endswith('SOURCE~1.JPG')
+		assert sanitize_path_for_windows('.assets/examples/söurce.jpg') == 'ASSETS~1/examples/SURCE~1.JPG'
+		assert sanitize_path_for_windows('invalid') is None