BrowserWindow.vala

[app.webkitpdf] / BrowserWindow.vala

diff --git a/BrowserWindow.vala b/BrowserWindow.vala
index 0feb633..366537d 100644 (file)
--- a/BrowserWindow.vala
+++ b/BrowserWindow.vala
@@ -53,50 +53,7 @@ public class BrowserWindow : Object
             var r =  new Regex ("\\.blogspot\\..*?/");
             blog = r.replace(blog, blog.length, 0, ".blogspot.com/ncr/");
         }
-          
-        if(webkitpdf.opt_cookies != null) {
-            print("setting cookie %s\n",webkitpdf.opt_cookies);
-               
-            var uri = new Soup.URI (blog);
-                           
-            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 ();
-                var ssl = "FALSE";
-                if (scheme=="https") {
-                    ssl="TRUE";
-                }                
-                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 (uri.get_host() + "\tTRUE\t/\t"+ssl+"\t2147483647\t" + cookies[0] + "\t" + 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();                     
-                cookie_jar.set_accept_policy(Soup.CookieJarAcceptPolicy.NEVER);                                 
-                cookie_jar.add_cookie(new Soup.Cookie (cookies[0], cookies[1], uri.get_host(), "/", -1));                          
-                sess.add_feature(cookie_jar);
-#endif                                                                     
-            }
-            
-
-         } 
-               
+        
          print("loading url %s\n",blog);       
          this.view.el.load_uri(blog);
                
@@ -161,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 )
         {
@@ -175,7 +133,54 @@ 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;
@@ -421,15 +426,18 @@ public class BrowserWindow : Object
         }
         
         public void delete_cookiefile () {
-            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);
-                }
+                  
+            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);
+                }
+            }            
         }
     }