4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

obs-scripting: Fix Python version detection on Windows

Browse source 
Prior code would not only iterate over possible versioned python DLL
names, but also replace possible named subdirectories contained in the
path string.

This commit changes the same code to only change the filename and leave
the path prefix intact.
This commit is contained in:
PatTheMav 2023-11-17 13:56:59 +01:00 • committed by Patrick Heyer
commit cab950c23b
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
deps/obs-scripting/obs-scripting-python-import.c vendored
View file

@ -63,21 +63,22 @@ bool import_python(const char *python_path, python_version_t *python_version)
}
struct dstr lib_candidate_path;
dstr_init_copy(&lib_candidate_path, lib_path.array);
dstr_init(&lib_candidate_path);
char cur_version[5];
char next_version[5];
char temp[PATH_MAX];
snprintf(cur_version, sizeof(cur_version), VERSION_PATTERN,
PY_MAJOR_VERSION_MAX, PY_MINOR_VERSION_MAX);
snprintf(temp, sizeof(temp), FILE_PATTERN, cur_version);
dstr_cat(&lib_candidate_path, temp);
struct dstr temp;
dstr_init(&temp);
dstr_printf(&temp, FILE_PATTERN, cur_version);
int minor_version = PY_MINOR_VERSION_MAX;
do {
dstr_printf(&lib_candidate_path, "%s%s", lib_path.array,
temp.array);
if (access(lib_candidate_path.array, F_OK) == 0) {
lib = os_dlopen(lib_candidate_path.array);
}
@ -90,9 +91,10 @@ bool import_python(const char *python_path, python_version_t *python_version)
PY_MAJOR_VERSION_MAX, minor_version);
snprintf(next_version, sizeof(next_version), VERSION_PATTERN,
PY_MAJOR_VERSION_MAX, --minor_version);
dstr_replace(&lib_candidate_path, cur_version, next_version);
dstr_replace(&temp, cur_version, next_version);
} while (minor_version > 5);
dstr_free(&temp);
dstr_free(&lib_candidate_path);
if (!lib) {