DeforaOS/Surfer
DeforaOS/Surfer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep cookies by no longer separating the download process (with webkit)

Browse Source
This commit is contained in:
Pierre Pronchery 2010-11-15 02:18:23 +00:00
parent f3fd2bc85e
commit d8f2221264
4 changed files with 81 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile
View File

@ -35,9 +35,9 @@ surfer: $(surfer_OBJS)
$(CC) -o surfer $(surfer_OBJS) $(surfer_LDFLAGS) $(CC) -o surfer $(surfer_OBJS) $(surfer_LDFLAGS)
download.o: download.c download.h ../config.h download.o: download.c download.h ../config.h
$(CC) $(download_CFLAGS) -c download.c $(CC) -D WITH_MAIN $(download_CFLAGS) -c download.c
surfer.o: surfer.c callbacks.h surfer.h ../config.h surfer.o: surfer.c callbacks.h download.c download.h surfer.h ../config.h
$(CC) $(surfer_CFLAGS) -c surfer.c $(CC) $(surfer_CFLAGS) -c surfer.c
ghtml.o: ghtml.c ghtml.h ghtml-gtkhtml.c ghtml-gtkmozembed.c ghtml-gtktextview.c ghtml-webkit.c common/conn.c common/history.c common/url.c ../config.h ghtml.o: ghtml.c ghtml.h ghtml-gtkhtml.c ghtml-gtkmozembed.c ghtml-gtktextview.c ghtml-webkit.c common/conn.c common/history.c common/url.c ../config.h

89
src/download.c
View File

