Don't save redirecting URLs to history

panthera-www.cc

@@ -149,7 +149,7 @@ public:

                                
                                
                                
                            
                                
                                    
                                        
                                            149  
                                                        );
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            150  
                                                        auto next_entries = this->history_manager->storage.get_all<HistoryEntry>(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            151  
                                                            sqlite_orm::where(sqlite_orm::c(&HistoryEntry::timestamp) >= datetime.to_unix() + 86400),
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        152 -
                                                        sqlite_orm::order_by(&HistoryEntry::timestamp).desc()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        152 +
                                                        sqlite_orm::order_by(&HistoryEntry::timestamp).asc()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            153  
                                                        );
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            154  
                                                        if(next_entries.empty()) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            155  
                                                            return;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -271,6 +271,22 @@ protected:

                                
                                
                                
                            
                                
                                    
                                        
                                            271  
                                                std::shared_ptr<HistoryManager> history_manager;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            272  
                                                HistoryViewer *history_viewer = nullptr;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            273  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        274 +
                                            static void load_change_callback(WebKitWebView *object, WebKitLoadEvent load_event, gpointer data) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        275 +
                                                if(auto self = static_cast<PantheraWww*>(data)) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        276 +
                                                    if(load_event == WEBKIT_LOAD_COMMITTED) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        277 +
                                                        if(webkit_web_view_get_title(WEBKIT_WEB_VIEW(object)) == nullptr) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        278 +
                                                            self->history_manager->log_url(webkit_web_view_get_uri(WEBKIT_WEB_VIEW(object)), "");
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        279 +
                                                        } else {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        280 +
                                                            self->history_manager->log_url(webkit_web_view_get_uri(WEBKIT_WEB_VIEW(object)),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        281 +
                                                                                           webkit_web_view_get_title(WEBKIT_WEB_VIEW(object)));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        282 +
                                                        }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        283 +
                                                        if(self->history_viewer->get_visible()) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        284 +
                                                            self->history_viewer->reload_history();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        285 +
                                                        }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        286 +
                                                    }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        287 +
                                                }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        288 +
                                            }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        289 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            290  
                                                static void notify_callback(GObject *object, GParamSpec *pspec, gpointer data) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            291  
                                                    if(!gtk_widget_get_parent(GTK_WIDGET(object))) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            292  
                                                        return;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -294,16 +310,6 @@ protected:

                                
                                
                                
                            
                                
                                    
                                        
                                            310  
                                                                        gtk_image_set_from_paintable(image->gobj(), GDK_PAINTABLE(favicon));
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            311  
                                                                    }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            312  
                                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        297 -
                                                        } else if(g_strcmp0(pspec->name, "uri") == 0) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        298 -
                                                            if(webkit_web_view_get_title(WEBKIT_WEB_VIEW(object)) == nullptr) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        299 -
                                                                self->history_manager->log_url(webkit_web_view_get_uri(WEBKIT_WEB_VIEW(object)), "");
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        300 -
                                                            } else {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        301 -
                                                                self->history_manager->log_url(webkit_web_view_get_uri(WEBKIT_WEB_VIEW(object)),
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        302 -
                                                                                               webkit_web_view_get_title(WEBKIT_WEB_VIEW(object)));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        303 -
                                                            }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        304 -
                                                            if(self->history_viewer->get_visible()) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        305 -
                                                                self->history_viewer->reload_history();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        306 -
                                                            }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            313  
                                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            314  
                                                        }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            315  
                                                    }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -377,6 +383,7 @@ protected:

                                
                                
                                
                            
                                
                                    
                                        
                                            383  
                                                    page_tab->set_spacing(4);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            384  
                                                    auto page = Gtk::make_managed<gPanthera::ContentPage>(content_manager, stack, page_content, page_tab);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            385  
                                                    g_signal_connect(webview, "notify", G_CALLBACK(notify_callback), this);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        386 +
                                                g_signal_connect(webview, "load-changed", G_CALLBACK(load_change_callback), this);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            387  
                                                    g_signal_connect(webview, "decide-policy", G_CALLBACK(on_decide_policy), this);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            388  
                                                    webkit_web_view_load_uri(webview, url_.data());
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            389  
                                                    auto cookie_manager = webkit_network_session_get_cookie_manager(webkit_web_view_get_network_session(webview));