[wiki] [sites] fix a synchronization issue in the surf download patch || v4hn

From: <git_AT_suckless.org>
Date: Wed, 30 Jan 2013 17:08:42 +0100

commit 70d9aaaa5ada79282bf73c54374ac75ffb573e8e
Author: v4hn <me_AT_v4hn.de>
Date: Wed Jan 30 17:08:34 2013 +0100

    fix a synchronization issue in the surf download patch

diff --git a/surf.suckless.org/patches/surf-0.5-download.diff b/surf.suckless.org/patches/surf-0.5-download.diff
index 73ef790..8bc4512 100644
--- a/surf.suckless.org/patches/surf-0.5-download.diff
+++ b/surf.suckless.org/patches/surf-0.5-download.diff
_AT_@ -11,7 +11,7 @@ index 1cba4d7..3065c73 100644
  static char *cafile = "/etc/ssl/certs/ca-certificates.crt";
  static char *strictssl = FALSE; /* Refuse untrusted SSL connections */
 diff --git a/surf.c b/surf.c
-index c9fa08d..6c95f6e 100644
+index c9fa08d..4d589aa 100644
 --- a/surf.c
 +++ b/surf.c
 _AT_@ -114,6 +114,7 @@ static void destroyclient(Client *c);
_AT_@ -22,10 +22,25 @@ index c9fa08d..6c95f6e 100644
  static void eval(Client *c, const Arg *arg);
  static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
  static void find(Client *c, const Arg *arg);
-_AT_@ -290,6 +291,29 @@ cookiejar_set_property(GObject *self, guint prop_id, const GValue *value,
+_AT_@ -289,6 +290,50 @@ cookiejar_set_property(GObject *self, guint prop_id, const GValue *value,
+ flock(COOKIEJAR(self)->lock, LOCK_UN);
  }
  
- static void
++struct client_size_tuple {
++ Client* c;
++ gint s;
++};
++
++static void
++late_download_update(WebKitWebView* view, GParamSpec *pspec, struct client_size_tuple* t){
++ char script[1024]; char* s= script;
++ snprintf(script, 1024, "c(%d, %d)", t->s, t->s);
++ const Arg a= {.v = (void*) &s};
++ eval(t->c, &a);
++ free(t);
++}
++
++static void
 +download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
 + WebKitDownloadStatus status;
 + char script[2048]; char* s= script;
_AT_@ -33,26 +48,32 @@ index c9fa08d..6c95f6e 100644
 + status = webkit_download_get_status(o);
 + if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
 + snprintf(script, 2048, "u(%d, %d, %d)",
-+ (gint)webkit_download_get_current_size(o),
-+ (gint)webkit_download_get_total_size(o),
-+ (gint)(webkit_download_get_progress(o) * 100));
++ (gint)webkit_download_get_current_size(o),
++ (gint)webkit_download_get_total_size(o),
++ (gint)(webkit_download_get_progress(o) * 100));
 + const Arg a= {.v = (void*) &s};
 + eval(c, &a);
 + }
 + else if (status == WEBKIT_DOWNLOAD_STATUS_FINISHED){
-+ snprintf(script, 2048, "c(%d, %d)",
-+ (gint)webkit_download_get_current_size(o),
-+ (gint)webkit_download_get_total_size(o));
-+ const Arg a= {.v = (void*) &s};
-+ eval(c, &a);
++ if( webkit_web_view_get_load_status(c->view) == WEBKIT_LOAD_FINISHED ){
++ snprintf(script, 2048, "c(%d, %d)",
++ (gint)webkit_download_get_current_size(o),
++ (gint)webkit_download_get_total_size(o));
++ const Arg a= {.v = (void*) &s};
++ eval(c, &a);
++ }
++ else {
++ struct client_size_tuple* t= calloc(1, sizeof(struct client_size_tuple));
++ t->c= c; t->s= (gint)webkit_download_get_current_size(o);
++ g_signal_connect(c->view, "document-load-finished", G_CALLBACK(late_download_update), t);
++ }
 + }
 +}
 +
-+static void
+ static void
  evalscript(JSContextRef js, char *script, char* scriptname) {
          JSStringRef jsscript, jsscriptname;
- JSValueRef exception = NULL;
-_AT_@ -496,12 +520,104 @@ geturi(Client *c) {
+_AT_@ -496,12 +541,105 @@ geturi(Client *c) {
  
  static gboolean
  initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
_AT_@ -133,22 +154,25 @@ index c9fa08d..6c95f6e 100644
 +"</body>" \
 +"</html>";
 + char html[sizeof(template)+2048];
-+ n = newclient();
 + filename = webkit_download_get_suggested_filename(o);
 +
 + path = g_build_filename(downdir, filename, NULL);
 + uri = g_filename_to_uri(path, NULL, NULL);
 +
++ webkit_download_set_destination_uri(o, uri);
++ webkit_download_start(o);
++
++ n = newclient();
 + snprintf(html, sizeof(template)+2048, template, filename, filename, path);
 + webkit_web_view_load_string(n->view, html, NULL, NULL, NULL);
 +
 + g_signal_connect(o, "notify::progress", G_CALLBACK(download), n);
 + g_signal_connect(o, "notify::status", G_CALLBACK(download), n);
++
 + n->title = g_strdup_printf("Downloading %s", filename);
 + n->progress = 0;
 + update(n);
 +
-+ webkit_download_set_destination_uri(o, uri);
 + g_free(path);
 + g_free(uri);
  
_AT_@ -156,8 +180,6 @@ index c9fa08d..6c95f6e 100644
 - arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o), geturi(c));
 - spawn(c, &arg);
 - return FALSE;
-+ webkit_download_start(o);
-+
 + return TRUE;
  }
  
Received on Wed Jan 30 2013 - 17:08:42 CET