From 4e7565297ac6b61c932142f06652c4ab025c7549 Mon Sep 17 00:00:00 2001
From: yggverse <yggverse@project>
Date: Mon, 30 Sep 2024 16:40:36 +0300
Subject: [PATCH] add comments, rename address getter to url

---
 src/browser/main/tab/page.rs                 | 4 ++--
 src/browser/main/tab/page/navigation.rs      | 4 ++--
 src/browser/main/tab/page/navigation/base.rs | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/browser/main/tab/page.rs b/src/browser/main/tab/page.rs
index bb60cf5b..6d66925c 100644
--- a/src/browser/main/tab/page.rs
+++ b/src/browser/main/tab/page.rs
@@ -114,8 +114,8 @@ impl Page {
     }
 
     pub fn navigation_base(&self) {
-        if let Some(address) = self.navigation.base_address() {
-            self.action_page_open.activate(Some(&address.to_variant()));
+        if let Some(url) = self.navigation.base_url() {
+            self.action_page_open.activate(Some(&url.to_variant()));
         }
     }
 
diff --git a/src/browser/main/tab/page/navigation.rs b/src/browser/main/tab/page/navigation.rs
index fe1c7d79..b9b9734a 100644
--- a/src/browser/main/tab/page/navigation.rs
+++ b/src/browser/main/tab/page/navigation.rs
@@ -103,8 +103,8 @@ impl Navigation {
         &self.widget
     }
 
-    pub fn base_address(&self) -> Option<GString> {
-        self.base.address()
+    pub fn base_url(&self) -> Option<GString> {
+        self.base.url()
     }
 
     pub fn request_text(&self) -> GString {
diff --git a/src/browser/main/tab/page/navigation/base.rs b/src/browser/main/tab/page/navigation/base.rs
index 0058202f..18c45af5 100644
--- a/src/browser/main/tab/page/navigation/base.rs
+++ b/src/browser/main/tab/page/navigation/base.rs
@@ -7,8 +7,11 @@ use gtk::{
 use std::{cell::RefCell, sync::Arc};
 
 pub struct Base {
+    // Actions
     action_tab_page_navigation_base: Arc<SimpleAction>,
+    // Mutable URI cache (parsed on update)
     uri: RefCell<Option<Uri>>,
+    // GTK
     widget: Button,
 }
 
@@ -58,7 +61,8 @@ impl Base {
         &self.widget
     }
 
-    pub fn address(&self) -> Option<GString> {
+    pub fn url(&self) -> Option<GString> {
+        // Build URL from parsed URI cache
         if let Some(uri) = self.uri.take() {
             let scheme = uri.scheme();
             let port = uri.port();
@@ -67,7 +71,7 @@ impl Base {
                     return Some(gformat!("{scheme}://{host}:{port}/"));
                 } else {
                     return Some(gformat!("{scheme}://{host}/"));
-                }
+                } // @TODO auth params
             }
         }
         None