ekollof
/
surf-ekollof
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add download manager

master
Emiel Kollof 2020-08-25 16:23:08 +02:00
parent e8a4a2638f
commit e347887fe8
3 changed files with 115 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config.def.h
View File

@ -6,6 +6,8 @@ static char *styledir = "~/.surf/styles/";
static char *certdir = "~/.surf/certificates/";
static char *cachedir = "~/.surf/cache/";
static char *cookiefile = "~/.surf/cookies.txt";
static char *dldir = "~/Downloads/";
static char *dlstatus = "~/.surf/dlstatus/";
static char *searchurl = "duckduckgo.com/?q=%s";
static char *historyfile = "~/.surf/history.txt";
@ -87,13 +89,12 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
} \
}
/* DOWNLOAD(URI, referer) */
#define DOWNLOAD(u, r) { \
#define DLSTATUS { \
.v = (const char *[]){ "st", "-e", "/bin/sh", "-c",\
"curl -g -L -J -O -A \"$1\" -b \"$2\" -c \"$2\"" \
" -e \"$3\" \"$4\"; read", \
"surf-download", useragent, cookiefile, r, u, NULL \
} \
"while true; do cat $1/* 2>/dev/null || echo \"no hay descargas\";"\
"A=; read A; "\
"if [ $A = \"clean\" ]; then rm $1/*; fi; clear; done",\
"surf-dlstatus", dlstatus, NULL } \
}
/* PLUMB(URI) */
@ -210,6 +211,9 @@ static Key keys[] = {
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_t, toggle, { .i = StrictTLS } },
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_m, toggle, { .i = Style } },
{ MODKEY , GDK_KEY_Return, spawn, SETURI("_SURF_GO") },
/* download-console */
{ MODKEY, GDK_KEY_d, spawndls, { 0 } },
};
/* button definitions */

13
config.h
View File

@ -8,6 +8,8 @@ static char *cachedir = "~/.surf/cache/";
static char *cookiefile = "~/.surf/cookies.txt";
static char *searchurl = "https://www.startpage.com/do/dsearch?query=%s";
static char *historyfile = "~/.surf/history.txt";
static char *dldir = "~/Downloads/";
static char *dlstatus = "~/.surf/dlstatus/";
/* Webkit default features */
/* Highest priority value will be used.
@ -96,6 +98,14 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
} \
}
#define DLSTATUS { \
.v = (const char *[]){ "st", "-e", "/bin/sh", "-c",\
"while true; do cat $1/* 2>/dev/null || echo \"no hay descargas\";"\
"A=; read A; "\
"if [ $A = \"clean\" ]; then rm $1/*; fi; clear; done",\
"surf-dlstatus", dlstatus, NULL } \
}
/* PLUMB(URI) */
/* This called when some URI which does not begin with "about:",
* "http://" or "https://" should be opened.
@ -210,6 +220,9 @@ static Key keys[] = {
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_t, toggle, { .i = StrictTLS } },
{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_m, toggle, { .i = Style } },
{ MODKEY , GDK_KEY_Return, spawn, SETURI("_SURF_GO") },
/* download-console */
{ MODKEY, GDK_KEY_d, spawndls, { 0 } },
};
/* button definitions */

119
surf.c
View File