@ -53,7 +53,7 @@
/* types */ /* types */
struct _Download struct _Download
{ {
DownloadPrefs * prefs; DownloadPrefs prefs;
char * url; char * url;
struct timeval tv; struct timeval tv;
@ -82,11 +82,15 @@ struct _Download
/* constants */ /* constants */
#define PROGNAME "download" #ifdef WITH_MAIN
# define PROGNAME "download"
#endif
/* variables */ /* variables */
#ifdef WITH_MAIN
static unsigned int _download_cnt = 0; static unsigned int _download_cnt = 0;
#endif
/* prototypes */ /* prototypes */
@ -98,8 +102,8 @@ static int _download_write(Download * download);
/* callbacks */ /* callbacks */
static void _download_on_cancel(gpointer data); static void _download_on_cancel(gpointer data);
static gboolean _download_on_closex(GtkWidget * widget, GdkEvent * event, static gboolean _download_on_closex(gpointer data);
gpointer data);
#ifndef WITH_WEBKIT #ifndef WITH_WEBKIT
static void _download_on_http(GConnHttp * conn, GConnHttpEvent * event, static void _download_on_http(GConnHttp * conn, GConnHttpEvent * event,
gpointer data); gpointer data);
@ -125,30 +129,48 @@ Download * download_new(DownloadPrefs * prefs, char const * url)
GtkSizeGroup * right; GtkSizeGroup * right;
PangoFontDescription * bold; PangoFontDescription * bold;
/* verify arguments */
if(prefs == NULL || url == NULL)
{
errno = EINVAL;
_download_error(NULL, NULL, 1);
return NULL;
}
if((download = malloc(sizeof(*download))) == NULL) if((download = malloc(sizeof(*download))) == NULL)
{ {
_download_error(NULL, "malloc", -1); _download_error(NULL, "malloc", 1);
return NULL;
}
download->prefs = prefs; /* XXX copy the preferences instead */
if(gettimeofday(&download->tv, NULL) != 0)
{
_download_error(NULL, "gettimeofday", 1);
return NULL; return NULL;
} }
/* initialize structure */
download->prefs.output = (prefs->output != NULL) ? strdup(prefs->output)
: NULL;
download->prefs.user_agent = (prefs->user_agent != NULL)
? strdup(prefs->user_agent) : NULL;
download->url = strdup(url); download->url = strdup(url);
if(prefs->output == NULL) if(download->url != NULL && prefs->output == NULL)
prefs->output = basename(download->url); download->prefs.output = basename(download->url);
download->conn = NULL; download->conn = NULL;
download->data_received = 0; download->data_received = 0;
download->content_length = 0; download->content_length = 0;
download->timeout = 0;
download->pulse = 0; download->pulse = 0;
/* verify initialization */
if((prefs->output != NULL && download->prefs.output == NULL)
|| (prefs->user_agent != NULL
&& download->prefs.user_agent == NULL)
|| download->url == NULL
|| gettimeofday(&download->tv, NULL) != 0)
{
_download_error(NULL, "gettimeofday", 1);
download_delete(download);
return NULL;
}
/* window */ /* window */
download->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); download->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
snprintf(buf, sizeof(buf), "%s %s", _("Download"), url); snprintf(buf, sizeof(buf), "%s %s", _("Download"), url);
gtk_window_set_title(GTK_WINDOW(download->window), buf); gtk_window_set_title(GTK_WINDOW(download->window), buf);
g_signal_connect(G_OBJECT(download->window), "delete-event", G_CALLBACK( g_signal_connect_swapped(G_OBJECT(download->window), "delete-event",
_download_on_closex), download); G_CALLBACK(_download_on_closex), download);
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(FALSE, 0);
bold = pango_font_description_new(); bold = pango_font_description_new();
pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD); pango_font_description_set_weight(bold, PANGO_WEIGHT_BOLD);
@ -179,7 +201,7 @@ Download * download_new(DownloadPrefs * prefs, char const * url)
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(download->window), 4); gtk_container_set_border_width(GTK_CONTAINER(download->window), 4);
gtk_container_add(GTK_CONTAINER(download->window), vbox); gtk_container_add(GTK_CONTAINER(download->window), vbox);
g_idle_add(_download_on_idle, download); download->timeout = g_idle_add(_download_on_idle, download);
_download_refresh(download); _download_refresh(download);
gtk_widget_show_all(download->window); gtk_widget_show_all(download->window);
_download_cnt++; _download_cnt++;
@ -209,6 +231,8 @@ static void _download_label(GtkWidget * vbox, PangoFontDescription * bold,
/* download_delete */ /* download_delete */
void download_delete(Download * download) void download_delete(Download * download)
{ {
if(download->timeout != 0)
g_source_remove(download->timeout);
#ifdef WITH_WEBKIT #ifdef WITH_WEBKIT
if(download->conn != NULL) if(download->conn != NULL)
webkit_download_cancel(download->conn); webkit_download_cancel(download->conn);
@ -219,12 +243,14 @@ void download_delete(Download * download)
if(download->fp != NULL) if(download->fp != NULL)
{ {
if(fclose(download->fp) != 0) if(fclose(download->fp) != 0)
_download_error(download, download->prefs->output, 1); _download_error(download, download->prefs.output, 1);
if(unlink(download->prefs->output) != 0) if(unlink(download->prefs.output) != 0)
_download_error(download, download->prefs->output, 1); _download_error(download, download->prefs.output, 1);
} }
#endif #endif
free(download->url); free(download->url);
free(download->prefs.user_agent);
free(download->prefs.output);
gtk_widget_destroy(download->window); gtk_widget_destroy(download->window);
free(download); free(download);
if(--_download_cnt == 0) if(--_download_cnt == 0)
@ -340,7 +366,7 @@ static int _download_write(Download * download)
download->pulse = 1; download->pulse = 1;
return 0; return 0;
} }
_download_error(download, download->prefs->output, 0); _download_error(download, download->prefs.output, 0);
download_cancel(download); download_cancel(download);
return 1; return 1;
} }
@ -359,12 +385,11 @@ static void _download_on_cancel(gpointer data)
/* download_on_closex */ /* download_on_closex */
static gboolean _download_on_closex(GtkWidget * widget, GdkEvent * event, static gboolean _download_on_closex(gpointer data)
gpointer data)
{ {
Download * download = data; Download * download = data;
gtk_widget_hide(widget); gtk_widget_hide(download->window);
download_cancel(download); download_cancel(download);
return FALSE; return FALSE;
} }
@ -450,12 +475,12 @@ static void _http_data_complete(GConnHttpEventData * event,
download->content_length = (event->content_length != 0) download->content_length = (event->content_length != 0)
? event->content_length : event->data_received; ? event->content_length : event->data_received;
if(fclose(download->fp) != 0) if(fclose(download->fp) != 0)
_download_error(download, download->prefs->output, 0); _download_error(download, download->prefs.output, 0);
download->fp = NULL; download->fp = NULL;
_download_refresh(download); _download_refresh(download);
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(download->check))) if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(download->check)))
{ {
download_cancel(download); g_idle_add(_download_on_closex, download);
return; return;
} }
gtk_label_set_text(GTK_LABEL(download->status), _("Complete")); gtk_label_set_text(GTK_LABEL(download->status), _("Complete"));
@ -512,25 +537,29 @@ static void _http_timeout(Download * download)
static gboolean _download_on_idle(gpointer data) static gboolean _download_on_idle(gpointer data)
{ {
Download * download = data; Download * download = data;
DownloadPrefs * prefs = download->prefs; DownloadPrefs * prefs = &download->prefs;
char * p = NULL; char * p = NULL;
#ifdef WITH_WEBKIT #ifdef WITH_WEBKIT
size_t len;
WebKitNetworkRequest * request; WebKitNetworkRequest * request;
if((p = malloc(strlen(prefs->output) + 6)) == NULL) download->timeout = 0;
len = strlen(prefs->output) + 6;
if((p = malloc(len)) == NULL)
{ {
_download_error(download, prefs->output, 0); _download_error(download, prefs->output, 0);
download_cancel(download); download_cancel(download);
return FALSE; return FALSE;
} }
/* FIXME needs to be an absolute path */ /* FIXME needs to be an absolute path */
sprintf(p, "%s%s", "file:", prefs->output); snprintf(p, len, "%s%s", "file:", prefs->output);
request = webkit_network_request_new(download->url); request = webkit_network_request_new(download->url);
download->conn = webkit_download_new(request); download->conn = webkit_download_new(request);
webkit_download_set_destination_uri(download->conn, p); webkit_download_set_destination_uri(download->conn, p);
free(p); free(p);
webkit_download_start(download->conn); webkit_download_start(download->conn);
#else #else
download->timeout = 0;
if((download->fp = fopen(prefs->output, "w")) == NULL) if((download->fp = fopen(prefs->output, "w")) == NULL)
{ {
_download_error(download, prefs->output, 0); _download_error(download, prefs->output, 0);
@ -575,7 +604,7 @@ static gboolean _download_on_timeout(gpointer data)
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
d->check))) d->check)))
{ {
download_cancel(d); g_idle_add(_download_on_closex, d);
break; break;
} }
gtk_label_set_text(GTK_LABEL(d->status), _("Complete")); gtk_label_set_text(GTK_LABEL(d->status), _("Complete"));
@ -605,6 +634,7 @@ static gboolean _download_on_timeout(gpointer data)
} }
#ifdef WITH_MAIN
/* usage */ /* usage */
static int _usage(void) static int _usage(void)
{ {
@ -651,3 +681,4 @@ int main(int argc, char * argv[])
gtk_main(); gtk_main();
return 0; return 0;
} }
#endif /* WITH_MAIN */

