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/Cargo.lock b/napture/Cargo.lock
index 653cfad3..88fb292e 100644
--- a/napture/Cargo.lock
+++ b/napture/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
dependencies = [
"gimli",
]
@@ -42,22 +42,22 @@ dependencies = [
]
[[package]]
-name = "anyhow"
-version = "1.0.82"
+name = "atomic-waker"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]]
name = "backtrace"
-version = "0.3.71"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
dependencies = [
"addr2line",
"cc",
@@ -143,9 +143,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.94"
+version = "1.0.98"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
+checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
[[package]]
name = "cfg-expr"
@@ -251,9 +251,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]]
name = "either"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
[[package]]
name = "encoding_rs"
@@ -272,18 +272,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "erased-serde"
-version = "0.4.2"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
dependencies = [
"serde",
+ "typeid",
]
[[package]]
name = "errno"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
dependencies = [
"libc",
"windows-sys 0.52.0",
@@ -291,9 +292,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.0.2"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
[[package]]
name = "field-offset"
@@ -376,7 +377,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.58",
+ "syn 2.0.66",
]
[[package]]
@@ -422,9 +423,9 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.19.0"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96"
+checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f"
dependencies = [
"gio-sys",
"glib-sys",
@@ -435,9 +436,9 @@ dependencies = [
[[package]]
name = "gdk4"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b"
+checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07"
dependencies = [
"cairo-rs",
"gdk-pixbuf",
@@ -450,9 +451,9 @@ dependencies = [
[[package]]
name = "gdk4-sys"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626"
+checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -477,9 +478,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
"libc",
@@ -488,15 +489,15 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
[[package]]
name = "gio"
-version = "0.19.4"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f91a0518c2ec539f099d3f945ab2d6a83ec372a9ef40a21906343b191182845"
+checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7"
dependencies = [
"futures-channel",
"futures-core",
@@ -512,9 +513,9 @@ dependencies = [
[[package]]
name = "gio-sys"
-version = "0.19.0"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4"
+checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -525,9 +526,9 @@ dependencies = [
[[package]]
name = "glib"
-version = "0.19.4"
+version = "0.19.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1407b2ce171e654720be10d57d4054d3ff2f10a13d5b37e6819b41439832f7"
+checksum = "e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490"
dependencies = [
"bitflags 2.5.0",
"futures-channel",
@@ -556,22 +557,22 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.19.4"
+version = "0.19.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bba315e8ce8aa59631545358450f4962557e89b5f7db7442e7153b47037f71"
+checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e"
dependencies = [
"heck",
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.58",
+ "syn 2.0.66",
]
[[package]]
name = "glib-sys"
-version = "0.19.0"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4"
+checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282"
dependencies = [
"libc",
"system-deps",
@@ -579,9 +580,9 @@ dependencies = [
[[package]]
name = "gobject-sys"
-version = "0.19.0"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979"
+checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b"
dependencies = [
"glib-sys",
"libc",
@@ -601,9 +602,9 @@ dependencies = [
[[package]]
name = "graphene-sys"
-version = "0.19.0"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0"
+checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d"
dependencies = [
"glib-sys",
"libc",
@@ -613,9 +614,9 @@ dependencies = [
[[package]]
name = "gsk4"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e"
+checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be"
dependencies = [
"cairo-rs",
"gdk4",
@@ -628,9 +629,9 @@ dependencies = [
[[package]]
name = "gsk4-sys"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738"
+checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -644,9 +645,9 @@ dependencies = [
[[package]]
name = "gtk4"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83"
+checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab"
dependencies = [
"cairo-rs",
"field-offset",
@@ -665,23 +666,21 @@ dependencies = [
[[package]]
name = "gtk4-macros"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567"
+checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408"
dependencies = [
- "anyhow",
"proc-macro-crate",
- "proc-macro-error",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.66",
]
[[package]]
name = "gtk4-sys"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18"
+checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -698,15 +697,15 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
dependencies = [
+ "atomic-waker",
"bytes",
"fnv",
"futures-core",
"futures-sink",
- "futures-util",
"http",
"indexmap",
"slab",
@@ -717,9 +716,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
[[package]]
name = "heck"
@@ -733,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"
@@ -790,9 +798,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
[[package]]
name = "hyper"
-version = "1.2.0"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
+checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
dependencies = [
"bytes",
"futures-channel",
@@ -826,9 +834,9 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.3"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
dependencies = [
"bytes",
"futures-channel",
@@ -957,9 +965,19 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.153"
+version = "0.2.155"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[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.52.5",
+]
[[package]]
name = "libredox"
@@ -973,9 +991,9 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "log"
@@ -983,6 +1001,15 @@ version = "0.4.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+[[package]]
+name = "luau0-src"
+version = "0.9.1+luau625"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39df4ee5bd067cb2363b9f9e5eed0f1cf326fc80508af8ac037eed5b15459c4a"
+dependencies = [
+ "cc",
+]
+
[[package]]
name = "memchr"
version = "2.7.2"
@@ -1006,9 +1033,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
dependencies = [
"adler",
]
@@ -1026,13 +1053,14 @@ dependencies = [
[[package]]
name = "mlua"
-version = "0.9.7"
+version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9bed6bce296397a9d6a86f995dd10a547a4e6949825d45225906bdcbfe7367"
+checksum = "e340c022072f3208a4105458286f4985ba5355bfe243c3073afe45cbe9ecf491"
dependencies = [
"bstr",
"erased-serde",
"futures-util",
+ "libloading",
"mlua-sys",
"mlua_derive",
"num-traits",
@@ -1044,20 +1072,21 @@ dependencies = [
[[package]]
name = "mlua-sys"
-version = "0.5.2"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16a9ba1dd2c6ac971b204262d434c24d65067038598f0638b64e5dca28d52b8"
+checksum = "5552e7e4e22ada0463dfdeee6caf6dc057a189fdc83136408a8f950a5e5c5540"
dependencies = [
"cc",
"cfg-if",
+ "luau0-src",
"pkg-config",
]
[[package]]
name = "mlua_derive"
-version = "0.9.2"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaade5f94e5829db58791664ba98f35fea6a3ffebc783becb51dc97c7a21abee"
+checksum = "09697a6cec88e7f58a02c7ab5c18c611c6907c8654613df9cc0192658a4fb859"
dependencies = [
"itertools",
"once_cell",
@@ -1065,16 +1094,15 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "syn 2.0.58",
+ "syn 2.0.66",
]
[[package]]
name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
dependencies = [
- "lazy_static",
"libc",
"log",
"openssl",
@@ -1107,9 +1135,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.32.2"
+version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
dependencies = [
"memchr",
]
@@ -1143,7 +1171,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.58",
+ "syn 2.0.66",
]
[[package]]
@@ -1181,9 +1209,9 @@ dependencies = [
[[package]]
name = "pango"
-version = "0.19.3"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1"
+checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d"
dependencies = [
"gio",
"glib",
@@ -1193,9 +1221,9 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.19.0"
+version = "0.19.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea"
+checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -1211,9 +1239,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "pest"
-version = "2.7.9"
+version = "2.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95"
+checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
dependencies = [
"memchr",
"thiserror",
@@ -1222,9 +1250,9 @@ dependencies = [
[[package]]
name = "pest_derive"
-version = "2.7.9"
+version = "2.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c"
+checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459"
dependencies = [
"pest",
"pest_generator",
@@ -1232,22 +1260,22 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.7.9"
+version = "2.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd"
+checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
dependencies = [
"pest",
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.58",
+ "syn 2.0.66",
]
[[package]]
name = "pest_meta"
-version = "2.7.9"
+version = "2.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca"
+checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd"
dependencies = [
"once_cell",
"pest",
@@ -1271,7 +1299,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.58",
+ "syn 2.0.66",
]
[[package]]
@@ -1333,9 +1361,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
dependencies = [
"unicode-ident",
]
@@ -1421,9 +1449,9 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
[[package]]
name = "reqwest"
-version = "0.12.3"
+version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19"
+checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
dependencies = [
"base64",
"bytes",
@@ -1464,9 +1492,9 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]]
name = "rustc-hash"
@@ -1485,9 +1513,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.32"
+version = "0.38.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
dependencies = [
"bitflags 2.5.0",
"errno",
@@ -1508,15 +1536,15 @@ dependencies = [
[[package]]
name = "rustls-pki-types"
-version = "1.4.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
[[package]]
name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
name = "schannel"
@@ -1529,11 +1557,11 @@ dependencies = [
[[package]]
name = "security-framework"
-version = "2.10.0"
+version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
"core-foundation",
"core-foundation-sys",
"libc",
@@ -1542,9 +1570,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.10.0"
+version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
dependencies = [
"core-foundation-sys",
"libc",
@@ -1552,15 +1580,15 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.22"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "serde"
-version = "1.0.201"
+version = "1.0.203"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
dependencies = [
"serde_derive",
]
@@ -1577,13 +1605,13 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.201"
+version = "1.0.203"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.58",
+ "syn 2.0.66",
]
[[package]]
@@ -1599,9 +1627,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
dependencies = [
"serde",
]
@@ -1646,9 +1674,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "socket2"
-version = "0.5.6"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
dependencies = [
"libc",
"windows-sys 0.52.0",
@@ -1661,15 +1689,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
- "quote",
"unicode-ident",
]
[[package]]
name = "syn"
-version = "2.0.58"
+version = "2.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
dependencies = [
"proc-macro2",
"quote",
@@ -1736,22 +1763,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.58"
+version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.58",
+ "syn 2.0.66",
]
[[package]]
@@ -1771,9 +1798,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
dependencies = [
"backtrace",
"bytes",
@@ -1788,13 +1815,13 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.58",
+ "syn 2.0.66",
]
[[package]]
@@ -1809,35 +1836,34 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
dependencies = [
"bytes",
"futures-core",
"futures-sink",
"pin-project-lite",
"tokio",
- "tracing",
]
[[package]]
name = "toml"
-version = "0.8.12"
+version = "0.8.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.22.9",
+ "toml_edit 0.22.13",
]
[[package]]
name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
dependencies = [
"serde",
]
@@ -1855,15 +1881,15 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.22.9"
+version = "0.22.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
+checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
dependencies = [
"indexmap",
"serde",
"serde_spanned",
"toml_datetime",
- "winnow 0.6.6",
+ "winnow 0.6.9",
]
[[package]]
@@ -1879,7 +1905,6 @@ dependencies = [
"tokio",
"tower-layer",
"tower-service",
- "tracing",
]
[[package]]
@@ -1900,7 +1925,6 @@ version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [
- "log",
"pin-project-lite",
"tracing-core",
]
@@ -1920,6 +1944,12 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+[[package]]
+name = "typeid"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf"
+
[[package]]
name = "typenum"
version = "1.17.0"
@@ -1964,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"
@@ -2028,7 +2064,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.58",
+ "syn 2.0.66",
"wasm-bindgen-shared",
]
@@ -2062,7 +2098,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.58",
+ "syn 2.0.66",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -2087,11 +2123,13 @@ dependencies = [
name = "webx"
version = "1.2.2"
dependencies = [
+ "base64",
"chrono",
"directories",
"glib",
"glib-build-tools",
"gtk4",
+ "html-escape",
"html_parser",
"lazy_static",
"libadwaita",
@@ -2100,6 +2138,7 @@ dependencies = [
"serde",
"serde_json",
"tokio",
+ "url",
"uuid",
]
@@ -2262,9 +2301,9 @@ dependencies = [
[[package]]
name = "winnow"
-version = "0.6.6"
+version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352"
+checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6"
dependencies = [
"memchr",
]
diff --git a/napture/Cargo.toml b/napture/Cargo.toml
index 69df1434..9da098b7 100644
--- a/napture/Cargo.toml
+++ b/napture/Cargo.toml
@@ -7,17 +7,20 @@ edition = "2021"
[dependencies]
adw = { version = "0.6.0", package = "libadwaita", features = ["v1_5"] }
+base64 = "0.22.1"
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 = ["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"
tokio = { version = "1.37.0", features=["macros"] }
+url = "2.5.0"
uuid = { version = "1.8.0", features = ["fast-rng", "v4"] }
[build-dependencies]
diff --git a/napture/examples/set_timeout/index.html b/napture/examples/set_timeout/index.html
new file mode 100644
index 00000000..6cd2391a
--- /dev/null
+++ b/napture/examples/set_timeout/index.html
@@ -0,0 +1,17 @@
+
+
+ set_timeout
+
+
+
+ set_timeout allows you to delay functions a x amount of milliseconds
+ Text
+
+
+
+
+
+
+ 
+
+
diff --git a/napture/examples/set_timeout/script.lua b/napture/examples/set_timeout/script.lua
new file mode 100644
index 00000000..16e4c181
--- /dev/null
+++ b/napture/examples/set_timeout/script.lua
@@ -0,0 +1,31 @@
+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")
+
+timeout_btn.on_click(function()
+ set_timeout(function()
+ text.set_content("Different Text")
+ end, 500)
+end)
+
+timeout_btn2.on_click(function()
+ set_timeout(function()
+ text.set_content("Different Text")
+ 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 3230f166..e40b2300 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},
@@ -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,
@@ -20,8 +21,40 @@ pub(crate) struct Tag {
pub tied_variables: Vec,
}
-async fn parse_html(url: String) -> Result<(Node, Node)> {
- let html = fetch_file(url + "/index.html").await;
+fn decode_html_entities>(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() {
+ 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 mut html = fetch_file(url).await;
+
+ if !is_html {
+ html = format!("{}{}
", file_name, html_escape::encode_double_quoted_attribute(&html));
+ }
let dom = match !html.is_empty() {
true => Dom::parse(&html),
@@ -70,10 +103,17 @@ pub async fn build_ui(
scroll: Rc>,
searchbar: Rc>,
) -> 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();
+ {
+ 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()
@@ -214,7 +254,7 @@ async fn render_head(element: &Element, contents: Option<&Node>, tab: Rc {
@@ -520,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(>k::StringList::new(&strings[..]))
+ .model(>k::StringList::new(&strings.iter().map(|s| &**s).collect::>()))
.css_name("select")
.css_classes(element.classes.clone())
.halign(gtk::Align::Start)
@@ -558,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);
@@ -571,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())
@@ -619,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())
@@ -687,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)
@@ -718,21 +758,40 @@ fn render_list(
}
pub(crate) fn fetch_image_to_pixbuf(url: String) -> Result {
- 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 = 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::();
+
+ 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()
+ }
}
};
@@ -750,8 +809,12 @@ 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("file://", "");
+ println!("{path}");
+
match fs::read_to_string(&format!("{}", path)) {
Ok(text) => text,
Err(_) => {
@@ -791,11 +854,21 @@ 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::>()
+ } else {
+ url.split('/').skip(5).collect::>()
+ }).join("/");
+
let url = format!(
- "https://raw.githubusercontent.com/{}/{}/main/{}",
+ "https://raw.githubusercontent.com/{}/{}/{}/{}",
url.split('/').nth(3).unwrap_or(""),
url.split('/').nth(4).unwrap_or(""),
- url.split('/').last().unwrap_or(""),
+ branch, path,
);
let client = match client.build() {
@@ -842,7 +915,7 @@ async fn fetch_from_github(url: String) -> String {
fn render_p(child: &Node, element: &Element, label_box: >k::Box, css: &mut String, tags: &Rc>>){
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)
@@ -858,4 +931,4 @@ fn render_p(child: &Node, element: &Element, label_box: >k::Box, css: &mut Str
widget: Box::new(label),
tied_variables: Vec::new(),
});
-}
\ No newline at end of file
+}
diff --git a/napture/src/b9/lua.rs b/napture/src/b9/lua.rs
index 0d745c30..38c94470 100644
--- a/napture/src/b9/lua.rs
+++ b/napture/src/b9/lua.rs
@@ -8,12 +8,14 @@ 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;
-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,6 +42,40 @@ pub trait Luable: Styleable {
// Ok(())
// }
+fn set_timeout(_lua: &Lua, func: LuaOwnedFunction, ms: u64) -> LuaResult {
+ 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(())
+}
+
fn get(
lua: &Lua,
class: String,
@@ -64,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()?;
@@ -80,7 +118,10 @@ fn get(
)?;
table.set(
"set_content",
- lua.create_function(move |_, label: String| {
+ lua.create_function(move |_, label: Option| {
+ let label = if let Some(label) = label {
+ label
+ } else { "".to_string()};
tags2.borrow()[i].widget.set_contents_(label);
Ok(())
})?,
@@ -148,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)?;
@@ -185,8 +233,9 @@ fn print(_lua: &Lua, msg: LuaMultiValue) -> LuaResult<()> {
// todo: make this async if shit breaks
pub(crate) async fn run(luacode: String, tags: Rc>>, 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();
@@ -307,20 +356,37 @@ pub(crate) async fn run(luacode: String, tags: Rc>>, 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(
+ "clear_timeout",
+ lua.create_function(move |_lua, id: i32| {
+ clear_timeout(id)
+ })?
+ )?;
globals.set("fetch", fetchtest)?;
globals.set("window", window_table)?;
- let ok = lua.load(luacode).eval::();
+ 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::();
- 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!"))
+ }
+ }
}
}
@@ -361,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()
}
@@ -435,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()
}
@@ -512,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();
@@ -574,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",
@@ -649,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",
@@ -734,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",
@@ -802,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()
}
@@ -886,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);
}
@@ -958,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 8ee4da3f..16284531 100644
--- a/napture/src/globals.rs
+++ b/napture/src/globals.rs
@@ -1,9 +1,11 @@
-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 = Mutex::new(String::new());
pub static ref DNS_SERVER: Mutex = Mutex::new(String::from("api.buss.lol"));
+ pub static ref LUA_TIMEOUTS: Arc>> = Arc::new(Mutex::new(Vec::new()));
pub static ref APPDATA_PATH: Mutex = Mutex::new(String::from("scoopity poop"));
-}
\ No newline at end of file
+}
diff --git a/napture/src/historymod/imp.rs b/napture/src/historymod/imp.rs
index df4dd0c2..439c930c 100644
--- a/napture/src/historymod/imp.rs
+++ b/napture/src/historymod/imp.rs
@@ -1,7 +1,6 @@
use std::cell::RefCell;
use glib::Properties;
-use gtk::glib;
use gtk::prelude::*;
use gtk::subclass::prelude::*;
@@ -23,4 +22,4 @@ impl ObjectSubclass for HistoryObject {
}
#[glib::derived_properties]
-impl ObjectImpl for HistoryObject {}
\ No newline at end of file
+impl ObjectImpl for HistoryObject {}
diff --git a/napture/src/historymod/mod.rs b/napture/src/historymod/mod.rs
index 18b9439e..4dfd852b 100644
--- a/napture/src/historymod/mod.rs
+++ b/napture/src/historymod/mod.rs
@@ -1,7 +1,6 @@
mod imp;
use glib::Object;
-use gtk::glib;
use serde::{Deserialize, Serialize};
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 8f727cf4..e42f1ec4 100644
--- a/napture/src/main.rs
+++ b/napture/src/main.rs
@@ -57,6 +57,7 @@ use historymod::HistoryObject;
use globals::APPDATA_PATH;
use globals::DNS_SERVER;
+use globals::LUA_TIMEOUTS;
use globals::LUA_LOGS;
use gtk::gdk;
use gtk::gdk::Display;
@@ -64,7 +65,6 @@ use gtk::gio;
use gtk::CssProvider;
use serde::Deserialize;
-use gtk::glib;
use gtk::prelude::*;
use directories::ProjectDirs;
@@ -187,9 +187,14 @@ fn get_time() -> String {
fn build_ui(app: &adw::Application, args: Rc>>, config: Rc>) {
let history = Rc::new(RefCell::new(History::new()));
- 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
};
@@ -203,18 +208,26 @@ fn build_ui(app: &adw::Application, args: Rc>>, config: Rc>>, config: Rc>>, config: Rc 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() {
@@ -591,7 +608,9 @@ fn fetch_dns(url: String) -> String {
let status = response.status();
if let Ok(json) = response.json::() {
- json.ip
+ let path = url.split_once('/')
+ .unwrap_or(("", "")).1;
+ json.ip + &format!("/{}", path)
} else {
lualog!(
"debug",
@@ -887,4 +906,4 @@ fn set_config(property: String, value: serde_json::Value, array: bool) {
}
}
}
-}
\ No newline at end of file
+}
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)