X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=BrowserWindow.vala;h=55f24b6cfca9fb9f9598561c3b0ec92a1c24cb53;hb=6d2f96c1d01f452707f50a7928525745e5c3407b;hp=82eff3fa59257d59d0c79b330f03bcbc044c9029;hpb=0432608a06ef64194385a1e722e761bef82a7d53;p=app.webkitpdf diff --git a/BrowserWindow.vala b/BrowserWindow.vala index 82eff3f..55f24b6 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,25 @@ 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" ); + settings.hardware_acceleration_policy = WebKit.HardwareAccelerationPolicy.NEVER; + settings.enable_accelerated_2d_canvas = false; + if (webkitpdf.opt_disable_javascript) { + settings.enable_javascript = false; + } + WebKit.WebContext.get_default().set_tls_errors_policy( WebKit.TLSErrorsPolicy.IGNORE ); + #else //listeners // this.el.resource_request_starting.connect( (p0, webres, netreq ) => { @@ -154,13 +173,95 @@ public class BrowserWindow : Object // }); this.el.load_finished.connect( ( ) => { - - + this.printit(); }); + WebKit.get_default_session().request_started.connect((message, socket) => { + Soup.URI uri = message.get_uri(); + + var host = uri.get_host (); + if (host.contains("google-analytics") || host.contains("googlesyndication") || host.contains("facebook") ) { + print("DISCONNECTING: %s\n", host); + socket.disconnect(); + return; + } + + print("Adding header: %s\n", uri.to_string(false)); + 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"; + sess.ssl_strict = false; + + var settings = this.el.get_settings(); + + settings.enable_webgl = false; + settings.enable_plugins = false; + settings.enable_java_applet = false; + if (webkitpdf.opt_disable_javascript) { + settings.enable_scripts = false; + } + + + this.el.console_message.connect((msg, line, sid) => { + print("CONSOLE: %s:%d %s\n", sid, line, msg); + return false; + }); + this.el.create_web_view.connect((frame) => { + print("WEBFRAME:%s\n", frame.uri); + return new WebKit.WebView(); + }); + #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 @@ -220,8 +321,12 @@ public class BrowserWindow : Object #if GTK3 - print("PNG not supported in webkit2\n"); - return; + GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { + print("delay done URL: %s\n", this.el.uri); + this.printpng(); + return false; + }, GLib.Priority.DEFAULT); + return; #else GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { @@ -272,6 +377,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 +407,7 @@ public class BrowserWindow : Object */; pe.done.connect(() => { print("print completed\n"); + this.delete_cookiefile(); Gtk.main_quit(); }); @@ -341,6 +448,16 @@ public class BrowserWindow : Object print("making screenshot\n"); #if GTK3 + GLib.MainLoop mainloop = new GLib.MainLoop(); + _this.view.el.get_snapshot.begin(WebKit.SnapshotRegion.FULL_DOCUMENT, WebKit.SnapshotOptions.NONE, null, (obj, res) => { + var sf = _this.view.el.get_snapshot.end(res); + sf.write_to_png(webkitpdf.opt_target_png); + print("Saved to %s\n", webkitpdf.opt_target_png); + mainloop.quit(); + + }); + + mainloop.run(); #else // fix vapi - get_snapshot add '?' to all null. @@ -364,12 +481,30 @@ public class BrowserWindow : Object // sf.write_to_png(Browser.opt_target_png); //}); + #endif + 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); + } + } }