Merge pull request #24 from the-database/dev

fix python deps install when portable path has spaces
the-database · Jul 24, 2024 · b59ea4e · b59ea4e
2 parents 5a612a3 + c762b81
commit b59ea4e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/MangaJaNaiConverterGui/Services/PythonService.cs b/MangaJaNaiConverterGui/Services/PythonService.cs
@@ -146,7 +146,9 @@ public string InstallUpdatePythonDependenciesCommand
                     "psutil^>=6.0.0"
                 };
 
-                return $@"{PythonPath} -m pip install torch^>=2.3.1 torchvision^>=0.18.1 --index-url https://download.pytorch.org/whl/cu121 && {PythonPath} -m pip install {string.Join(" ", dependencies)}";
+                var relPythonPath = @".\python\python\python.exe";
+
+                return $@"{relPythonPath} -m pip install torch^>=2.3.1 torchvision^>=0.18.1 --index-url https://download.pytorch.org/whl/cu121 && {relPythonPath} -m pip install {string.Join(" ", dependencies)}";
             }
         }
 

diff --git a/MangaJaNaiConverterGui/ViewModels/MainWindowViewModel.cs b/MangaJaNaiConverterGui/ViewModels/MainWindowViewModel.cs
@@ -780,12 +780,12 @@ public async Task<string[]> InitializeDeviceList()
             {
                 _runningProcess = process;
                 process.StartInfo.FileName = "cmd.exe";
-                process.StartInfo.Arguments = @$"/C {_pythonService.PythonPath} .\src\device_list.py";
+                process.StartInfo.Arguments = @$"/C .\python\python\python.exe .\src\device_list.py";
                 process.StartInfo.RedirectStandardOutput = true;
                 process.StartInfo.RedirectStandardError = true;
                 process.StartInfo.UseShellExecute = false;
                 process.StartInfo.CreateNoWindow = true;
-                process.StartInfo.WorkingDirectory = Path.GetFullPath(@".\backend");
+                process.StartInfo.WorkingDirectory = _pythonService.BackendDirectory;
                 process.StartInfo.StandardOutputEncoding = Encoding.UTF8;
                 process.StartInfo.StandardErrorEncoding = Encoding.UTF8;
 
@@ -1010,6 +1010,7 @@ public async Task<string[]> InstallUpdatePythonDependencies()
                 process.StartInfo.CreateNoWindow = true;
                 process.StartInfo.StandardOutputEncoding = Encoding.UTF8;
                 process.StartInfo.StandardErrorEncoding = Encoding.UTF8;
+                process.StartInfo.WorkingDirectory = _pythonService.BackendDirectory;
 
                 var result = string.Empty;