so-rose
/
blext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fixed Windows detection trying to detect Linux

main
Sofus Albert Høgsbro Rose 2025-01-15 09:30:36 +01:00
parent 69dfd73163
commit c7155ef6b6
Signed by: so-rose
GPG Key ID: AD901CB0F3701434
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
blext/finders.py
View File

@ -50,9 +50,9 @@ def detect_local_blplatform() -> BLPlatform:
return BLPlatform.macos_x64 return BLPlatform.macos_x64
case ('darwin', arch) if arch.startswith(('aarch64', 'arm')): case ('darwin', arch) if arch.startswith(('aarch64', 'arm')):
return BLPlatform.macos_arm64 return BLPlatform.macos_arm64
case ('linux', 'x86_64' | 'amd64'): case ('windows', 'x86_64' | 'amd64'):
return BLPlatform.windows_x64 return BLPlatform.windows_x64
case ('linux', arch) if arch.startswith(('aarch64', 'arm')): case ('windows', arch) if arch.startswith(('aarch64', 'arm')):
return BLPlatform.windows_arm64 return BLPlatform.windows_arm64
msg = "Could not detect a local operating system supported by Blender from 'platform.system(), platform.machine() = {platform_system}, {platform_machine}'" msg = "Could not detect a local operating system supported by Blender from 'platform.system(), platform.machine() = {platform_system}, {platform_machine}'"
@ -104,7 +104,7 @@ def find_blender_exe() -> str:
msg = "Couldn't find executable command 'blender' on the system PATH. Is it installed?" msg = "Couldn't find executable command 'blender' on the system PATH. Is it installed?"
raise ValueError(msg) raise ValueError(msg)
case BLPlatform.macos_arm64: case BLPlatform.macos_arm64 | BLPlatform.macos_x64:
blender_exe = '/Applications/Blender.app/Contents/MacOS/Blender' blender_exe = '/Applications/Blender.app/Contents/MacOS/Blender'
if Path(blender_exe).is_file(): if Path(blender_exe).is_file():
return blender_exe return blender_exe
@ -112,7 +112,7 @@ def find_blender_exe() -> str:
msg = f"Couldn't find Blender executable at standard path. Is it installed? (searched '{blender_exe}')" msg = f"Couldn't find Blender executable at standard path. Is it installed? (searched '{blender_exe}')"
raise ValueError(msg) raise ValueError(msg)
case BLPlatform.windows_x64: case BLPlatform.windows_x64 | BLPlatform.windows_x64:
blender_exe = shutil.which('blender.exe') blender_exe = shutil.which('blender.exe')
if blender_exe is not None: if blender_exe is not None:
return blender_exe return blender_exe