[hackers] [surf] Adding disk cache support for soup. || Christoph Lohmann

From: <git_AT_suckless.org>
Date: Sat, 17 Jan 2015 20:51:10 +0100 (CET)

commit 117d4848338315d15e1ab93cd551889fc6964a2b
Author: Christoph Lohmann <20h_AT_r-36.net>
Date: Sat Jan 17 20:50:21 2015 +0100

    Adding disk cache support for soup.
    
    This is a merge of the patch of Ben Woolley <tautolog_AT_gmail.com>

diff --git a/config.def.h b/config.def.h
index 1b11d10..6718a81 100644
--- a/config.def.h
+++ b/config.def.h
_AT_@ -4,6 +4,7 @@ static char *useragent = "Mozilla/5.0 (X11; U; Unix; en-US) "
         "Safari/537.15 Surf/"VERSION;
 static char *scriptfile = "~/.surf/script.js";
 static char *styledir = "~/.surf/styles/";
+static char *cachefolder = "~/.surf/cache/";
 
 static Bool kioskmode = FALSE; /* Ignore shortcuts */
 static Bool showindicators = TRUE; /* Show indicators in window title */
_AT_@ -22,15 +23,17 @@ static char *strictssl = FALSE; /* Refuse untrusted SSL connections */
 static time_t sessiontime = 3600;
 
 /* Webkit default features */
-static Bool enablescrollbars = TRUE;
+static Bool enablescrollbars = TRUE;
 static Bool enablespatialbrowsing = TRUE;
-static Bool enableplugins = TRUE;
-static Bool enablescripts = TRUE;
-static Bool enableinspector = TRUE;
-static Bool enablestyles = TRUE;
-static Bool loadimages = TRUE;
-static Bool hidebackground = FALSE;
-static Bool allowgeolocation = TRUE;
+static Bool enablediskcache = TRUE;
+static int diskcachebytes = 5 * 1024 * 1024;
+static Bool enableplugins = TRUE;
+static Bool enablescripts = TRUE;
+static Bool enableinspector = TRUE;
+static Bool enablestyles = TRUE;
+static Bool loadimages = TRUE;
+static Bool hidebackground = FALSE;
+static Bool allowgeolocation = TRUE;
 
 #define SETPROP(p, q) { \
         .v = (char *[]){ "/bin/sh", "-c", \
diff --git a/surf.c b/surf.c
index 82cf822..a229994 100644
--- a/surf.c
+++ b/surf.c
_AT_@ -85,11 +85,12 @@ static GdkNativeWindow embed = 0;
 static gboolean showxid = FALSE;
 static char winid[64];
 static gboolean usingproxy = 0;
-static char togglestat[8];
+static char togglestat[9];
 static char pagestat[3];
 static GTlsDatabase *tlsdb;
 static int policysel = 0;
 static char *stylefile = NULL;
+static SoupCache *diskcache = NULL;
 
 static void addaccelgroup(Client *c);
 static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
_AT_@ -270,6 +271,10 @@ buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl) {
 
 static void
 cleanup(void) {
+ if (diskcache) {
+ soup_cache_flush(diskcache);
+ soup_cache_dump(diskcache);
+ }
         while(clients)
                 destroyclient(clients);
         g_free(cookiefile);
_AT_@ -677,6 +682,10 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
         case WEBKIT_LOAD_FINISHED:
                 c->progress = 100;
                 updatetitle(c);
+ if (diskcache) {
+ soup_cache_flush(diskcache);
+ soup_cache_dump(diskcache);
+ }
                 break;
         default:
                 break;
_AT_@ -972,6 +981,8 @@ newwindow(Client *c, const Arg *arg, gboolean noembed) {
                 cmd[i++] = "-s";
         if(showxid)
                 cmd[i++] = "-x";
+ if(enablediskcache)
+ cmd[i++] = "-D";
         cmd[i++] = "-c";
         cmd[i++] = cookiefile;
         cmd[i++] = "--";
_AT_@ -1149,6 +1160,7 @@ setup(void) {
         /* dirs and files */
         cookiefile = buildpath(cookiefile);
         scriptfile = buildpath(scriptfile);
+ cachefolder = buildpath(cachefolder);
         styledir = buildpath(styledir);
         if(stylefile == NULL && enablestyles) {
                 for(i = 0; i < LENGTH(styles); i++) {
_AT_@ -1175,6 +1187,14 @@ setup(void) {
                         SOUP_SESSION_FEATURE(cookiejar_new(cookiefile, FALSE,
                                         cookiepolicy_get())));
 
+ /* disk cache */
+ if(enablediskcache) {
+ diskcache = soup_cache_new(cachefolder, SOUP_CACHE_SINGLE_USER);
+ soup_cache_set_max_size(diskcache, diskcachebytes);
+ soup_cache_load(diskcache);
+ soup_session_add_feature(s, SOUP_SESSION_FEATURE(diskcache));
+ }
+
         /* ssl */
         tlsdb = g_tls_file_database_new(cafile, &error);
 
_AT_@ -1363,6 +1383,8 @@ gettogglestat(Client *c){
 
         togglestat[p++] = allowgeolocation? 'G': 'g';
 
+ togglestat[p++] = enablediskcache? 'D': 'd';
+
         g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
         togglestat[p++] = value? 'I': 'i';
 
_AT_@ -1479,6 +1501,12 @@ main(int argc, char *argv[]) {
         case 'c':
                 cookiefile = EARGF(usage());
                 break;
+ case 'd':
+ enablediskcache = 0;
+ break;
+ case 'D':
+ enablediskcache = 1;
+ break;
         case 'e':
                 embed = strtol(EARGF(usage()), NULL, 0);
                 break;
Received on Sat Jan 17 2015 - 20:51:10 CET