From: Alan Knowles Date: Tue, 10 Apr 2018 04:23:09 +0000 (+0800) Subject: Revert "BrowserWindow.bjs" X-Git-Url: http://git.roojs.org/?p=app.webkitpdf;a=commitdiff_plain;h=f43960c4cb7f83f512291d776dd836d12ee22a59 Revert "BrowserWindow.bjs" This reverts commit 9485ecad74dd5fe541b46b2c2630a77aad3db5c6. --- diff --git a/BrowserWindow.vala b/BrowserWindow.vala index 82eff3f..366537d 100644 --- a/BrowserWindow.vala +++ b/BrowserWindow.vala @@ -4,7 +4,7 @@ public class BrowserWindow : Object { public Gtk.Window el; private BrowserWindow _this; - + public string cookie_file; public static BrowserWindow singleton() { if (_BrowserWindow == null) { @@ -32,44 +32,46 @@ public class BrowserWindow : Object //listeners this.el.destroy.connect( () => { + Gtk.main_quit(); }); this.el.show.connect( () => { - print("resizing window\n"); - var w = webkitpdf.opt_width > 0 ? webkitpdf.opt_width : 1200; - var h = webkitpdf.opt_height > 0 ? webkitpdf.opt_height : 500; + print("resizing window\n"); + var w = webkitpdf.opt_width > 0 ? webkitpdf.opt_width : 1200; + var h = webkitpdf.opt_height > 0 ? webkitpdf.opt_height : 500; - this.el.resize(w,h); + this.el.resize(w,h); - // we have to do silly stuff with blogspot!!?!? - var blog = webkitpdf.opt_url; + // we have to do silly stuff with blogspot!!?!? + var blog = webkitpdf.opt_url; - /* Do not redirect if the domain is .com already */ - if (/\.blogspot\.com/.match(blog)) { - var r = new Regex ("\\.blogspot\\..*?/"); - blog = r.replace(blog, blog.length, 0, ".blogspot.com/ncr/"); - } - - print("loading url %s\n",blog); - this.view.el.load_uri(blog); + /* Do not redirect if the domain is .com already */ + if (/\.blogspot\.com/.match(blog)) { + var r = new Regex ("\\.blogspot\\..*?/"); + blog = r.replace(blog, blog.length, 0, ".blogspot.com/ncr/"); + } + + 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; - GLib.Timeout.add_seconds(1, () => { - cd--; - print("timeout 25 seconds :%d", cd); - if (cd < 1) { - print("calling printit - timed out"); - _this.view.printit(); - return false; - } - return true; + // if we have not finished in 25 seconds + // call printit... + var cd = 25; + GLib.Timeout.add_seconds(1, () => { + cd--; + print("timeout 25 seconds :%d", cd); + if (cd < 1) { + print("calling printit - timed out"); + _this.view.printit(); + + return false; + } + return true; - }); + }); }); @@ -101,7 +103,7 @@ public class BrowserWindow : Object // init method { - this.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC); + this.el.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC); } } @@ -116,7 +118,8 @@ public class BrowserWindow : Object // my vars (def) public bool print_started; public int load_try; - + public string cookie_file; + // ctor public Xcls_view(BrowserWindow _owner ) { @@ -130,16 +133,63 @@ public class BrowserWindow : Object // set gobject values + // setting up cookie injection + 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 sess = WebKit.get_default_session(); + 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); + sess.add_feature(cookie_jar); + #endif + + } + + } // init method + + { - this.load_try = 0; + this.load_try = 0; #if GTK3 - this.el.load_changed.connect( (ev ) => { - if (ev != WebKit.LoadEvent.FINISHED) { - return; - } + this.el.load_changed.connect( (ev ) => { + if (ev != WebKit.LoadEvent.FINISHED) { + return; + } this.printit(); @@ -180,73 +230,74 @@ public class BrowserWindow : Object this.print_started = true; // flag to stop double call. - // inject any javascript if needed.. - if (webkitpdf.opt_inject_js != null) { + // inject any javascript if needed.. + if (webkitpdf.opt_inject_js != null) { - print("injecting javascript files \n"); - foreach(var inject_js in webkitpdf.opt_inject_js) { - print("inject? %s\n", inject_js); - string str; - try { - FileUtils.get_contents( inject_js, out str); - } catch(FileError e) { - print("Failed to inject %s\n", inject_js); - continue; - } + print("injecting javascript files \n"); + foreach(var inject_js in webkitpdf.opt_inject_js) { + print("inject? %s\n", inject_js); + string str; + try { + FileUtils.get_contents( inject_js, out str); + } catch(FileError e) { + print("Failed to inject %s\n", inject_js); + continue; + } #if GTK3 - GLib.MainLoop mainloop = new GLib.MainLoop(); - this.el.run_javascript.begin(str, null, (obj,res) => { - mainloop.quit(); - }); - mainloop.run(); + GLib.MainLoop mainloop = new GLib.MainLoop(); + this.el.run_javascript.begin(str, null, (obj,res) => { + mainloop.quit(); + }); + mainloop.run(); #else - this.el.execute_script(str); + this.el.execute_script(str); #endif - } - } + } + } - print("calling print in %d seconds\n", (int)webkitpdf.opt_delay); - if (webkitpdf.opt_target_pdf != null) { - GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { - print("delay done URL: %s\n", this.el.uri); + print("calling print in %d seconds\n", (int)webkitpdf.opt_delay); + + if (webkitpdf.opt_target_pdf != null) { + GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { + print("delay done URL: %s\n", this.el.uri); - this.printpdf(); - return false; - }, GLib.Priority.DEFAULT); - return; - } + this.printpdf(); + return false; + }, GLib.Priority.DEFAULT); + return; + } #if GTK3 - print("PNG not supported in webkit2\n"); - return; + print("PNG not supported in webkit2\n"); + return; #else GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { - // ----------------- JPEG - // resize the window... - // window.document.documentElement.scrollHeight - var scroll_height = (int) _this.view.el.get_dom_document().document_element.scroll_height; - print("Scroll height %d\n", scroll_height); - if (scroll_height> 1024 || webkitpdf.opt_width > 0 || webkitpdf.opt_height > 0 ) { - var w = webkitpdf.opt_width > 0 ? webkitpdf.opt_width : 1200; - var h = int.min(scroll_height, 6000); - _this.scrolled_window.el.set_size_request( w, h); - _this.el.resize (w+50, h+50); - print("Resize to %d, %d\n", w,h); - GLib.Timeout.add_seconds(webkitpdf.opt_delay > 0 ? webkitpdf.opt_delay : 1 , () => { - this.printpng(); - return false; - }, GLib.Priority.DEFAULT); - return false; - } - this.printpng(); - return false; - }, GLib.Priority.DEFAULT); + // ----------------- JPEG + // resize the window... + // window.document.documentElement.scrollHeight + var scroll_height = (int) _this.view.el.get_dom_document().document_element.scroll_height; + print("Scroll height %d\n", scroll_height); + if (scroll_height> 1024 || webkitpdf.opt_width > 0 || webkitpdf.opt_height > 0 ) { + var w = webkitpdf.opt_width > 0 ? webkitpdf.opt_width : 1200; + var h = int.min(scroll_height, 6000); + _this.scrolled_window.el.set_size_request( w, h); + _this.el.resize (w+50, h+50); + print("Resize to %d, %d\n", w,h); + GLib.Timeout.add_seconds(webkitpdf.opt_delay > 0 ? webkitpdf.opt_delay : 1 , () => { + this.printpng(); + return false; + }, GLib.Priority.DEFAULT); + return false; + } + this.printpng(); + return false; + }, GLib.Priority.DEFAULT); #endif @@ -256,78 +307,80 @@ public class BrowserWindow : Object - var list = Gtk.PaperSize.get_paper_sizes(false); - var psetup = new Gtk.PageSetup(); - for(var i = 0; i < list.length(); i++ ) { - var entry = list.nth_data(i).copy(); - if (entry.get_name() == "iso_a2") { - psetup.set_paper_size(entry); - } - } + var list = Gtk.PaperSize.get_paper_sizes(false); + var psetup = new Gtk.PageSetup(); + for(var i = 0; i < list.length(); i++ ) { + var entry = list.nth_data(i).copy(); + if (entry.get_name() == "iso_a2") { + psetup.set_paper_size(entry); + } + } #if GTK3 - var pe = new WebKit.PrintOperation(this.el); - pe.set_page_setup(psetup); - pe.finished.connect( () => { - print("print completed\n"); - Gtk.main_quit(); + var pe = new WebKit.PrintOperation(this.el); + pe.set_page_setup(psetup); + pe.finished.connect( () => { + print("print completed\n"); + this.delete_cookiefile(); + Gtk.main_quit(); - }); + }); - var ps = new Gtk.PrintSettings(); - ps.set_printer("Print to File"); - ps.set("output-file-format", "pdf"); - ps.set("output-uri", "file://" + webkitpdf.opt_target_pdf); + var ps = new Gtk.PrintSettings(); + ps.set_printer("Print to File"); + ps.set("output-file-format", "pdf"); + ps.set("output-uri", "file://" + webkitpdf.opt_target_pdf); - pe.set_print_settings(ps); + pe.set_print_settings(ps); - pe.print(); + pe.print(); #else - var pe = new Gtk.PrintOperation(); - pe.export_filename = webkitpdf.opt_target_pdf; - print("got callback for print\n"); - pe.ref(); - /*pe.failed.connect(() => { - print("print failed\n"); - Gtk.main_quit(); + var pe = new Gtk.PrintOperation(); + pe.export_filename = webkitpdf.opt_target_pdf; + print("got callback for print\n"); + pe.ref(); + /*pe.failed.connect(() => { + print("print failed\n"); + Gtk.main_quit(); - }) - */; - pe.done.connect(() => { - print("print completed\n"); - Gtk.main_quit(); + }) + */; + pe.done.connect(() => { + print("print completed\n"); + this.delete_cookiefile(); + Gtk.main_quit(); - }); + }); - //pe.run_dialog(_this.el); + //pe.run_dialog(_this.el); - pe.set_default_page_setup(psetup); - print("Calling Print?\n"); - //pe.run_dialog(_this.el); + pe.set_default_page_setup(psetup); + print("Calling Print?\n"); + //pe.run_dialog(_this.el); - try { - this.el.get_main_frame().print_full(pe,Gtk.PrintOperationAction.EXPORT); - } catch (Error e) { - // print failed... - } + try { + this.el.get_main_frame().print_full(pe,Gtk.PrintOperationAction.EXPORT); + } catch (Error e) { + // print failed... + } #endif - return false; + return false; } public void printpng () { //var filename = "/tmp/test.pdf"; @@ -351,9 +404,9 @@ public class BrowserWindow : Object int w,h; // add out to gdkpixmap.get_size - pixmap.get_size( out w , out h); - var pixbuf = Gdk.pixbuf_get_from_drawable(null, pixmap, null , 0, 0, 0, 0, w, h); - print("pixbuf size: %d x %d\n ", w,h); + pixmap.get_size( out w , out h); + var pixbuf = Gdk.pixbuf_get_from_drawable(null, pixmap, null , 0, 0, 0, 0, w, h); + print("pixbuf size: %d x %d\n ", w,h); @@ -370,6 +423,21 @@ public class BrowserWindow : Object + } + + public void delete_cookiefile () { + + if(this.cookie_file.length >0 ){ + 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); + } + } } }