From 9b2353f611cf2fc4a1b2a6aa65019bbf2be7844b Mon Sep 17 00:00:00 2001
From: GStudiosX2 <ramazanogutlu0@gmail.com>
Date: Sun, 2 Jun 2024 10:57:46 +0100
Subject: [PATCH 01/12] feat: add set_timeout lua function

---
 examples                                |  1 +
 napture/examples/set_timeout/index.html | 14 ++++++++++++++
 napture/examples/set_timeout/script.lua | 13 +++++++++++++
 napture/src/b9/lua.rs                   | 16 ++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 120000 examples
 create mode 100644 napture/examples/set_timeout/index.html
 create mode 100644 napture/examples/set_timeout/script.lua
diff --git a/examples b/examples
new file mode 120000
index 00000000..9c4e2de0
--- /dev/null
+++ b/examples
@@ -0,0 +1 @@
+napture/examples/
\ No newline at end of file
diff --git a/napture/examples/set_timeout/index.html b/napture/examples/set_timeout/index.html
new file mode 100644
index 00000000..7783afd3
--- /dev/null
+++ b/napture/examples/set_timeout/index.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+  <title>set_timeout</title>
+  <script src="script.lua" />
+</head>
+<body>
+  <p>set_timeout allows you to delay functions a x amount of milliseconds</p>
+  <p class="text">Text</p>
+  <div>
+    <button class="timeout_btn">Test Timeout 500ms</button>
+    <button class="reset_btn">Reset</button>
+  </div>
+</body>
+</html>
diff --git a/napture/examples/set_timeout/script.lua b/napture/examples/set_timeout/script.lua
new file mode 100644
index 00000000..e009559c
--- /dev/null
+++ b/napture/examples/set_timeout/script.lua
@@ -0,0 +1,13 @@
+local timeout_btn = get("timeout_btn")
+local reset_btn = get("reset_btn")
+local text = get("text")
+
+timeout_btn.on_click(function()
+  set_timeout(function()
+    text.set_content("Different Text")
+  end, 500)
+end)
+
+reset_btn.on_click(function()
+  text.set_content("Text")
+end)
diff --git a/napture/src/b9/lua.rs b/napture/src/b9/lua.rs
index 0d745c30..f1c0af62 100644
--- a/napture/src/b9/lua.rs
+++ b/napture/src/b9/lua.rs
@@ -39,6 +39,16 @@ pub trait Luable: Styleable {
 //     Ok(())
 // }
 
+fn set_timeout(_lua: &Lua, func: LuaOwnedFunction, ms: u64) -> LuaResult<()> {
+    glib::spawn_future_local(async move {
+        glib::timeout_future(std::time::Duration::from_millis(ms)).await;
+        if let Err(e) = func.call::<_, ()>(()) {
+            lualog!("error", format!("error calling function in set_timeout: {}", e));
+        }
+    });
+    Ok(())
+}
+
 fn get(
     lua: &Lua,
     class: String,
@@ -307,6 +317,12 @@ pub(crate) async fn run(luacode: String, tags: Rc<RefCell<Vec<Tag>>>, taburl: St
             get(lua, class, tags.clone(), multiple.unwrap_or(false))
         })?
     )?;
+    globals.set(
+        "set_timeout",
+        lua.create_function(move |lua, (func, ms): (LuaOwnedFunction, u64) | {
+           set_timeout(lua, func, ms)
+        })?
+    )?;
     globals.set("fetch", fetchtest)?;
     globals.set("window", window_table)?;
 

From 4a2d23caecd42f819ecc08f4b26ae75ec2111d76 Mon Sep 17 00:00:00 2001
From: GStudiosX2 <ramazanogutlu0@gmail.com>
Date: Sun, 2 Jun 2024 11:05:55 +0100
Subject: [PATCH 02/12] feat: github tree links should work (eg:
 https://github.com/GStudiosX2/random-now/tree/test)

---
 napture/src/b9/html.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/napture/src/b9/html.rs b/napture/src/b9/html.rs
index 3230f166..93ccae69 100644
--- a/napture/src/b9/html.rs
+++ b/napture/src/b9/html.rs
@@ -790,11 +790,15 @@ async fn fetch_file(url: String) -> String {
 
 async fn fetch_from_github(url: String) -> String {
     let client: reqwest::ClientBuilder = reqwest::Client::builder();
+    let branch = if url.contains("tree") {
+        url.split('/').nth(6).unwrap_or("main")
+    } else { "main" };
 
     let url = format!(
-        "https://raw.githubusercontent.com/{}/{}/main/{}",
+        "https://raw.githubusercontent.com/{}/{}/{}/{}",
         url.split('/').nth(3).unwrap_or(""),
         url.split('/').nth(4).unwrap_or(""),
+        branch,
         url.split('/').last().unwrap_or(""),
     );
 
@@ -858,4 +862,4 @@ fn render_p(child: &Node, element: &Element, label_box: &gtk::Box, css: &mut Str
         widget: Box::new(label),
         tied_variables: Vec::new(),
     });
-}
\ No newline at end of file
+}

From 058bcce243e69d9b25048cc2e195b7af8e72d93b Mon Sep 17 00:00:00 2001
From: GStudiosX2 <ramazanogutlu0@gmail.com>
Date: Sun, 2 Jun 2024 12:42:24 +0100
Subject: [PATCH 03/12] feat: allow for path in urls (eg: random.now/test)

---
 napture/examples/set_timeout/index.html |  1 +
 napture/examples/set_timeout/script.lua |  7 +++++++
 napture/src/b9/html.rs                  | 25 ++++++++++++++++++++-----
 napture/src/main.rs                     |  7 +++++--
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/napture/examples/set_timeout/index.html b/napture/examples/set_timeout/index.html
index 7783afd3..c82647dc 100644
--- a/napture/examples/set_timeout/index.html
+++ b/napture/examples/set_timeout/index.html
@@ -8,6 +8,7 @@
   <p class="text">Text</p>
   <div>
     <button class="timeout_btn">Test Timeout 500ms</button>
+    <button class="timeout_btn2">Test Timeout 3000ms</button>
     <button class="reset_btn">Reset</button>
   </div>
 </body>
diff --git a/napture/examples/set_timeout/script.lua b/napture/examples/set_timeout/script.lua
index e009559c..455c60c1 100644
--- a/napture/examples/set_timeout/script.lua
+++ b/napture/examples/set_timeout/script.lua
@@ -1,4 +1,5 @@
 local timeout_btn = get("timeout_btn")
+local timeout_btn2 = get("timeout_btn2")
 local reset_btn = get("reset_btn")
 local text = get("text")
 
@@ -8,6 +9,12 @@ timeout_btn.on_click(function()
   end, 500)
 end)
 
+timeout_btn2.on_click(function()
+  set_timeout(function()
+    text.set_content("Different Text")
+  end, 3000)
+end)
+
 reset_btn.on_click(function()
   text.set_content("Text")
 end)
