t* sacc + cursorline and uri preview
URI git clone git://git.codevoid.de/sacc-sdk
DIR Log
DIR Files
DIR Refs
DIR LICENSE
---
DIR commit 67cc5414425ecccc9f75a12f7ba4cc40b3f97fa7
DIR parent d5c8126b99443c415ded9ef8e3f4618102565054
URI Author: Quentin Rameau <quinq@fifth.space>
Date: Wed, 26 Jul 2017 12:54:03 +0200
Handle image and binaries downloading differently
Use a default download path for binaries, plumb images by default.
Diffstat:
M sacc.c | 118 ++++++++++++++++++++-----------
M ui_ti.c | 2 +-
M ui_txt.c | 2 +-
3 files changed, 80 insertions(+), 42 deletions(-)
---
DIR diff --git a/sacc.c b/sacc.c
t@@ -363,34 +363,12 @@ connectto(const char *host, const char *port)
}
static int
-downloaditem(Item *item, int dest)
+download(Item *item, int dest)
{
- char buf[BUFSIZ], *path, *file;
+ char buf[BUFSIZ];
ssize_t r, w;
- mode_t mode = S_IRUSR|S_IWUSR|S_IRGRP;
int sock;
- if (dest < 0) {
- if (file = strrchr(item->selector, '/'))
- ++file;
- else
- file = item->selector;
-
- if (path = uiprompt("Download file to [%s]: ", file))
- path[strlen(path)-1] = '\0';
- else
- path = xstrdup(file);
-
- item->tag = path;
-
- if ((dest = open(path, O_WRONLY|O_CREAT|O_EXCL, mode)) < 0) {
- printf("Can't open destination file %s: %s\n",
- path, strerror(errno));
- errno = 0;
- return 0;
- }
- }
-
sock = connectto(item->host, item->port);
sendselector(sock, item->selector);
t@@ -405,12 +383,48 @@ downloaditem(Item *item, int dest)
errno = 0;
}
- close(dest);
close(sock);
return (r == 0 && w == 0);
}
+static void
+downloaditem(Item *item)
+{
+ char *file, *path;
+ mode_t mode = S_IRUSR|S_IWUSR|S_IRGRP;
+ int dest;
+
+ if (file = strrchr(item->selector, '/'))
+ ++file;
+ else
+ file = item->selector;
+
+ if (!(path = uiprompt("Download to [%s] (^D cancel): ", file)))
+ return;
+
+ if (path[1])
+ path[strlen(path)-1] = '\0';
+ else
+ path = xstrdup(file);
+
+ if ((dest = open(path, O_WRONLY|O_CREAT|O_EXCL, mode)) < 0) {
+ printf("Can't open destination file %s: %s\n",
+ path, strerror(errno));
+ errno = 0;
+ goto cleanup;
+ }
+
+ if (!download(item, dest))
+ goto cleanup;
+
+ item->tag = path;
+ return;
+cleanup:
+ free(path);
+ return;
+}
+
static int
fetchitem(Item *item)
{
t@@ -462,24 +476,51 @@ plumb(char *url)
}
}
-static int
+static void
plumbitem(Item *item)
{
- int tmpfd;
+ char *file, *path;
+ mode_t mode = S_IRUSR|S_IWUSR|S_IRGRP;
+ int dest;
if (!item->tag) {
- item->tag = xstrdup("/tmp/sacc/img-XXXXXX");
+ if (file = strrchr(item->selector, '/'))
+ ++file;
+ else
+ file = item->selector;
- if ((tmpfd = mkstemp(item->tag)) < 0)
- die("mkstemp: %s: %s", item->tag, strerror(errno));
+ path = uiprompt("Download %s to (^D cancel, <empty> plumb): ",
+ file);
+ if (!path)
+ return;
+ if (path[1]) {
+ path[strlen(path)-1] = '\0';
+ dest = open(path, O_WRONLY|O_CREAT|O_EXCL, mode);
+ if (dest < 0) {
+ printf("Can't open destination file %s: %s\n",
+ path, strerror(errno));
+ errno = 0;
+ goto cleanup;
+ }
+ } else {
+ path = xstrdup("/tmp/sacc/img-XXXXXX");
- if (!downloaditem(item, tmpfd)) {
- clear(&item->tag);
- return 0;
+ if ((dest = mkstemp(path)) < 0)
+ die("mkstemp: %s: %s", path, strerror(errno));
}
+
+ if (!download(item, dest))
+ goto cleanup;
+
+ item->tag = path;
}
plumb(item->tag);
+ return;
+
+cleanup:
+ free(path);
+ return;
}
static int
t@@ -487,7 +528,6 @@ dig(Item *entry, Item *item)
{
if (item->raw) /* already in cache */
return item->type;
-
if (!item->entry)
item->entry = entry ? entry : item;
t@@ -513,14 +553,12 @@ dig(Item *entry, Item *item)
case '5':
case '6':
case '9':
- if (!downloaditem(item))
- return 0;
- break;
+ downloaditem(item);
+ return 0;
case 'g':
case 'I':
- if (!plumbitem(item))
- return 0;
- break;
+ plumbitem(item);
+ return 0;
default:
fprintf(stderr, "Type %c (%s) not supported\n",
item->type, typedisplay(item->type));
DIR diff --git a/ui_ti.c b/ui_ti.c
t@@ -81,7 +81,7 @@ uiprompt(char *fmt, ...)
putp(tparm(restore_cursor));
fflush(stdout);
- if (r > 1)
+ if (r > 0)
return input;
free(input);
DIR diff --git a/ui_txt.c b/ui_txt.c
t@@ -82,7 +82,7 @@ uiprompt(char *fmt, ...)
fflush(stdout);
- if (getline(&input, &n, stdin) > 1)
+ if (getline(&input, &n, stdin))
return input;
free(input);