Skip to content

Allow loading Python APMs installed as packages (directories) #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kivkiv12345 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow loading Python APMs installed as packages (directories) #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 40 additions & 32 deletions src/python/python_loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,40 +419,48 @@ static void load_py(char *path, char *search_str) {
DIR *dir CLEANUP_DIR = opendir(path);
if (dir == NULL) {
perror("opendir");
} else {
while ((entry = readdir(dir)) != NULL) {
return;
}

/* Verify file has search string */
if (search_str && !strstr(entry->d_name, search_str)) {
continue;
}
if(strstr(entry->d_name, ".py")) {
int fullpath_len = strnlen(path, WALKDIR_MAX_PATH_SIZE) + strnlen(entry->d_name, WALKDIR_MAX_PATH_SIZE);
char fullpath[fullpath_len+1];
strncpy(fullpath, path, fullpath_len);
strncat(fullpath, entry->d_name, fullpath_len-strnlen(path, WALKDIR_MAX_PATH_SIZE));
PyObject * pymod AUTO_DECREF = pycsh_load_pymod(fullpath, DEFAULT_INIT_FUNCTION, 1);
if (pymod == NULL) {
PyErr_Print();
continue;
}
apm_entry_t * e = calloc(1, sizeof(apm_entry_t));
if (!e) {
printf("Memory allocation error.\n");
} else {
e->apm_init_version = APM_INIT_VERSION;
strncpy(e->path, fullpath, WALKDIR_MAX_PATH_SIZE - 1);
size_t i = strlen(e->path);
while ((i > 0) && (e->path[i-1] != '/')) {
i--;
}
e->file = &(e->path[i]);
// TODO Kevin: Verbose argument?
printf("\033[32mLoaded: %s\033[0m\n", fullpath);
apm_queue_add(e);
}
}
while ((entry = readdir(dir)) != NULL) {

/* Verify file has search string */
if (search_str && !strstr(entry->d_name, search_str)) {
continue;
}

if ((entry->d_type != DT_DIR) && !strstr(entry->d_name, ".py")) {
/* Not a Python packages (directory) nor a module (`.py` file) */
continue;
}

int fullpath_len = strnlen(path, WALKDIR_MAX_PATH_SIZE) + strnlen(entry->d_name, WALKDIR_MAX_PATH_SIZE);
char fullpath[fullpath_len+1];
strncpy(fullpath, path, fullpath_len);
strncat(fullpath, entry->d_name, fullpath_len-strnlen(path, WALKDIR_MAX_PATH_SIZE));
PyObject * pymod AUTO_DECREF = pycsh_load_pymod(fullpath, DEFAULT_INIT_FUNCTION, 1);
if (pymod == NULL) {
PyErr_Print();
continue;
}

/* Not freed, added to APM linked list. */
apm_entry_t * e = calloc(1, sizeof(apm_entry_t));
if (!e) {
printf("Memory allocation error.\n");
continue;
}

e->apm_init_version = APM_INIT_VERSION;
strncpy(e->path, fullpath, WALKDIR_MAX_PATH_SIZE - 1);
size_t i = strlen(e->path);
while ((i > 0) && (e->path[i-1] != '/')) {
i--;
}
e->file = &(e->path[i]);
// TODO Kevin: Verbose argument?
printf("\033[32mLoaded: %s\033[0m\n", fullpath);
apm_queue_add(e);
}
}

Expand Down
Loading