c8h4/imv
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Pull path from pipe when -n given

Browse source
This commit is contained in:
n3f4s 2021-07-13 14:22:46 +02:00 committed by Harry Jeffery
parent f58e81288b
commit 72bda973f4
1 changed files with 42 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/imv.c
View file

@ -939,22 +939,51 @@ int imv_run(struct imv *imv)
} }
if (imv->starting_path) { if (imv->starting_path) {
ssize_t index = imv_navigator_find_path(imv->navigator, imv->starting_path); if (imv->paths_from_stdin) {
if (index == -1) { bool is_number = true;
index = (int) strtol(imv->starting_path, NULL, 10); for(int i=0; i<strlen(imv->starting_path); ++i) {
index -= 1; /* input is 1-indexed, internally we're 0 indexed */ if (!isdigit(imv->starting_path[i])) {
if (errno == EINVAL) { is_number = false;
index = -1; break;
}
}
ssize_t index = -1;
if (is_number) {
index = strtol(imv->starting_path, NULL, 10);
}
bool cont = true;
while (cont) {
imv_window_pump_events(imv->window, event_handler, imv);
if (index == -1) {
ssize_t img_index = imv_navigator_find_path(imv->navigator, imv->starting_path);
if(img_index != -1) {
imv_navigator_select_abs(imv->navigator, img_index);
cont = false;
}
} else {
if(imv_navigator_length(imv->navigator) >= index) {
imv_navigator_select_abs(imv->navigator, index);
cont = false;
}
}
}
} else {
ssize_t index = imv_navigator_find_path(imv->navigator, imv->starting_path);
if (index == -1) {
index = (int) strtol(imv->starting_path, NULL, 10);
index -= 1; /* input is 1-indexed, internally we're 0 indexed */
if (errno == EINVAL) {
index = -1;
}
}
if (index >= 0) {
imv_navigator_select_abs(imv->navigator, index);
} else {
imv_log(IMV_ERROR, "Invalid starting image: %s\n", imv->starting_path);
} }
} }
if (index >= 0) {
imv_navigator_select_abs(imv->navigator, index);
} else {
imv_log(IMV_ERROR, "Invalid starting image: %s\n", imv->starting_path);
}
} }
/* Push any startup commands into the event queue */ /* Push any startup commands into the event queue */
for (size_t i = 0; i < imv->startup_commands->len; ++i) { for (size_t i = 0; i < imv->startup_commands->len; ++i) {
command_callback(imv->startup_commands->items[i], imv); command_callback(imv->startup_commands->items[i], imv);