3
src/project.conf
View File

@ -19,6 +19,7 @@ install=$(BINDIR)
[download.c] [download.c]
depends=download.h,../config.h depends=download.h,../config.h
cppflags=-D WITH_MAIN
[surfer] [surfer]
type=binary type=binary
@ -47,4 +48,4 @@ depends=ghtml.h,ghtml-gtkhtml.c,ghtml-gtkmozembed.c,ghtml-gtktextview.c,ghtml-we
depends=surfer.h,../config.h depends=surfer.h,../config.h
[surfer.c] [surfer.c]
depends=callbacks.h,surfer.h,../config.h depends=callbacks.h,download.c,download.h,surfer.h,../config.h

21
src/surfer.c
View File

@ -31,6 +31,11 @@ static char const _license[] =
#define _(string) gettext(string) #define _(string) gettext(string)
#define N_(string) (string) #define N_(string) (string)
#define PROGNAME "surfer"
static unsigned int _surfer_cnt = 0;
#define _download_cnt _surfer_cnt
#include "download.c"
/* Surfer */ /* Surfer */
/* private */ /* private */
@ -194,8 +199,6 @@ static DesktopToolbar _surfer_toolbar[] =
{ NULL, NULL, NULL, 0, 0, NULL } { NULL, NULL, NULL, 0, 0, NULL }
}; };
unsigned int surfer_cnt = 0;
/* prototypes */ /* prototypes */
static char * _config_get_filename(void); static char * _config_get_filename(void);
@ -363,7 +366,7 @@ Surfer * _new_do(char const * url)
/* hack to display the statusbar only if necessary */ /* hack to display the statusbar only if necessary */
gtk_box_pack_start(GTK_BOX(vbox), surfer->statusbox, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), surfer->statusbox, FALSE, FALSE, 0);
surfer_set_status(surfer, NULL); surfer_set_status(surfer, NULL);
surfer_cnt++; _surfer_cnt++;
return surfer; return surfer;
} }
@ -401,7 +404,7 @@ void surfer_delete(Surfer * surfer)
config_delete(surfer->config); config_delete(surfer->config);
free(surfer->homepage); free(surfer->homepage);
free(surfer); free(surfer);
if(--surfer_cnt == 0) if(--_surfer_cnt == 0)
gtk_main_quit(); gtk_main_quit();
} }
@ -717,8 +720,12 @@ int surfer_download(Surfer * surfer, char const * url, char const * suggested)
int ret = 0; int ret = 0;
GtkWidget * dialog; GtkWidget * dialog;
char * filename = NULL; char * filename = NULL;
#ifdef WITH_WEBKIT
DownloadPrefs prefs;
#else
char * argv[] = { "download", "-O", NULL, NULL, NULL }; char * argv[] = { "download", "-O", NULL, NULL, NULL };
GError * error = NULL; GError * error = NULL;
#endif
if(url == NULL) if(url == NULL)
return -surfer_error(surfer, strerror(EINVAL), 1); return -surfer_error(surfer, strerror(EINVAL), 1);
@ -736,6 +743,11 @@ int surfer_download(Surfer * surfer, char const * url, char const * suggested)
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
if(filename == NULL) if(filename == NULL)
return 0; return 0;
#ifdef WITH_WEBKIT
prefs.output = filename;
prefs.user_agent = NULL;
download_new(&prefs, url);
#else
argv[2] = filename; argv[2] = filename;
if((argv[3] = strdup(url)) == NULL) if((argv[3] = strdup(url)) == NULL)
ret = -surfer_error(surfer, strerror(errno), 1); ret = -surfer_error(surfer, strerror(errno), 1);
@ -745,6 +757,7 @@ int surfer_download(Surfer * surfer, char const * url, char const * suggested)
NULL, &error); NULL, &error);
free(argv[3]); free(argv[3]);
} }
#endif
g_free(filename); g_free(filename);
return ret; return ret;
} }