diff --git a/napture/src/b9/html.rs b/napture/src/b9/html.rs
index 93ccae69..9cd608c9 100644
--- a/napture/src/b9/html.rs
+++ b/napture/src/b9/html.rs
@@ -13,6 +13,7 @@ use gtk::{gdk::Display, gdk_pixbuf, gio, glib::Bytes, prelude::*, CssProvider};
 use html_parser::{Dom, Element, Node, Result};
 
 use lua::Luable;
+use url::Url;
 
 pub(crate) struct Tag {
     pub classes: Vec<String>,
@@ -20,8 +21,16 @@ pub(crate) struct Tag {
     pub tied_variables: Vec<String>,
 }
 
-async fn parse_html(url: String) -> Result<(Node, Node)> {
-    let html = fetch_file(url + "/index.html").await;
+async fn parse_html(mut url: String) -> Result<(Node, Node)> {
+    if let Ok(mut uri) = Url::parse(&url) {
+       if let Ok(mut segments) = uri.path_segments_mut() {
+           segments.pop_if_empty();
+           segments.push("index.html");
+       }
+       url = uri.into();
+    }
+
+    let html = fetch_file(url).await;
 
     let dom = match !html.is_empty() {
         true => Dom::parse(&html),
@@ -70,7 +79,7 @@ pub async fn build_ui(
     scroll: Rc<RefCell<gtk::ScrolledWindow>>,
     searchbar: Rc<RefCell<gtk::SearchEntry>>,
 ) -> Result<(gtk::Box, CssProvider)> {
-    let furl = tab.url.split("?").nth(0).unwrap_or(&tab.url);
+    let furl = tab.url.split("?").nth(0).unwrap_or(&tab.url).strip_suffix("/").unwrap_or(&tab.url);
 
     css::reset_css();
 
@@ -790,16 +799,22 @@ async fn fetch_file(url: String) -> String {
 
 async fn fetch_from_github(url: String) -> String {
     let client: reqwest::ClientBuilder = reqwest::Client::builder();
+
     let branch = if url.contains("tree") {
         url.split('/').nth(6).unwrap_or("main")
     } else { "main" };
 
+    let path = (if url.contains("tree") {
+        url.split('/').skip(7).collect::<Vec<&str>>()
+    } else {
+        url.split('/').skip(5).collect::<Vec<&str>>()
+    }).join("/");
+
     let url = format!(
         "https://raw.githubusercontent.com/{}/{}/{}/{}",
         url.split('/').nth(3).unwrap_or(""),
         url.split('/').nth(4).unwrap_or(""),
-        branch,
-        url.split('/').last().unwrap_or(""),
+        branch, path,
     );
 
     let client = match client.build() {
diff --git a/napture/src/main.rs b/napture/src/main.rs
index ed5a6985..9ee35bed 100644
--- a/napture/src/main.rs
+++ b/napture/src/main.rs
@@ -440,7 +440,8 @@ fn fetch_dns(url: String) -> String {
         "https://{}/domain/{}/{}",
         DNS_SERVER.lock().unwrap().as_str(),
         url.split('.').next().unwrap_or(""),
-        url.split('.').nth(1).unwrap_or(""),
+        url.split('.').nth(1).unwrap_or("")
+            .split('/').next().unwrap_or(""),
     );
 
     let client = match client.build() {
@@ -455,7 +456,9 @@ fn fetch_dns(url: String) -> String {
         let status = response.status();
 
         if let Ok(json) = response.json::<DomainInfo>() {
-            json.ip
+            let path = url.split_once('/')
+                .unwrap_or(("", "")).1;
+            json.ip + &format!("/{}", path)
         } else {
             lualog!("debug", format!("Failed to parse response body from DNS API. Error code: {}.", status.as_u16()));
             String::new()

From c51cf156fda8b7d6b02cc451a9c6f8296e69d2ee Mon Sep 17 00:00:00 2001
From: GStudiosX2 <ramazanogutlu0@gmail.com>
Date: Sun, 2 Jun 2024 12:46:31 +0100
Subject: [PATCH 04/12] add url to Cargo.toml

---
 napture/Cargo.lock | 1 +
 napture/Cargo.toml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/napture/Cargo.lock b/napture/Cargo.lock
index 99c1ec4d..b64a71d4 100644
--- a/napture/Cargo.lock
+++ b/napture/Cargo.lock
@@ -2051,6 +2051,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
+ "url",
  "uuid",
 ]
 
diff --git a/napture/Cargo.toml b/napture/Cargo.toml
index 2d1bd42d..21aae060 100644
--- a/napture/Cargo.toml
+++ b/napture/Cargo.toml
@@ -17,10 +17,11 @@ reqwest = { version = "0.12.3", features = ["blocking", "json"] }
 serde = "1.0.201"
 serde_json = "1.0.117"
 tokio = { version = "1.37.0", features=["macros"] }
+url = "2.5.0"
 uuid = { version = "1.8.0", features = ["fast-rng", "v4"] }
 
 [build-dependencies]
 glib-build-tools = "0.19.0"
 
 [profile.release]
-strip = true
\ No newline at end of file
+strip = true

From a3502170208789cb047fbb27620ff5032b855443 Mon Sep 17 00:00:00 2001
From: GStudiosX2 <ramazanogutlu0@gmail.com>
Date: Mon, 3 Jun 2024 02:56:54 +0100
Subject: [PATCH 05/12] sandbox lua (NEEDS TESTING) & allow nil in set_content

---
 napture/src/b9/lua.rs | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/napture/src/b9/lua.rs b/napture/src/b9/lua.rs
index f1c0af62..bd58f38a 100644
--- a/napture/src/b9/lua.rs
+++ b/napture/src/b9/lua.rs
@@ -90,7 +90,10 @@ fn get(
             )?;
             table.set(
                 "set_content",
-                lua.create_function(move |_, label: String| {
+                lua.create_function(move |_, label: Option<String>| {
+                    let label = if let Some(label) = label {
+                        label
+                    } else { "".to_string()};
                     tags2.borrow()[i].widget.set_contents_(label);
                     Ok(())
                 })?,
@@ -195,8 +198,9 @@ fn print(_lua: &Lua, msg: LuaMultiValue) -> LuaResult<()> {
 // todo: make this async if shit breaks
 pub(crate) async fn run(luacode: String, tags: Rc<RefCell<Vec<Tag>>>, taburl: String) -> LuaResult<()> {
     let lua = Lua::new_with(
-        StdLib::COROUTINE | StdLib::STRING |
-        StdLib::TABLE | StdLib::MATH,
+        /*StdLib::COROUTINE | StdLib::STRING |
+        StdLib::TABLE | StdLib::MATH,*/
+        StdLib::ALL_SAFE,
         LuaOptions::new().catch_rust_panics(true)
     )?;
     let globals = lua.globals();
@@ -326,17 +330,22 @@ pub(crate) async fn run(luacode: String, tags: Rc<RefCell<Vec<Tag>>>, taburl: St
     globals.set("fetch", fetchtest)?;
     globals.set("window", window_table)?;
 
-    let ok = lua.load(luacode).eval::<LuaMultiValue>();
+    if let Err(e) = lua.sandbox(true) {
+        lualog!("error", format!("failed to enable sandbox: {}", e));
+        Err(LuaError::runtime("failed to enable sandbox"))
+    } else {
+        let ok = lua.load(luacode).eval::<LuaMultiValue>();
 
-    match ok {
-        Ok(_) => Ok(()),
-        Err(e) => {
-            eprintln!(
-                "--------------------------\nerror: {}\n--------------------------------",
-                e
-            );
-            Err(LuaError::runtime("Failed to run script!"))
-        }
+        match ok {
+            Ok(_) => Ok(()),
+            Err(e) => {
+                eprintln!(
+                    "--------------------------\nerror: {}\n--------------------------------",
+                    e
+                );
+                Err(LuaError::runtime("Failed to run script!"))
+            }
+       }
     }
 }
 

From e64a52f285d4e850e902615cdd0fab77be1c6a95 Mon Sep 17 00:00:00 2001
From: GStudiosX2 <ramazanogutlu0@gmail.com>
Date: Mon, 3 Jun 2024 07:40:06 +0100
Subject: [PATCH 06/12] clear_timeout & destroy timeouts when switching urls

---
 napture/Cargo.lock                      | 21 +++++++
 napture/Cargo.toml                      |  6 +-
 napture/examples/set_timeout/index.html |  1 +
 napture/examples/set_timeout/script.lua | 11 ++++
 napture/src/b9/html.rs                  |  9 ++-
 napture/src/b9/lua.rs                   | 82 ++++++++++++++++++++++---
 napture/src/globals.rs                  |  6 +-
 napture/src/main.rs                     |  9 +++
 8 files changed, 132 insertions(+), 13 deletions(-)

diff --git a/napture/Cargo.lock b/napture/Cargo.lock
index b64a71d4..dda0e3c0 100644
--- a/napture/Cargo.lock
+++ b/napture/Cargo.lock
@@ -940,6 +940,16 @@ version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
+[[package]]
+name = "libloading"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+dependencies = [
+ "cfg-if",
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.13"
@@ -952,6 +962,15 @@ version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
+[[package]]
+name = "luau0-src"
+version = "0.8.6+luau622"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07758c1f5908f7f9dd9109efaf8c66907cc38acf312db03287e7ad2a64b5de1c"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.2"
@@ -1002,6 +1021,7 @@ dependencies = [
  "bstr",
  "erased-serde",
  "futures-util",
+ "libloading",
  "mlua-sys",
  "mlua_derive",
  "num-traits",
@@ -1019,6 +1039,7 @@ checksum = "d16a9ba1dd2c6ac971b204262d434c24d65067038598f0638b64e5dca28d52b8"
 dependencies = [
  "cc",
  "cfg-if",
+ "luau0-src",
  "pkg-config",
 ]
 
diff --git a/napture/Cargo.toml b/napture/Cargo.toml
index 21aae060..fe3fb8d0 100644
--- a/napture/Cargo.toml
+++ b/napture/Cargo.toml
@@ -6,13 +6,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-adw = { version = "0.6.0", package = "libadwaita", features = ["v1_5"] }
+adw = { version = "0.6.0", package = "libadwaita", features = ["v1_4"] }
 chrono = "0.4.38"
 glib = "0.19.4"
-gtk = { version = "0.8.1", package = "gtk4", features = ["v4_14"] }
+gtk = { version = "0.8.1", package = "gtk4", features = ["v4_12"] }
 html_parser = "0.7.0"
 lazy_static = "1.4.0"
-mlua = { version = "0.9.7", features = ["lua54", "macros", "async", "unstable", "serialize"] }
+mlua = { version = "0.9.7", features = ["luau", "macros", "async", "unstable", "serialize"] }
 reqwest = { version = "0.12.3", features = ["blocking", "json"] }
 serde = "1.0.201"
 serde_json = "1.0.117"
diff --git a/napture/examples/set_timeout/index.html b/napture/examples/set_timeout/index.html
index c82647dc..f2bcee7b 100644
--- a/napture/examples/set_timeout/index.html
+++ b/napture/examples/set_timeout/index.html
@@ -9,6 +9,7 @@
   <div>
     <button class="timeout_btn">Test Timeout 500ms</button>
     <button class="timeout_btn2">Test Timeout 3000ms</button>
+    <button class="timeout_btn3">Test Timeout Cancel</button>
     <button class="reset_btn">Reset</button>
   </div>
 </body>
diff --git a/napture/examples/set_timeout/script.lua b/napture/examples/set_timeout/script.lua
index 455c60c1..16e4c181 100644
--- a/napture/examples/set_timeout/script.lua
+++ b/napture/examples/set_timeout/script.lua
@@ -1,5 +1,6 @@
 local timeout_btn = get("timeout_btn")
 local timeout_btn2 = get("timeout_btn2")
+local timeout_btn3 = get("timeout_btn3")
 local reset_btn = get("reset_btn")
 local text = get("text")
 
@@ -15,6 +16,16 @@ timeout_btn2.on_click(function()
   end, 3000)
 end)
 
+timeout_btn3.on_click(function()
+  local timeout = set_timeout(function()
+    print("this should never be ran")
+  end, 5000)
+  set_timeout(function()
+    clear_timeout(timeout)
+    print("timeout cleared")
+  end, 3000)
+end)
+
 reset_btn.on_click(function()
   text.set_content("Text")
 end)
diff --git a/napture/src/b9/html.rs b/napture/src/b9/html.rs
index 9cd608c9..e78e08a8 100644
--- a/napture/src/b9/html.rs
+++ b/napture/src/b9/html.rs
@@ -1,6 +1,6 @@
 extern crate html_parser;
 
-use crate::{lualog, Tab};
+use crate::{lualog, Tab, globals::LUA_TIMEOUTS};
 
 use super::{
     css::{self, Styleable},
@@ -83,6 +83,13 @@ pub async fn build_ui(
 
     css::reset_css();
 
+    {
+        let mut timeouts = LUA_TIMEOUTS.lock().unwrap();
+        for timeout in timeouts.drain(..) { 
+            timeout.destroy();
+        }
+    }
+
     let tags = Rc::new(RefCell::new(Vec::new()));
 
     let html_view = gtk::Box::builder()
diff --git a/napture/src/b9/lua.rs b/napture/src/b9/lua.rs
index bd58f38a..315c2a17 100644
--- a/napture/src/b9/lua.rs
+++ b/napture/src/b9/lua.rs
@@ -13,7 +13,9 @@ use mlua::{Lua, LuaSerdeExt, OwnedFunction, Value};
 use reqwest::header::{HeaderMap, HeaderName, HeaderValue};
 use serde_json::Map;
 
-use crate::lualog;
+use crate::{lualog, globals::LUA_TIMEOUTS};
+use glib::translate::FromGlib;
+use glib::SourceId;
 
 pub trait Luable: Styleable {
     fn get_css_name(&self) -> String;
@@ -27,6 +29,7 @@ pub trait Luable: Styleable {
     fn set_href_(&self, href: String);
     fn set_opacity_(&self, amount: f64);
     fn set_source_(&self, source: String);
+    fn set_visible_(&self, visible: bool);
 
     fn _on_click(&self, func: &LuaOwnedFunction);
     fn _on_submit(&self, func: &LuaOwnedFunction);
@@ -39,13 +42,37 @@ pub trait Luable: Styleable {
 //     Ok(())
 // }
 
-fn set_timeout(_lua: &Lua, func: LuaOwnedFunction, ms: u64) -> LuaResult<()> {
-    glib::spawn_future_local(async move {
-        glib::timeout_future(std::time::Duration::from_millis(ms)).await;
-        if let Err(e) = func.call::<_, ()>(()) {
-            lualog!("error", format!("error calling function in set_timeout: {}", e));
+fn set_timeout(_lua: &Lua, func: LuaOwnedFunction, ms: u64) -> LuaResult<i32> {
+    if let Ok(mut timeouts) = LUA_TIMEOUTS.lock() {
+        if ms == 0 {
+            if let Err(e) = func.call::<_, ()>(()) {
+                lualog!("error", format!("error calling function in set_timeout: {}", e));
+            }
+            return Ok(-1);
+        } else {
+            let handle = glib::spawn_future_local(async move {
+                glib::timeout_future(std::time::Duration::from_millis(ms)).await;
+                if let Err(e) = func.call::<_, ()>(()) {
+                    lualog!("error", format!("error calling function in set_timeout: {}", e));
+                }
+            });
+            timeouts.push(handle.source().clone());
+            if let Some(id) = handle.as_raw_source_id() {
+                return Ok(id as i32);
+            } else { return Ok(-1); }
+        }
+    }
+    Err(LuaError::runtime("couldn't create timeout"))
+}
+
+pub(crate) fn clear_timeout(id: i32) -> LuaResult<()> {
+    if id > 0 {
+        let id = unsafe {SourceId::from_glib(id.try_into().unwrap())};
+        if let Some(source) = glib::MainContext::default()
+             .find_source_by_id(&id) {
+            source.destroy();
         }
-    });
+    }
     Ok(())
 }
 
@@ -74,6 +101,7 @@ fn get(
             let tags9 = Rc::clone(&tags);
             let tags10 = Rc::clone(&tags);
             let tags11 = Rc::clone(&tags);
+            let tags12 = Rc::clone(&tags);
 
             let table = lua.create_table()?;
 
@@ -161,6 +189,13 @@ fn get(
                     Ok(ok)
                 })?,
             )?;
+            table.set(
+                "set_visible",
+                lua.create_function(move |_, visible: bool| {
+                    let ok = tags12.borrow()[i].widget.set_visible_(visible);
+                    Ok(ok)
+                })?,
+            )?;
 
             if multi {
                 global_table.set(i2, table)?;
@@ -327,6 +362,12 @@ pub(crate) async fn run(luacode: String, tags: Rc<RefCell<Vec<Tag>>>, taburl: St
            set_timeout(lua, func, ms)
         })?
     )?;
+    globals.set(
+        "clear_timeout",
+        lua.create_function(move |_lua, id: i32| {
+           clear_timeout(id)
+        })?
+    )?;
     globals.set("fetch", fetchtest)?;
     globals.set("window", window_table)?;
 
@@ -386,6 +427,9 @@ impl Luable for gtk::Label {
             "This component do not support the \"set_source\" method. Are you perhaps looking for the \"img\" tag?"
         );
     }
+    fn set_visible_(&self, visible: bool) {
+        self.set_visible(visible);
+    }
     fn get_opacity_(&self) -> f64 {
         self.opacity()
     }
@@ -460,6 +504,9 @@ impl Luable for gtk::DropDown {
             "This component do not support the \"set_source\" method. Are you perhaps looking for the \"img\" tag?"
         );
     }
+    fn set_visible_(&self, visible: bool) {
+        self.set_visible(visible);
+    }
     fn get_opacity_(&self) -> f64 {
         self.opacity()
     }
@@ -537,6 +584,9 @@ impl Luable for gtk::LinkButton {
             "This component do not support the \"set_source\" method. Are you perhaps looking for the \"img\" tag?"
         );
     }
+    fn set_visible_(&self, visible: bool) {
+        self.set_visible(visible);
+    }
     fn set_contents_(&self, contents: String) {
         self.set_label(&contents);
         self.style();
@@ -599,6 +649,9 @@ impl Luable for gtk::Box {
         );
         "".to_string()
     }
+    fn set_visible_(&self, visible: bool) {
+        self.set_visible(visible);
+    }
     fn set_source_(&self, _: String) {
         lualog!(
             "warning",
@@ -674,6 +727,9 @@ impl Luable for gtk::TextView {
     fn set_contents_(&self, contents: String) {
         self.buffer().set_text(&contents);
     }
+    fn set_visible_(&self, visible: bool) {
+        self.set_visible(visible);
+    }
     fn get_source_(&self) -> String {
         lualog!(
             "warning",
@@ -759,6 +815,9 @@ impl Luable for gtk::Separator {
         );
         "".to_string()
     }
+    fn set_visible_(&self, visible: bool) {
+        self.set_visible(visible);
+    }
     fn set_source_(&self, _: String) {
         lualog!(
             "warning",
@@ -827,6 +886,9 @@ impl Luable for gtk::Picture {
             "\"img\" component does not support the \"set_content\" method."
         );
     }
+    fn set_visible_(&self, visible: bool) {
+        self.set_visible(visible);
+    }
     fn get_source_(&self) -> String {
         self.alternative_text().unwrap_or(GString::new()).to_string()
     }
@@ -911,6 +973,9 @@ impl Luable for gtk::Entry {
             "This component do not support the \"set_source\" method. Are you perhaps looking for the \"img\" tag?"
         );
     }
+    fn set_visible_(&self, visible: bool) {
+        self.set_visible(visible);
+    }
     fn set_contents_(&self, contents: String) {
         self.buffer().set_text(contents);
     }
@@ -983,6 +1048,9 @@ impl Luable for gtk::Button {
     fn set_contents_(&self, contents: String) {
         self.set_label(&contents);
     }
+    fn set_visible_(&self, visible: bool) {
+        self.set_visible(visible);
+    }
     fn get_source_(&self) -> String {
         lualog!(
             "warning",
diff --git a/napture/src/globals.rs b/napture/src/globals.rs
index d60ddf35..2d3e32fd 100644
--- a/napture/src/globals.rs
+++ b/napture/src/globals.rs
@@ -1,8 +1,10 @@
-use std::sync::Mutex;
+use std::sync::{Mutex, Arc};
+use glib::Source;
 
 use lazy_static::lazy_static;
 
 lazy_static! {
     pub static ref LUA_LOGS: Mutex<String> = Mutex::new(String::new());
     pub static ref DNS_SERVER: Mutex<String> = Mutex::new(String::from("api.buss.lol"));
-}
\ No newline at end of file
+    pub static ref LUA_TIMEOUTS: Arc<Mutex<Vec<Source>>> = Arc::new(Mutex::new(Vec::new()));
+}
diff --git a/napture/src/main.rs b/napture/src/main.rs
index 9ee35bed..70c13884 100644
--- a/napture/src/main.rs
+++ b/napture/src/main.rs
@@ -51,6 +51,7 @@ use glib::Object;
 
 use globals::LUA_LOGS;
 use globals::DNS_SERVER;
+use globals::LUA_TIMEOUTS;
 use gtk::gdk;
 use gtk::gdk::Display;
 use gtk::gio;
@@ -319,6 +320,14 @@ fn build_ui(app: &adw::Application, args: Rc<RefCell<Vec<String>>>) {
             rc_search
         );
     });
+
+    glib::source::timeout_add_local(std::time::Duration::from_millis(5000), move || { // every 5 seconds remove "stale" timeouts
+        let mut timeouts = LUA_TIMEOUTS.lock().unwrap();
+        timeouts.retain(|source| {
+            !source.is_destroyed()
+        });
+        glib::ControlFlow::Continue
+    });
 }
 
 // commented code here was an attempt at implementing multiple tabs.

From 5a804026541025fc5ade9f8b7cf18979815505de Mon Sep 17 00:00:00 2001
From: GStudiosX2 <ramazanogutlu0@gmail.com>
Date: Mon, 3 Jun 2024 08:57:40 +0100
Subject: [PATCH 07/12] fix cli not displaying what you put in searchbar

---
 napture/Cargo.lock     |  2 +-
 napture/Cargo.toml     |  4 ++--
 napture/src/b9/lua.rs  |  2 +-
 napture/src/imp/mod.rs |  4 ++--
 napture/src/main.rs    | 18 ++++++++----------
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/napture/Cargo.lock b/napture/Cargo.lock
index dda0e3c0..b9c88e53 100644
--- a/napture/Cargo.lock
+++ b/napture/Cargo.lock
@@ -947,7 +947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
diff --git a/napture/Cargo.toml b/napture/Cargo.toml
index fe3fb8d0..cfa4a778 100644
--- a/napture/Cargo.toml
+++ b/napture/Cargo.toml
@@ -6,10 +6,10 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-adw = { version = "0.6.0", package = "libadwaita", features = ["v1_4"] }
+adw = { version = "0.6.0", package = "libadwaita", features = ["v1_5"] }
 chrono = "0.4.38"
 glib = "0.19.4"
-gtk = { version = "0.8.1", package = "gtk4", features = ["v4_12"] }
+gtk = { version = "0.8.1", package = "gtk4", features = ["v4_14"] }
 html_parser = "0.7.0"
 lazy_static = "1.4.0"
 mlua = { version = "0.9.7", features = ["luau", "macros", "async", "unstable", "serialize"] }
diff --git a/napture/src/b9/lua.rs b/napture/src/b9/lua.rs
index 315c2a17..38c94470 100644
--- a/napture/src/b9/lua.rs
+++ b/napture/src/b9/lua.rs
@@ -8,7 +8,7 @@ use glib::GString;
 use gtk::prelude::*;
 use mlua::{prelude::*, StdLib};
 
-use mlua::{Lua, LuaSerdeExt, OwnedFunction, Value};
+use mlua::{OwnedFunction, Value};
 
 use reqwest::header::{HeaderMap, HeaderName, HeaderValue};
 use serde_json::Map;
diff --git a/napture/src/imp/mod.rs b/napture/src/imp/mod.rs
index f345f7b2..32cdbd4d 100644
--- a/napture/src/imp/mod.rs
+++ b/napture/src/imp/mod.rs
@@ -1,6 +1,6 @@
 use gio::Settings;
 use gtk::subclass::prelude::*;
-use gtk::{gio, glib, ApplicationWindow};
+use gtk::{gio, ApplicationWindow};
 use std::cell::OnceCell;
 
 // ANCHOR: imp
@@ -29,4 +29,4 @@ impl WindowImpl for Window {
         glib::Propagation::Proceed
     }
 }
-impl ApplicationWindowImpl for Window {}
\ No newline at end of file
+impl ApplicationWindowImpl for Window {}
diff --git a/napture/src/main.rs b/napture/src/main.rs
index 70c13884..76ba8af3 100644
--- a/napture/src/main.rs
+++ b/napture/src/main.rs
@@ -58,7 +58,6 @@ use gtk::gio;
 use gtk::CssProvider;
 use serde::Deserialize;
 
-use gtk::glib;
 use gtk::prelude::*;
 
 const APP_ID: &str = "io.github.face_hh.Napture";
@@ -163,10 +162,14 @@ fn handle_search_update(
 }
 
 fn build_ui(app: &adw::Application, args: Rc<RefCell<Vec<String>>>) {
-    let default_dns_url = fetch_dns(DEFAULT_URL.to_string());
+    let default_url = if let Some(dev_build) = args.borrow().get(1) { // cli
+        dev_build.to_string()
+    } else { DEFAULT_URL.to_string() };
+
+    let default_dns_url = fetch_dns(default_url.clone());
 
     let default_tab_url = if default_dns_url.is_empty() {
-        DEFAULT_URL.to_string()
+        default_url.clone()
     } else {
         default_dns_url
     };
@@ -180,14 +183,14 @@ fn build_ui(app: &adw::Application, args: Rc<RefCell<Vec<String>>>) {
     let search = gtk::SearchEntry::builder()
         .css_name("search")
         .width_request(500)
-        .text(DEFAULT_URL)
+        .text(default_url.clone())
         .build();
     let empty_label = gtk::Label::new(Some(""));
     let headerbar = gtk::HeaderBar::builder().build();
 
     let tabs_widget = gtk::Box::builder().css_name("tabs").spacing(6).build();
 
-    let mut tab1 = make_tab(
+    let tab1 = make_tab(
         // tabs_widget.clone(),
         "New Tab",
         "file.png",
@@ -220,11 +223,6 @@ fn build_ui(app: &adw::Application, args: Rc<RefCell<Vec<String>>>) {
     let rc_tab = Rc::new(RefCell::new(current_tab.clone()));
     let rc_search = Rc::new(RefCell::new(search.clone()));
 
-    // CLI command
-    if let Some(dev_build) = args.borrow().get(1) {
-        tab1.url = dev_build.to_string();
-    }
-
     let app_ = Rc::new(RefCell::new(app.clone()));
 
     let event_controller = gtk::EventControllerKey::new();

From ddb9deb8895728c9e7f5b14d58ef09383197df0b Mon Sep 17 00:00:00 2001
From: GStudiosX2 <ramazanogutlu0@gmail.com>
Date: Mon, 3 Jun 2024 10:06:45 +0100
Subject: [PATCH 08/12] feat: base64 images

---
 napture/Cargo.lock                      |  1 +
 napture/Cargo.toml                      |  1 +
 napture/examples/set_timeout/index.html |  1 +
 napture/src/b9/html.rs                  | 49 +++++++++++++++++--------
 4 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/napture/Cargo.lock b/napture/Cargo.lock
index b9c88e53..d0c8a56b 100644
--- a/napture/Cargo.lock
+++ b/napture/Cargo.lock
@@ -2060,6 +2060,7 @@ dependencies = [
 name = "webx"
 version = "1.2.2"
 dependencies = [
+ "base64",
  "chrono",
  "glib",
  "glib-build-tools",
diff --git a/napture/Cargo.toml b/napture/Cargo.toml
index cfa4a778..534e0bdc 100644
--- a/napture/Cargo.toml
+++ b/napture/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 
 [dependencies]
 adw = { version = "0.6.0", package = "libadwaita", features = ["v1_5"] }
+base64 = "0.22.1"
 chrono = "0.4.38"
 glib = "0.19.4"
 gtk = { version = "0.8.1", package = "gtk4", features = ["v4_14"] }
diff --git a/napture/examples/set_timeout/index.html b/napture/examples/set_timeout/index.html
index f2bcee7b..f14a7574 100644
--- a/napture/examples/set_timeout/index.html
+++ b/napture/examples/set_timeout/index.html
@@ -12,5 +12,6 @@
     <button class="timeout_btn3">Test Timeout Cancel</button>
     <button class="reset_btn">Reset</button>
   </div>
+  <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAEZ0lEQVR4nLzW+VeUVRwG8IFmtGHNIjYpERIGXJJAWVJkV1CgYgk9YbEctlKW4ohUg4iUCqfMUpZYtSSEkc0xaBWcUacZUUOIg4h4iDwD1AlCj0Rhz9P/4OsPn3uOZ96X+9z3e7/3igtmTotEostZO6E86GUovd4LRYYvga1RHtAhbhtcvXka3ol4AnrUd8CBskvwaEg8LDHZAGN2JMPcoVj4sfXjfI3oEf8T54puYwhdOAiVFVlw37QvDE4Jg77JD2HdXhc4oZiDqgEL+LNPLXxzsSvzyfii031Mn6Fn+rPmF6GkKk2IBAa7px5gmD/QDodtPoKBq0fgvwfMYM6pfdDxreNQm3WBkRMksFDkB/vD+FV82zXQLbwHRrcoYPMgf+9Xu1+QBFJtMYaUllPQq49rrU7kLLZd4momWabCxKKN8MREJFzexhzrAvQwvZkzbUmLgJKFTD41y/ppUkXB9mw3QRLEqCYwLFY3wzDTF/hfNZz7uYv8Kklz78MHX3LWBbZ/weOmrLFKPUsnNoW1F6zxh2eGj8G2b9bAjsM/QGnplCAJvj7zAYZNI+FMYG8M3VrOwiVpjZzRJzbwl3quslKxHDrfYg5xZA4MvMlvtmrsdei0kbVfd0PLN0j5yxUBZoIkmFvJby0few6GlgXBisk6/mVP1syuTu7tzeP8Tn8E9sMjHUMwYLAVGhU1wFIX1rs8mf0qJ74E/rnjOvzOuVuQBCOLqjGEV1tR7z2wJC8bPnmVO9Z28ggsr/OGdh6ckaUPu6nmPvd8tsU6qOwthYU9rLejr3rBedkAPHjSQYgE4hve7hicTnLFDS1ZUbuW7qYjfXC62xY61HPWNQ3s+8PeTbBZ4wg/M7wGxxtVUN7OuarG8vlsJjOpw3RCJDCojnTCcKGB3aPRKwZqtvwEZc+wZkK0BjDKnDvZ2WIRHLVPhO7GV+B7es7dMfV5Ec9Bvk6vewOuX8be5ffjJiESiMNT7mPo+twSXjHk14/VsYdoQjrhXVN7eEjKHZ5qwc66IfkE5zW4Es408SS4uZ5rXRtQDpfpXuRT8i3M0bZUkAT30kcxrHnIlbUe46mwtioFtrbxluBa8yxUZjFBzH6eWWbG/++Gd7nKqXl8Ra7Rt1DhJobh1r9Cya1VfE9QpyAJenxZ15q17J1fqWehYzfvCuNe30OTq+lwsKyGM5WEwKr6V6A0aB5q83lrGipeAfMjuNvHz6uhf/Hv8DGXDEES6D0PYwiUsSPeUSTAPB0zuWayIyXMcA//NsW97WPMO2CH/xL4qacddLldBCvdK+DssQUY/xTPRPOuLhhnbiJIgrhrvINahfJEM4pmR8rdvhfumWRdlTt8CO/Gcp8X2nFlR334m/NWPL/6ley4GfUzUCZn3zXJD4Y7e+9BY0W0EAkMamfZtf+OZ43LbKTwnad55+kp5d6+/NokbDXlar4tYc+RF3DW/yTwJrFdx9t1UlISPJTAOlRFVMKtbuxmX1idEyLBfwEAAP//iEpq+Fivm94AAAAASUVORK5CYII=" />
 </body>
 </html>
diff --git a/napture/src/b9/html.rs b/napture/src/b9/html.rs
index e78e08a8..38ddc556 100644
--- a/napture/src/b9/html.rs
+++ b/napture/src/b9/html.rs
@@ -734,21 +734,40 @@ fn render_list(
 }
 
 pub(crate) fn fetch_image_to_pixbuf(url: String) -> Result<gdk_pixbuf::Pixbuf> {
-    let handle = thread::spawn(move || {
-        reqwest::blocking::get(url)
-            .map_err(|e| e.to_string())
-            .and_then(|res| res.bytes().map_err(|e| e.to_string()))
-            .unwrap_or_else(|e| {
-                lualog!("error", format!("Failed to fetch image: {}", e));
-                Vec::new().into()
-            })
-    });
-
-    let img_data = match handle.join() {
-        Ok(data) => data,
-        Err(_) => {
-            lualog!("error", "Failed to join fetch_image_to_pixbuf thread.");
-            Vec::new().into()
+    let img_data: Vec<u8> = if url.starts_with("data:") {
+        let (_, data) = url.split_once("data:").unwrap();
+        let (mime, data) = data.split_once(",").unwrap_or(("", ""));
+        let properties = mime.split(";").collect::<String>();
+
+        if properties.contains("base64") {
+            use base64::prelude::*;
+            match BASE64_STANDARD.decode(data) {
+                Ok(data) => data,
+                Err(e) => {
+                    lualog!("error", format!("invalid base64: {}", e));
+                    Vec::new()
+                }
+            }
+        } else {
+            Vec::new()
+        }
+    } else {
+        let handle = thread::spawn(move || {
+            reqwest::blocking::get(url)
+                .map_err(|e| e.to_string())
+                .and_then(|res| res.bytes().map_err(|e| e.to_string()))
+                .unwrap_or_else(|e| {
+                    lualog!("error", format!("Failed to fetch image: {}", e));
+                    Vec::new().into()
+                })
+        });
+
+        match handle.join() {
+            Ok(data) => data.to_vec(),
+            Err(_) => {
+                lualog!("error", "Failed to join fetch_image_to_pixbuf thread.");
+                Vec::new()
+            }
         }
     };
 

From ff9c44108d55a74ed651b86938249b2f196d907c Mon Sep 17 00:00:00 2001
From: GStudiosX2 <ramazanogutlu0@gmail.com>
Date: Mon, 3 Jun 2024 17:17:30 +0100
Subject: [PATCH 09/12] feat: allow /<page>.html and /<file>.<type> (can only
 view text files html will display as html)

---
 napture/Cargo.lock                      | 16 ++++++++
 napture/Cargo.toml                      |  1 +
 napture/examples/set_timeout/index.html |  2 +-
 napture/src/b9/html.rs                  | 50 ++++++++++++++++++-------
 4 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/napture/Cargo.lock b/napture/Cargo.lock
index 7e8b99d6..88fb292e 100644
--- a/napture/Cargo.lock
+++ b/napture/Cargo.lock
@@ -732,6 +732,15 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
+[[package]]
+name = "html-escape"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476"
+dependencies = [
+ "utf8-width",
+]
+
 [[package]]
 name = "html_parser"
 version = "0.7.0"
@@ -1985,6 +1994,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "utf8-width"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
+
 [[package]]
 name = "uuid"
 version = "1.8.0"
@@ -2114,6 +2129,7 @@ dependencies = [
  "glib",
  "glib-build-tools",
  "gtk4",
+ "html-escape",
  "html_parser",
  "lazy_static",
  "libadwaita",
diff --git a/napture/Cargo.toml b/napture/Cargo.toml
index b3f7bdd4..9da098b7 100644
--- a/napture/Cargo.toml
+++ b/napture/Cargo.toml
@@ -12,6 +12,7 @@ chrono = "0.4.38"
 directories = "5.0.1"
 glib = "0.19.4"
 gtk = { version = "0.8.1", package = "gtk4", features = ["v4_14"] }
+html-escape = "0.2.13"
 html_parser = "0.7.0"
 lazy_static = "1.4.0"
 mlua = { version = "0.9.7", features = ["luau", "macros", "async", "unstable", "serialize"] }
diff --git a/napture/examples/set_timeout/index.html b/napture/examples/set_timeout/index.html
index f14a7574..6cd2391a 100644
--- a/napture/examples/set_timeout/index.html
+++ b/napture/examples/set_timeout/index.html
@@ -12,6 +12,6 @@
     <button class="timeout_btn3">Test Timeout Cancel</button>
     <button class="reset_btn">Reset</button>
   </div>
-  <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAEZ0lEQVR4nLzW+VeUVRwG8IFmtGHNIjYpERIGXJJAWVJkV1CgYgk9YbEctlKW4ohUg4iUCqfMUpZYtSSEkc0xaBWcUacZUUOIg4h4iDwD1AlCj0Rhz9P/4OsPn3uOZ96X+9z3e7/3igtmTotEostZO6E86GUovd4LRYYvga1RHtAhbhtcvXka3ol4AnrUd8CBskvwaEg8LDHZAGN2JMPcoVj4sfXjfI3oEf8T54puYwhdOAiVFVlw37QvDE4Jg77JD2HdXhc4oZiDqgEL+LNPLXxzsSvzyfii031Mn6Fn+rPmF6GkKk2IBAa7px5gmD/QDodtPoKBq0fgvwfMYM6pfdDxreNQm3WBkRMksFDkB/vD+FV82zXQLbwHRrcoYPMgf+9Xu1+QBFJtMYaUllPQq49rrU7kLLZd4momWabCxKKN8MREJFzexhzrAvQwvZkzbUmLgJKFTD41y/ppUkXB9mw3QRLEqCYwLFY3wzDTF/hfNZz7uYv8Kklz78MHX3LWBbZ/weOmrLFKPUsnNoW1F6zxh2eGj8G2b9bAjsM/QGnplCAJvj7zAYZNI+FMYG8M3VrOwiVpjZzRJzbwl3quslKxHDrfYg5xZA4MvMlvtmrsdei0kbVfd0PLN0j5yxUBZoIkmFvJby0few6GlgXBisk6/mVP1syuTu7tzeP8Tn8E9sMjHUMwYLAVGhU1wFIX1rs8mf0qJ74E/rnjOvzOuVuQBCOLqjGEV1tR7z2wJC8bPnmVO9Z28ggsr/OGdh6ckaUPu6nmPvd8tsU6qOwthYU9rLejr3rBedkAPHjSQYgE4hve7hicTnLFDS1ZUbuW7qYjfXC62xY61HPWNQ3s+8PeTbBZ4wg/M7wGxxtVUN7OuarG8vlsJjOpw3RCJDCojnTCcKGB3aPRKwZqtvwEZc+wZkK0BjDKnDvZ2WIRHLVPhO7GV+B7es7dMfV5Ec9Bvk6vewOuX8be5ffjJiESiMNT7mPo+twSXjHk14/VsYdoQjrhXVN7eEjKHZ5qwc66IfkE5zW4Es408SS4uZ5rXRtQDpfpXuRT8i3M0bZUkAT30kcxrHnIlbUe46mwtioFtrbxluBa8yxUZjFBzH6eWWbG/++Gd7nKqXl8Ra7Rt1DhJobh1r9Cya1VfE9QpyAJenxZ15q17J1fqWehYzfvCuNe30OTq+lwsKyGM5WEwKr6V6A0aB5q83lrGipeAfMjuNvHz6uhf/Hv8DGXDEES6D0PYwiUsSPeUSTAPB0zuWayIyXMcA//NsW97WPMO2CH/xL4qacddLldBCvdK+DssQUY/xTPRPOuLhhnbiJIgrhrvINahfJEM4pmR8rdvhfumWRdlTt8CO/Gcp8X2nFlR334m/NWPL/6ley4GfUzUCZn3zXJD4Y7e+9BY0W0EAkMamfZtf+OZ43LbKTwnad55+kp5d6+/NokbDXlar4tYc+RF3DW/yTwJrFdx9t1UlISPJTAOlRFVMKtbuxmX1idEyLBfwEAAP//iEpq+Fivm94AAAAASUVORK5CYII=" />
+  <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAIAAADTED8xAAADMElEQVR4nOzVwQnAIBQFQYXff81RUkQCOyDj1YOPnbXWPmeTRef+/3O/OyBjzh3CD95BfqICMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMK0CMO0TAAD//2Anhf4QtqobAAAAAElFTkSuQmCC" />
 </body>
 </html>
diff --git a/napture/src/b9/html.rs b/napture/src/b9/html.rs
index 38ddc556..3bc3b995 100644
--- a/napture/src/b9/html.rs
+++ b/napture/src/b9/html.rs
@@ -21,16 +21,40 @@ pub(crate) struct Tag {
     pub tied_variables: Vec<String>,
 }
 
+fn decode_html_entities<T: AsRef<str>>(s: T) -> String {
+    use html_escape::decode_html_entities;
+    decode_html_entities(s.as_ref()).to_string()
+}
+
 async fn parse_html(mut url: String) -> Result<(Node, Node)> {
+    let mut is_html = true;
+    let mut file_name = String::new();
+
     if let Ok(mut uri) = Url::parse(&url) {
+       let last_seg = {
+           uri.path_segments()
+               .map(|seg| seg.last().unwrap_or(""))
+               .unwrap_or("").to_string()
+       };
        if let Ok(mut segments) = uri.path_segments_mut() {
-           segments.pop_if_empty();
-           segments.push("index.html");
+           if !last_seg.contains(".") {
+               segments.pop_if_empty();
+               segments.push("index.html");
+           } else {
+               if !last_seg.ends_with(".html") {
+                   is_html = false;
+               }
+           }
+           file_name += &last_seg;
        }
        url = uri.into();
     }
 
-    let html = fetch_file(url).await;
+    let mut html = fetch_file(url).await;
+
+    if !is_html {
+        html = format!("<html><head>{}</head><body><p>{}</p></body></html>", file_name, html_escape::encode_double_quoted_attribute(&html));
+    }
 
     let dom = match !html.is_empty() {
         true => Dom::parse(&html),
@@ -230,7 +254,7 @@ async fn render_head(element: &Element, contents: Option<&Node>, tab: Rc<RefCell
             if let Some(contents) = contents {
                 tab.borrow()
                     .label_widget
-                    .set_label(contents.text().unwrap_or(""))
+                    .set_label(&decode_html_entities(contents.text().unwrap_or("")))
             }
         }
         "link" => {
@@ -536,16 +560,16 @@ fn render_html(
                     if el.name.as_str() == "option" {
                         // TODO: keep track of value
                         if let Some(node) = el.children.first() {
-                            strings.push(node.text().unwrap_or(""))
+                            strings.push(decode_html_entities(node.text().unwrap_or("")))
                         } else {
-                            strings.push("")
+                            strings.push("".to_string())
                         }
                     }
                 }
             }
 
             let dropdown = gtk::DropDown::builder()
-                .model(&gtk::StringList::new(&strings[..]))
+                .model(&gtk::StringList::new(&strings.iter().map(|s| &**s).collect::<Vec<&str>>()))
                 .css_name("select")
                 .css_classes(element.classes.clone())
                 .halign(gtk::Align::Start)
@@ -574,7 +598,7 @@ fn render_html(
 
             textview
                 .buffer()
-                .set_text(element.children.first().unwrap_or(&Node::Text(String::new())).text().unwrap_or(""));
+                .set_text(&decode_html_entities(element.children.first().unwrap_or(&Node::Text(String::new())).text().unwrap_or("")));
 
             html_view.append(&textview);
 
@@ -587,12 +611,12 @@ fn render_html(
         "button" => {
             let button = gtk::Button::builder()
                 .label(
-                    element
+                    &decode_html_entities(element
                         .children
                         .first()
                         .unwrap_or(&Node::Text("".to_owned()))
                         .text()
-                        .unwrap_or(""),
+                        .unwrap_or("")),
                 )
                 .css_name("button")
                 .css_classes(element.classes.clone())
@@ -635,7 +659,7 @@ fn render_a(
     };
 
     let link_button = gtk::LinkButton::builder()
-        .label(el.children.first().unwrap_or(&Node::Text(String::new())).text().unwrap_or(""))
+        .label(&decode_html_entities(el.children.first().unwrap_or(&Node::Text(String::new())).text().unwrap_or("")))
         .uri(uri)
         .css_name("a")
         .css_classes(el.classes.clone())
@@ -703,7 +727,7 @@ fn render_list(
                         .build();
 
                     let label = gtk::Label::builder()
-                        .label(el.children.first().unwrap_or(&Node::Text(String::new())).text().unwrap_or(""))
+                        .label(&decode_html_entities(el.children.first().unwrap_or(&Node::Text(String::new())).text().unwrap_or("")))
                         .css_name("li")
                         .css_classes(el.classes.clone())
                         .halign(gtk::Align::Start)
@@ -887,7 +911,7 @@ async fn fetch_from_github(url: String) -> String {
 
 fn render_p(child: &Node, element: &Element, label_box: &gtk::Box, css: &mut String, tags: &Rc<RefCell<Vec<Tag>>>){
     let label = gtk::Label::builder()
-        .label(child.text().unwrap_or(""))
+        .label(&decode_html_entities(child.text().unwrap_or("")))
         .css_name(element.name.as_str())
         .css_classes(element.classes.clone())
         .halign(gtk::Align::Start)

From 7395f4e69ab0955d39d372a7645ed65eed08e0a2 Mon Sep 17 00:00:00 2001
From: GStudiosX2 <ramazanogutlu0@gmail.com>
Date: Tue, 4 Jun 2024 10:26:17 +0100
Subject: [PATCH 10/12] should fix a issue i caused for windows users

---
 napture/src/b9/html.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/napture/src/b9/html.rs b/napture/src/b9/html.rs
index 3bc3b995..66e9247b 100644
--- a/napture/src/b9/html.rs
+++ b/napture/src/b9/html.rs
@@ -809,7 +809,9 @@ async fn fetch_file(url: String) -> String {
     println!("Attempting to navigate to {url}...");
 
     if url.starts_with("file://") {
-        let path = url.replace("file://", "");
+        let path = url
+            .replace("file://", "")
+            .replace("/", std::path::MAIN_SEPARATOR_STR); // translate / to system path seperator
         
         match fs::read_to_string(&format!("{}", path)) {
             Ok(text) => text,

From 99a39e1d56c15044d33a9b1faad0ee69b201f3f1 Mon Sep 17 00:00:00 2001
From: Face <69168154+face-hh@users.noreply.github.com>
Date: Tue, 4 Jun 2024 17:25:28 +0300
Subject: [PATCH 11/12] temporary fix

---
 napture/src/b9/html.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/napture/src/b9/html.rs b/napture/src/b9/html.rs
index 66e9247b..e40b2300 100644
--- a/napture/src/b9/html.rs
+++ b/napture/src/b9/html.rs
@@ -810,9 +810,11 @@ async fn fetch_file(url: String) -> String {
 
     if url.starts_with("file://") {
         let path = url
-            .replace("file://", "")
-            .replace("/", std::path::MAIN_SEPARATOR_STR); // translate / to system path seperator
+            .replace("file:///", "")
+            .replace("file://", "");
         
+        println!("{path}");
+
         match fs::read_to_string(&format!("{}", path)) {
             Ok(text) => text,
             Err(_) => {

From b4302ce87016057208a4079e5ce59f46494c37a6 Mon Sep 17 00:00:00 2001
From: Face <69168154+face-hh@users.noreply.github.com>
Date: Tue, 4 Jun 2024 17:49:27 +0300
Subject: [PATCH 12/12] add timeout example

---
 napture/test/script.lua | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/napture/test/script.lua b/napture/test/script.lua
index 22e32eee..4311fa61 100644
--- a/napture/test/script.lua
+++ b/napture/test/script.lua
@@ -4,6 +4,10 @@ print(btn.get_content())
 btn.set_content("Hello, World!")
 print(btn.get_content())
 
+local ok = set_timeout(function()
+	btn.set_content("ok")
+end, 5000)
+
 btn.on_click(function()
     print("clicked!")
 end)
