gl/tools
SHA256
1
0
Fork 0
Code Actions Activity

.

Browse Source
This commit is contained in:
Alex Wied
2026-07-02 14:09:54 -04:00
parent 038afc4645
commit b7b52e3c09
6 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+41 -41
View File
@@ -145,9 +145,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
[[package]]
name = "arrayvec"
version = "0.7.7"
version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f02882884d3e1bc524fb12c79f107f6ad0e1cfd498c536ffb494301740995dfe"
checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
[[package]]
name = "as-raw-xcb-connection"
@@ -1631,7 +1631,7 @@ dependencies = [
[[package]]
name = "iced"
version = "0.15.0-dev"
source = "git+https://github.com/iced-rs/iced.git?branch=master#36b6ed0aec85fb01afbb63b4f48afa7763487967"
source = "git+https://github.com/iced-rs/iced.git?branch=master#bb22add15fc5528b5eb319408d5e60992fdc8a90"
dependencies = [
"iced_core",
"iced_debug",
@@ -1646,7 +1646,7 @@ dependencies = [
[[package]]
name = "iced_core"
version = "0.15.0-dev"
source = "git+https://github.com/iced-rs/iced.git?branch=master#36b6ed0aec85fb01afbb63b4f48afa7763487967"
source = "git+https://github.com/iced-rs/iced.git?branch=master#bb22add15fc5528b5eb319408d5e60992fdc8a90"
dependencies = [
"bitflags 2.13.0",
"bytes",
@@ -1664,7 +1664,7 @@ dependencies = [
[[package]]
name = "iced_debug"
version = "0.15.0-dev"
source = "git+https://github.com/iced-rs/iced.git?branch=master#36b6ed0aec85fb01afbb63b4f48afa7763487967"
source = "git+https://github.com/iced-rs/iced.git?branch=master#bb22add15fc5528b5eb319408d5e60992fdc8a90"
dependencies = [
"iced_core",
"iced_futures",
@@ -1674,7 +1674,7 @@ dependencies = [
[[package]]
name = "iced_futures"
version = "0.15.0-dev"
source = "git+https://github.com/iced-rs/iced.git?branch=master#36b6ed0aec85fb01afbb63b4f48afa7763487967"
source = "git+https://github.com/iced-rs/iced.git?branch=master#bb22add15fc5528b5eb319408d5e60992fdc8a90"
dependencies = [
"futures",
"iced_core",
@@ -1688,7 +1688,7 @@ dependencies = [
[[package]]
name = "iced_graphics"
version = "0.15.0-dev"
source = "git+https://github.com/iced-rs/iced.git?branch=master#36b6ed0aec85fb01afbb63b4f48afa7763487967"
source = "git+https://github.com/iced-rs/iced.git?branch=master#bb22add15fc5528b5eb319408d5e60992fdc8a90"
dependencies = [
"bitflags 2.13.0",
"bytemuck",
@@ -1706,7 +1706,7 @@ dependencies = [
[[package]]
name = "iced_program"
version = "0.15.0-dev"
source = "git+https://github.com/iced-rs/iced.git?branch=master#36b6ed0aec85fb01afbb63b4f48afa7763487967"
source = "git+https://github.com/iced-rs/iced.git?branch=master#bb22add15fc5528b5eb319408d5e60992fdc8a90"
dependencies = [
"iced_graphics",
"iced_runtime",
@@ -1715,7 +1715,7 @@ dependencies = [
[[package]]
name = "iced_renderer"
version = "0.15.0-dev"
source = "git+https://github.com/iced-rs/iced.git?branch=master#36b6ed0aec85fb01afbb63b4f48afa7763487967"
source = "git+https://github.com/iced-rs/iced.git?branch=master#bb22add15fc5528b5eb319408d5e60992fdc8a90"
dependencies = [
"iced_graphics",
"iced_tiny_skia",
@@ -1727,7 +1727,7 @@ dependencies = [
[[package]]
name = "iced_runtime"
version = "0.15.0-dev"
source = "git+https://github.com/iced-rs/iced.git?branch=master#36b6ed0aec85fb01afbb63b4f48afa7763487967"
source = "git+https://github.com/iced-rs/iced.git?branch=master#bb22add15fc5528b5eb319408d5e60992fdc8a90"
dependencies = [
"bytes",
"iced_core",
@@ -1738,7 +1738,7 @@ dependencies = [
[[package]]
name = "iced_tiny_skia"
version = "0.15.0-dev"
source = "git+https://github.com/iced-rs/iced.git?branch=master#36b6ed0aec85fb01afbb63b4f48afa7763487967"
source = "git+https://github.com/iced-rs/iced.git?branch=master#bb22add15fc5528b5eb319408d5e60992fdc8a90"
dependencies = [
"bytemuck",
"cosmic-text",
@@ -1754,7 +1754,7 @@ dependencies = [
[[package]]
name = "iced_wgpu"
version = "0.15.0-dev"
source = "git+https://github.com/iced-rs/iced.git?branch=master#36b6ed0aec85fb01afbb63b4f48afa7763487967"
source = "git+https://github.com/iced-rs/iced.git?branch=master#bb22add15fc5528b5eb319408d5e60992fdc8a90"
dependencies = [
"bitflags 2.13.0",
"bytemuck",
@@ -1771,7 +1771,7 @@ dependencies = [
[[package]]
name = "iced_widget"
version = "0.15.0-dev"
source = "git+https://github.com/iced-rs/iced.git?branch=master#36b6ed0aec85fb01afbb63b4f48afa7763487967"
source = "git+https://github.com/iced-rs/iced.git?branch=master#bb22add15fc5528b5eb319408d5e60992fdc8a90"
dependencies = [
"iced_renderer",
"iced_runtime",
@@ -1785,7 +1785,7 @@ dependencies = [
[[package]]
name = "iced_winit"
version = "0.15.0-dev"
source = "git+https://github.com/iced-rs/iced.git?branch=master#36b6ed0aec85fb01afbb63b4f48afa7763487967"
source = "git+https://github.com/iced-rs/iced.git?branch=master#bb22add15fc5528b5eb319408d5e60992fdc8a90"
dependencies = [
"arboard",
"iced_debug",
@@ -2130,14 +2130,14 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
[[package]]
name = "libredox"
version = "0.1.17"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
dependencies = [
"bitflags 2.13.0",
"libc",
"plain",
"redox_syscall 0.8.1",
"redox_syscall 0.9.0",
]
[[package]]
@@ -2320,9 +2320,9 @@ checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b"
[[package]]
name = "naga"
version = "29.0.3"
version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0dd91265cc2454558f659b3b4b9640f0ddb8cc6521277f166b8a8c181c898079"
checksum = "b2bf919621e7975acb27d881bae2fb993e0d45c8e0446e85e6272971e00dc8df"
dependencies = [
"arrayvec",
"bit-set",
@@ -3408,9 +3408,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.8.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b44b894f2a6e36457d665d1e08c3866add6ed5e70050c1b4ba8a8ddedb02ce7"
checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759"
dependencies = [
"bitflags 2.13.0",
]
@@ -4305,9 +4305,9 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.51"
version = "0.3.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85c17d80feb7334b40c484e45ed1a5273dfd8bfda537c3be2e74a06a6686f327"
checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50"
dependencies = [
"deranged",
"num-conv",
@@ -4325,9 +4325,9 @@ checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
[[package]]
name = "time-macros"
version = "0.2.30"
version = "0.2.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcef1a61bdb119096e153208ec5cbec23944ce8bca13be5c7f60c634f7403935"
checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f"
dependencies = [
"num-conv",
"time-core",
@@ -5001,9 +5001,9 @@ dependencies = [
[[package]]
name = "wgpu"
version = "29.0.3"
version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb3feacc458f7bee8bc1737149b42b6c731aa461039a4264a67bb6681646b250"
checksum = "76e8840e1ba2881d4cbb18d2147627a56af426ff064c0401eb0c8410c6325d07"
dependencies = [
"arrayvec",
"bitflags 2.13.0",
@@ -5031,9 +5031,9 @@ dependencies = [
[[package]]
name = "wgpu-core"
version = "29.0.3"
version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02da3ad1b568337f25513b317870960ef87073ea0945502e44b864b67a8c77b7"
checksum = "2f519832254e56965a9940c4af57dcb75f702b6f6fa4a0b172f685395843a4d7"
dependencies = [
"arrayvec",
"bit-set",
@@ -5064,36 +5064,36 @@ dependencies = [
[[package]]
name = "wgpu-core-deps-apple"
version = "29.0.3"
version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62e51b5447e144b3dbba4feb01f80f4fa21696fa0cd99afb2c3df1affd6fdb28"
checksum = "f5e39e26c4c0e07589e67d18546cf79ff45383659fc72fca4dd293358a0347f3"
dependencies = [
"wgpu-hal",
]
[[package]]
name = "wgpu-core-deps-emscripten"
version = "29.0.3"
version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3487cd6293a963bc5c0c0396f6a2192043c50003c07f4efdccbad3d90ec9d819"
checksum = "01e09be551dc939498bdd5f6b2c66e55ab275dad25825267a08605a80fc9f0af"
dependencies = [
"wgpu-hal",
]
[[package]]
name = "wgpu-core-deps-windows-linux-android"
version = "29.0.3"
version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bfb01076d0aa08b0ba9bd741e178b5cc440f5abe99d9581323a4c8b5d1a1916"
checksum = "4e592c1bbef6ad047647ae6e666ebd8cee7a32bb4544d9700ec96cbf73230257"
dependencies = [
"wgpu-hal",
]
[[package]]
name = "wgpu-hal"
version = "29.0.3"
version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31f8e1a9e7a8512f276f7c62e018c7fa8d60954303fed2e5750114332049193f"
checksum = "97ace1c17727311c22a46e4e3faf56ea6de81af99dcc839bdfb54857b94d448d"
dependencies = [
"android_system_properties",
"arrayvec",
@@ -5145,9 +5145,9 @@ dependencies = [
[[package]]
name = "wgpu-naga-bridge"
version = "29.0.3"
version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59c654c483f058800972c3645e95388a7eca31bf9fe1933bc20e036588a0be02"
checksum = "95226013f547544b223281cd16a4fb549aa9dcb562adbda0faae4c73ffbbc161"
dependencies = [
"naga",
"wgpu-types",
@@ -5155,9 +5155,9 @@ dependencies = [
[[package]]
name = "wgpu-types"
version = "29.0.3"
version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9bcc31518a0e9735aefebedb5f7a9ef3ed1c42549c9f4c882fa9060ceaac639"
checksum = "84bf84cd9ca8ca45e2b223a3868f1adf9bfc0c66aeac212e76ee7e40fdadf8f5"
dependencies = [
"bitflags 2.13.0",
"bytemuck",
Cargo.toml
+1 -1
View File
@@ -11,7 +11,7 @@ ldp = { path = "../../ldp/ldp", features = ["keyed"] }
async-trait = "0.1"
base64 = "0.22"
bytes = "1.11"
bytes = "1.12"
color-eyre = "0.6"
futures = "0.3"
http = "1.4"
publish/src/app.rs
+4 -4
View File
@@ -17,7 +17,7 @@ use ldp::traverse::Traverse;
use ldp::{RdfSource, RdfSourceUpdateResponse, ResourceRequestBuilder, SerializationOptions};
use oxigraph::io::RdfFormat;
use oxigraph::model::vocab::{rdf, rdfs};
use oxigraph::model::{BaseDirection, Dataset, NamedNode, NamedNodeRef, Quad, Term, TermRef};
use oxigraph::model::{BaseDirection, Dataset, NamedNode, NamedNodeRef, Quad, Term};
use tracing::{debug, debug_span, error, trace};
use crate::rdf::language;
use crate::widget::iri_input::iri_input;
@@ -105,11 +105,11 @@ impl Publisher {
});
let index = SearchIndex::builder()
//.with_path("/home/alex/.local/share/org.graphofliberty.desktop/index")
.with_path("/home/alex/.local/share/org.graphofliberty.desktop/index")
.build()
.expect("Failed to build search index");
debug_span!("Ontology Indexing").in_scope(|| {
/*debug_span!("Ontology Indexing").in_scope(|| {
let mut counter = 0;
let mut writer = index.writer().expect("Failed to build index writer");
let index = ontology.index(&*language::ENGLISH_OR_UNTAGGED).expect("Unable to generate index of entities");
@@ -127,7 +127,7 @@ impl Publisher {
}
writer.commit().expect("Failed to commit changes to search index");
debug!("Added {counter} documents to search index");
});
});*/
let mut abbreviated_datatypes = ontology
.datatypes()
publish/src/rdf/ontology.rs
+3 -3
View File
@@ -1,4 +1,3 @@
use std::borrow::Borrow;
use crate::error;
use crate::rdf::vocab::gl;
use oxigraph::model::vocab::{rdf, rdfs, xsd};
@@ -9,7 +8,8 @@ use std::fmt::Display;
use std::path::{Path, PathBuf};
use std::sync::LazyLock;
use oxigraph::store::Store;
use crate::rdf::conversion;
use tracing::debug_span;
use crate::rdf::{conversion, materialize};
use crate::rdf::language::LanguageCondition;
static PREFIXES: LazyLock<BTreeMap<String, String>> = LazyLock::new(|| {
@@ -60,7 +60,7 @@ impl OntologyBuilder {
pub fn build(self) -> error::Result<Ontology> {
let mut store = if let Some(path) = self.path {
Store::open(path)
Store::open_read_only(path)
} else {
Store::new()
}?;
search/src/error.rs
+3
View File
@@ -11,4 +11,7 @@ pub enum SearchError {
#[error(transparent)]
OpenDirectoryError(#[from] tantivy::directory::error::OpenDirectoryError),
#[error(transparent)]
Io(#[from] std::io::Error),
}
search/src/index.rs
+2
View File
@@ -1,3 +1,4 @@
use std::fs;
use crate::{error, update};
use crate::schema::Schema;
use std::path::PathBuf;
@@ -34,6 +35,7 @@ impl SearchIndexBuilder {
.tokenizers(tokenizer_manager);
let index = if let Some(path) = self.path {
fs::create_dir_all(&path)?;
let mmap_directory = MmapDirectory::open(path)?;
let managed_directory = ManagedDirectory::wrap(Box::new(mmap_directory))?;
builder.open_or_create(managed_directory)?