X-Git-Url: http://git.roojs.org/?p=app.webkitpdf;a=blobdiff_plain;f=BrowserWindow.vala;h=e1f421c4a84ad26cfd37ea9577d96e17a6653a47;hp=82eff3fa59257d59d0c79b330f03bcbc044c9029;hb=96afe12fc5d3e1def62dcdbf84f966eb073e90c3;hpb=0432608a06ef64194385a1e722e761bef82a7d53 diff --git a/BrowserWindow.vala b/BrowserWindow.vala index 82eff3f..e1f421c 100644 --- a/BrowserWindow.vala +++ b/BrowserWindow.vala @@ -55,13 +55,13 @@ public class BrowserWindow : Object print("loading url %s\n",blog); this.view.el.load_uri(blog); - + // if we have not finished in 25 seconds // call printit... - var cd = 25; + var cd = webkitpdf.opt_delay > 25 ? webkitpdf.opt_delay : 25; GLib.Timeout.add_seconds(1, () => { cd--; - print("timeout 25 seconds :%d", cd); + print("timeout %d seconds :%d", (int)( webkitpdf.opt_delay > 25 ? webkitpdf.opt_delay : 25), (int)cd); if (cd < 1) { print("calling printit - timed out"); _this.view.printit(); @@ -114,6 +114,7 @@ public class BrowserWindow : Object // my vars (def) + public string cookie_file; public bool print_started; public int load_try; @@ -145,7 +146,19 @@ public class BrowserWindow : Object }); - + + this.el.resource_load_started.connect( (resource, request) => { + print("Adding referrer header %s\n" , request.get_uri()); + + if (request.get_http_headers() != null) { + request.get_http_headers().remove("Referer"); + request.get_http_headers().append("Referer", request.get_uri()); + } + }); + var settings = this.el.get_settings(); + settings.set_user_agent( "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36" ); + + #else //listeners // this.el.resource_request_starting.connect( (p0, webres, netreq ) => { @@ -159,8 +172,67 @@ public class BrowserWindow : Object this.printit(); }); + WebKit.get_default_session().request_started.connect((message, socket) => { + Soup.URI uri = message.get_uri(); + + var host = uri.get_host (); + + print("Adding header http://%s/\n", host); + message.request_headers.remove("Referer"); + message.request_headers.append("Referer", "http://"+host+"/"); + + + }); + var sess = WebKit.get_default_session(); + sess.user_agent= "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36"; + + #endif } + this.cookie_file = ""; + if (webkitpdf.opt_cookies != null) { + print("setting cookie %s\n",webkitpdf.opt_cookies); + + var uri = new Soup.URI (webkitpdf.opt_url); + + string[] cookies = webkitpdf.opt_cookies.split ("=", 2); + + if(cookies.length > 1 ) { + + #if GTK3 + var context = WebKit.WebContext.get_default(); + var cookie_manager = context.get_cookie_manager(); + cookie_manager.set_accept_policy(WebKit.CookieAcceptPolicy.NEVER); + string scheme = uri.get_scheme (); + + try { + FileIOStream iostream; + File file = File.new_tmp ("cookie-XXXXXX.txt", out iostream); + this.cookie_file = file.get_path (); + print("cookie tmp file name: %s\n", file.get_path ()); + + OutputStream ostream = iostream.output_stream; + DataOutputStream dostream = new DataOutputStream (ostream); + dostream.put_string ("%s\tTRUE\t/\t%s\t2147483647\t%s\t%s".printf(uri.get_host(),scheme == "http" ? "FALSE" : "TRUE",cookies[0],cookies[1])); + cookie_manager.set_persistent_storage(file.get_path(), WebKit.CookiePersistentStorage.TEXT); + } catch (Error e) { + stdout.printf ("Error: %s\n", e.message); + } + #else + var cookie_jar = new Soup.CookieJar(); + var cookie = new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), "/", -1); + if(uri.get_scheme() =="https") { + cookie.set_secure(true); + } + cookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER); + cookie_jar.add_cookie(cookie); + WebKit.get_default_session().add_feature(cookie_jar); + #endif + + } + + } + // init method } // user defined functions @@ -272,6 +344,7 @@ public class BrowserWindow : Object pe.set_page_setup(psetup); pe.finished.connect( () => { print("print completed\n"); + this.delete_cookiefile(); Gtk.main_quit(); }); @@ -301,6 +374,7 @@ public class BrowserWindow : Object */; pe.done.connect(() => { print("print completed\n"); + this.delete_cookiefile(); Gtk.main_quit(); }); @@ -364,12 +438,28 @@ public class BrowserWindow : Object // sf.write_to_png(Browser.opt_target_png); //}); + this.delete_cookiefile(); Gtk.main_quit(); #endif + } + public void delete_cookiefile () { + if(this.cookie_file.length < 1 ){ + return; + } + print("deleting tmp file %s\n",this.cookie_file); + File file = File.new_for_path (this.cookie_file); + try { + if (file.query_exists () == true) { + file.delete (); + } + } catch (Error e) { + stdout.printf ("Error: %s\n", e.message); + } + } }