keep all redirects chain, add referrer holder

src/app/browser/window/tab/item/page/meta.rs

@@ -29,10 +29,9 @@ pub enum Status {
 }
 
 pub struct Meta {
-    status: RefCell<Status>,
-    title: RefCell<GString>,
-    redirect: RefCell<Option<Redirect>>,
-    redirect_count: RefCell<Option<i8>>,
+    pub status: RefCell<Status>,
+    pub title: RefCell<GString>,
+    pub redirect: RefCell<Vec<Redirect>>,
 }
 
 impl Meta {
@@ -42,8 +41,7 @@ impl Meta {
         Self {
             status: RefCell::new(status),
             title: RefCell::new(title),
-            redirect: RefCell::new(None),
-            redirect_count: RefCell::new(None),
+            redirect: RefCell::new(Vec::new()),
         }
     }
 
@@ -59,30 +57,18 @@ impl Meta {
         self
     }
 
-    pub fn set_redirect(&self, request: GString, is_foreground: bool) -> &Self {
+    pub fn set_redirect(
+        &self,
+        request: GString,
+        referrer: Option<GString>,
+        is_foreground: bool,
+    ) -> &Self {
         self.redirect
-            .replace(Some(Redirect::new(request, is_foreground)));
+            .borrow_mut()
+            .push(Redirect::new(request, referrer, is_foreground));
         self
     }
 
-    pub fn set_redirect_count(&self, redirect_count: Option<i8>) -> &Self {
-        self.redirect_count.replace(redirect_count);
-        self
-    }
-
-    pub fn unset_redirect_count(&self) -> &Self {
-        if self.redirect_count.borrow().is_some() {
-            self.set_redirect_count(None);
-        }
-        self
-    }
-
-    /* @TODO not in use
-    pub fn unset_redirect(&self) -> &Self {
-        self.redirect.replace(None);
-        self
-    } */
-
     // Getters
 
     pub fn status(&self) -> Status {
@@ -93,15 +79,12 @@ impl Meta {
         self.title.borrow().clone()
     }
 
-    pub fn redirect_count(&self) -> Option<i8> {
-        *self.redirect_count.borrow()
+    pub fn total_redirects(&self) -> usize {
+        self.redirect.borrow().len() + 1
     }
 
-    /// WARNING!
-    ///
-    /// This function **take** the `Redirect` without clone semantics
-    pub fn take_redirect(&self) -> Option<Redirect> {
-        self.redirect.take()
+    pub fn last_redirect(&self) -> Option<Redirect> {
+        self.redirect.borrow().last().cloned()
     }
 
     // Actions

src/app/browser/window/tab/item/page/meta/redirect.rs

@@ -12,28 +12,21 @@ use gtk::glib::GString;
 /// * `request` - destination
 ///   * currently, it's raw `GString` not [Uri](https://docs.gtk.org/glib/struct.Uri.html)
 ///     because of compatibility with request field as it could contain any other, not parsable values
+#[derive(Clone, Debug)]
 pub struct Redirect {
-    is_foreground: bool,
-    request: GString,
+    pub is_foreground: bool,
+    pub referrer: Option<GString>,
+    pub request: GString,
 }
 
 impl Redirect {
     // Constructors
 
-    pub fn new(request: GString, is_foreground: bool) -> Self {
+    pub fn new(request: GString, referrer: Option<GString>, is_foreground: bool) -> Self {
         Self {
             is_foreground,
+            referrer,
             request,
         }
     }
-
-    // Getters
-
-    pub fn request(&self) -> GString {
-        self.request.clone()
-    }
-
-    pub fn is_foreground(&self) -> bool {
-        self.is_foreground
-    }
 }

src/app/browser/window/tab/item/page/request.rs

@@ -1,4 +1,4 @@
-use gtk::glib::{Uri, UriFlags};
+use gtk::glib::{GString, Uri, UriFlags};
 
 /// Request type for `Page` with optional value parsed
 pub enum Request {
@@ -12,7 +12,9 @@ impl Request {
     // Constructors
 
     /// Create new `Self` from `request` string
-    pub fn from(request: &str) -> Self {
+    /// * if some `referrer` given, make additional check in previous request
+    pub fn from(request: &str, referrer: Option<&GString>) -> Self {
+        // check in request
         if let Some(postfix) = request.strip_prefix("source:") {
             if let Ok(uri) = Uri::parse(postfix, UriFlags::NONE) {
                 return Self::Source(uri);
@@ -25,10 +27,25 @@ impl Request {
             }
         }
 
+        // check in referrer @TODO tmp
+        if referrer.is_some_and(|this| this.starts_with("source:")) {
+            if let Ok(uri) = Uri::parse(request, UriFlags::NONE) {
+                return Self::Source(uri);
+            }
+        }
+
+        if referrer.is_some_and(|this| this.starts_with("download:")) {
+            if let Ok(uri) = Uri::parse(request, UriFlags::NONE) {
+                return Self::Download(uri);
+            }
+        }
+
+        // is default
         if let Ok(uri) = Uri::parse(request, UriFlags::NONE) {
             return Self::Default(uri);
         }
 
+        // is search
         Self::Search(request.to_string())
     }
 }