@ -206,10 +206,6 @@ static void decidenewwindow(WebKitPolicyDecision *d, Client *c);
static void decideresource(WebKitPolicyDecision *d, Client *c);
static void insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e,
Client *c);
static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
Client *c);
static void responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c);
static void download(Client *c, WebKitURIResponse *r);
static void webprocessterminated(WebKitWebView *v,
WebKitWebProcessTerminationReason r,
Client *c);
@ -239,6 +235,17 @@ static void clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h);
static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h);
static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h);
/* download-console */
static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
Client *c);
static void downloadfailed(WebKitDownload *d, GParamSpec *ps, void *arg);
static void downloadfinished(WebKitDownload *d, GParamSpec *ps, void *arg);
static gboolean decidedestination(WebKitDownload *d,
gchar *suggested_filename, void *arg);
static void printprogress(WebKitDownload *d, GParamSpec *ps, void *arg);
static void logdownload(WebKitDownload *d, gchar *tail);
static void spawndls(Client *c, const Arg *a);
static char winid[64];
static char togglestats[12];
static char pagestats[2];
@ -344,6 +351,9 @@ setup(void)
scriptfile = buildfile(scriptfile);
cachedir = buildpath(cachedir);
certdir = buildpath(certdir);
dlstatus = buildpath(dlstatus);
dldir = buildpath(dldir);
gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy));
@ -1097,6 +1107,8 @@ cleanup(void)
g_free(scriptfile);
g_free(stylefile);
g_free(cachedir);
g_free(dldir);
g_free(dlstatus);
XCloseDisplay(dpy);
}
@ -1748,8 +1760,7 @@ decideresource(WebKitPolicyDecision *d, Client *c)
if (webkit_response_policy_decision_is_mime_type_supported(r)) {
webkit_policy_decision_use(d);
} else {
webkit_policy_decision_ignore(d);
download(c, res);
webkit_policy_decision_download(d);
}
}
@ -1759,27 +1770,6 @@ insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e, Client *c)
c->insecure = 1;
}
void
downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
{
g_signal_connect(G_OBJECT(d), "notify::response",
G_CALLBACK(responsereceived), c);
}
void
responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c)
{
download(c, webkit_download_get_response(d));
webkit_download_cancel(d);
}
void
download(Client *c, WebKitURIResponse *r)
{
Arg a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
spawn(c, &a);
}
void
webprocessterminated(WebKitWebView *v, WebKitWebProcessTerminationReason r,
Client *c)
@ -2009,6 +1999,81 @@ clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h)
spawn(c, &arg);
}
/* download-console */
void
downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
{
webkit_download_set_allow_overwrite(d, TRUE);
g_signal_connect(G_OBJECT(d), "decide-destination",
G_CALLBACK(decidedestination), NULL);
g_signal_connect(G_OBJECT(d), "notify::estimated-progress",
G_CALLBACK(printprogress), NULL);
g_signal_connect(G_OBJECT(d), "failed",
G_CALLBACK(downloadfailed), NULL);
g_signal_connect(G_OBJECT(d), "finished",
G_CALLBACK(downloadfinished), NULL);
}
void
downloadfailed(WebKitDownload *d, GParamSpec *ps, void *arg)
{
logdownload(d, " -- FAILED");
}
void
downloadfinished(WebKitDownload *d, GParamSpec *ps, void *arg)
{
logdownload(d, " -- COMPLETED");
}
gboolean
decidedestination(WebKitDownload *d, gchar *suggested_filename, void *arg)
{
gchar *dest;
dest = g_strdup_printf("file://%s/%s", dldir, suggested_filename);
webkit_download_set_destination(d, dest);
return TRUE;
}
void
printprogress(WebKitDownload *d, GParamSpec *ps, void *arg)
{
logdownload(d, "");
}
void
logdownload(WebKitDownload *d, gchar *tail)
{
gchar *filename, *statfile;
FILE *stat;
filename = g_path_get_basename(webkit_download_get_destination(d));
statfile = g_strdup_printf("%s/%s", dlstatus, filename);
if ((stat = fopen(statfile, "w")) == NULL) {
perror("dlstatus");
} else {
fprintf(stat, "%s: %d%% (%d.%ds)%s\n",
filename,
(int)(webkit_download_get_estimated_progress(d) * 100),
(int) webkit_download_get_elapsed_time(d),
(int)(webkit_download_get_elapsed_time(d) * 100),
tail);
fclose(stat);
}
g_free(statfile);
g_free(filename);
}
void
spawndls(Client *c, const Arg *a)
{
Arg arg = (Arg)DLSTATUS;
spawn(c, &arg);
}
int
main(int argc, char *argv[])
{