diff --git a/Cargo.lock b/Cargo.lock index 9dd858d..ce645fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2403,18 +2403,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" -[[package]] -name = "lexgen" -version = "0.0.0" -dependencies = [ - "jacquard-common", - "jacquard-derive", - "jacquard-lexicon", - "miette", - "serde", - "thiserror 2.0.18", -] - [[package]] name = "libc" version = "0.2.186" @@ -2566,19 +2554,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "mediautil" -version = "0.0.0" -dependencies = [ - "bytes", - "image", - "infer", - "log", - "mime", - "nom-exif", - "thiserror 2.0.18", -] - [[package]] name = "memchr" version = "2.8.0" @@ -3220,10 +3195,10 @@ dependencies = [ "jacquard-identity", "jemallocator", "json-subscriber", - "lexgen", - "mediautil", "moka", "multihash-codetable", + "porxie-lexgen", + "porxie-mediautil", "reqwest", "serde", "serde_json", @@ -3237,6 +3212,31 @@ dependencies = [ "url", ] +[[package]] +name = "porxie-lexgen" +version = "0.0.0" +dependencies = [ + "jacquard-common", + "jacquard-derive", + "jacquard-lexicon", + "miette", + "serde", + "thiserror 2.0.18", +] + +[[package]] +name = "porxie-mediautil" +version = "0.0.0" +dependencies = [ + "bytes", + "image", + "infer", + "log", + "mime", + "nom-exif", + "thiserror 2.0.18", +] + [[package]] name = "postcard" version = "1.1.3" diff --git a/Cargo.toml b/Cargo.toml index 8c63a51..f82c550 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["crates/porxie", "crates/lexgen", "crates/mediautil"] +members = ["crates/porxie", "crates/porxie-lexgen", "crates/porxie-mediautil"] resolver = "3" [profile.release] diff --git a/crates/lexgen/Cargo.toml b/crates/porxie-lexgen/Cargo.toml similarity index 95% rename from crates/lexgen/Cargo.toml rename to crates/porxie-lexgen/Cargo.toml index 649b2a3..24b92d8 100644 --- a/crates/lexgen/Cargo.toml +++ b/crates/porxie-lexgen/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "lexgen" +name = "porxie-lexgen" license = "AGPL-3.0-or-later" version = "0.0.0" edition = "2024" diff --git a/crates/lexgen/src/builder_types.rs b/crates/porxie-lexgen/src/builder_types.rs similarity index 100% rename from crates/lexgen/src/builder_types.rs rename to crates/porxie-lexgen/src/builder_types.rs diff --git a/crates/lexgen/src/dev_blooym.rs b/crates/porxie-lexgen/src/dev_blooym.rs similarity index 100% rename from crates/lexgen/src/dev_blooym.rs rename to crates/porxie-lexgen/src/dev_blooym.rs diff --git a/crates/lexgen/src/dev_blooym/porxie.rs b/crates/porxie-lexgen/src/dev_blooym/porxie.rs similarity index 100% rename from crates/lexgen/src/dev_blooym/porxie.rs rename to crates/porxie-lexgen/src/dev_blooym/porxie.rs diff --git a/crates/lexgen/src/dev_blooym/porxie/cache.rs b/crates/porxie-lexgen/src/dev_blooym/porxie/cache.rs similarity index 100% rename from crates/lexgen/src/dev_blooym/porxie/cache.rs rename to crates/porxie-lexgen/src/dev_blooym/porxie/cache.rs diff --git a/crates/lexgen/src/dev_blooym/porxie/cache/purge_actor.rs b/crates/porxie-lexgen/src/dev_blooym/porxie/cache/purge_actor.rs similarity index 100% rename from crates/lexgen/src/dev_blooym/porxie/cache/purge_actor.rs rename to crates/porxie-lexgen/src/dev_blooym/porxie/cache/purge_actor.rs diff --git a/crates/lexgen/src/dev_blooym/porxie/cache/purge_blob.rs b/crates/porxie-lexgen/src/dev_blooym/porxie/cache/purge_blob.rs similarity index 100% rename from crates/lexgen/src/dev_blooym/porxie/cache/purge_blob.rs rename to crates/porxie-lexgen/src/dev_blooym/porxie/cache/purge_blob.rs diff --git a/crates/lexgen/src/dev_blooym/porxie/get_blob.rs b/crates/porxie-lexgen/src/dev_blooym/porxie/get_blob.rs similarity index 100% rename from crates/lexgen/src/dev_blooym/porxie/get_blob.rs rename to crates/porxie-lexgen/src/dev_blooym/porxie/get_blob.rs diff --git a/crates/lexgen/src/dev_blooym/porxie/get_blob_metadata.rs b/crates/porxie-lexgen/src/dev_blooym/porxie/get_blob_metadata.rs similarity index 100% rename from crates/lexgen/src/dev_blooym/porxie/get_blob_metadata.rs rename to crates/porxie-lexgen/src/dev_blooym/porxie/get_blob_metadata.rs diff --git a/crates/lexgen/src/dev_blooym/porxie/get_blob_policy.rs b/crates/porxie-lexgen/src/dev_blooym/porxie/get_blob_policy.rs similarity index 100% rename from crates/lexgen/src/dev_blooym/porxie/get_blob_policy.rs rename to crates/porxie-lexgen/src/dev_blooym/porxie/get_blob_policy.rs diff --git a/crates/lexgen/src/lib.rs b/crates/porxie-lexgen/src/lib.rs similarity index 100% rename from crates/lexgen/src/lib.rs rename to crates/porxie-lexgen/src/lib.rs diff --git a/crates/mediautil/Cargo.toml b/crates/porxie-mediautil/Cargo.toml similarity index 96% rename from crates/mediautil/Cargo.toml rename to crates/porxie-mediautil/Cargo.toml index b8adb03..8385474 100644 --- a/crates/mediautil/Cargo.toml +++ b/crates/porxie-mediautil/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "mediautil" +name = "porxie-mediautil" license = "AGPL-3.0-or-later" version = "0.0.0" edition = "2024" diff --git a/crates/mediautil/src/lib.rs b/crates/porxie-mediautil/src/lib.rs similarity index 100% rename from crates/mediautil/src/lib.rs rename to crates/porxie-mediautil/src/lib.rs diff --git a/crates/mediautil/src/metadata/image.rs b/crates/porxie-mediautil/src/metadata/image.rs similarity index 100% rename from crates/mediautil/src/metadata/image.rs rename to crates/porxie-mediautil/src/metadata/image.rs diff --git a/crates/mediautil/src/metadata/mod.rs b/crates/porxie-mediautil/src/metadata/mod.rs similarity index 100% rename from crates/mediautil/src/metadata/mod.rs rename to crates/porxie-mediautil/src/metadata/mod.rs diff --git a/crates/mediautil/src/metadata/video.rs b/crates/porxie-mediautil/src/metadata/video.rs similarity index 100% rename from crates/mediautil/src/metadata/video.rs rename to crates/porxie-mediautil/src/metadata/video.rs diff --git a/crates/mediautil/src/mime.rs b/crates/porxie-mediautil/src/mime.rs similarity index 100% rename from crates/mediautil/src/mime.rs rename to crates/porxie-mediautil/src/mime.rs diff --git a/crates/porxie/Cargo.toml b/crates/porxie/Cargo.toml index 1282748..3997193 100644 --- a/crates/porxie/Cargo.toml +++ b/crates/porxie/Cargo.toml @@ -50,10 +50,10 @@ json-subscriber = { version = "0.2.8", default-features = false, features = [ "tracing-log", "env-filter", ] } -lexgen = { path = "../lexgen", default-features = false, features = [ +porxie-lexgen = { path = "../porxie-lexgen", default-features = false, features = [ "dev_blooym", ] } -mediautil = { path = "../mediautil", default-features = false, features = [ +porxie-mediautil = { path = "../porxie-mediautil", default-features = false, features = [ "video-metadata", "image-metadata", ] } diff --git a/crates/porxie/src/blob_service.rs b/crates/porxie/src/blob_service.rs index 348e6a7..5bc0311 100644 --- a/crates/porxie/src/blob_service.rs +++ b/crates/porxie/src/blob_service.rs @@ -10,10 +10,10 @@ use bytes::Bytes; use cid::Cid; use core::{num::NonZeroU64, time::Duration}; use jacquard_common::types::did::Did; -use mediautil::deps::mime::Mime; -use mediautil::mime::{is_mime_allowed, sniff_mime}; use moka::{future::Cache as MokaCache, policy::EvictionPolicy}; use multihash_codetable::{Code, MultihashDigest}; +use porxie_mediautil::deps::mime::Mime; +use porxie_mediautil::mime::{is_mime_allowed, sniff_mime}; use reqwest::{ StatusCode, header::{self, HeaderValue}, diff --git a/crates/porxie/src/main.rs b/crates/porxie/src/main.rs index de5a81b..ae42157 100644 --- a/crates/porxie/src/main.rs +++ b/crates/porxie/src/main.rs @@ -20,7 +20,7 @@ use bytesize::ByteSize; use clap::{Args, Parser}; use core::num::NonZeroU64; use dotenvy::dotenv; -use mediautil::deps::mime::Mime; +use porxie_mediautil::deps::mime::Mime; use reqwest::Url; use tracing_subscriber::EnvFilter; diff --git a/crates/porxie/src/policy_client.rs b/crates/porxie/src/policy_client.rs index 719aefd..95b485d 100644 --- a/crates/porxie/src/policy_client.rs +++ b/crates/porxie/src/policy_client.rs @@ -1,7 +1,9 @@ use crate::{networking::http::USER_AGENT, types::blob_cid::BlobCid}; use jacquard_common::types::did::Did; -use lexgen::dev_blooym::porxie::get_blob_policy::{GetBlobPolicyOutput, GetBlobPolicyOutputPolicy}; use moka::{future::Cache as MokaCache, policy::EvictionPolicy}; +use porxie_lexgen::dev_blooym::porxie::get_blob_policy::{ + GetBlobPolicyOutput, GetBlobPolicyOutputPolicy, +}; use reqwest::{ StatusCode, Url, header::{HeaderName, HeaderValue}, diff --git a/crates/porxie/src/server/mod.rs b/crates/porxie/src/server/mod.rs index eac189a..21f1de4 100644 --- a/crates/porxie/src/server/mod.rs +++ b/crates/porxie/src/server/mod.rs @@ -31,7 +31,7 @@ use axum::{ routing::{any, get, post}, }; use core::{num::NonZeroU64, time::Duration}; -use mediautil::deps::mime::Mime; +use porxie_mediautil::deps::mime::Mime; use std::sync::Arc; use tower_http::{ catch_panic::CatchPanicLayer, diff --git a/crates/porxie/src/server/routes/blob.rs b/crates/porxie/src/server/routes/blob.rs index db25aa2..18c2c09 100644 --- a/crates/porxie/src/server/routes/blob.rs +++ b/crates/porxie/src/server/routes/blob.rs @@ -15,7 +15,7 @@ use jacquard_common::{ types::did::Did, xrpc::{GenericXrpcError, XrpcError, XrpcRequest}, }; -use lexgen::dev_blooym::porxie::get_blob::{GetBlob, GetBlobError}; +use porxie_lexgen::dev_blooym::porxie::get_blob::{GetBlob, GetBlobError}; use std::sync::Arc; /// Fetch a blob from a given upstream and return it. diff --git a/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/cache/purge_actor.rs b/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/cache/purge_actor.rs index e65c57a..34550ab 100644 --- a/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/cache/purge_actor.rs +++ b/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/cache/purge_actor.rs @@ -1,7 +1,7 @@ use crate::server::{ServerState, extractors::AdminXrpcAuth}; use axum::extract::State; use jacquard_axum::ExtractXrpc; -use lexgen::dev_blooym::porxie::cache::purge_actor::PurgeActorRequest; +use porxie_lexgen::dev_blooym::porxie::cache::purge_actor::PurgeActorRequest; use reqwest::StatusCode; use std::sync::Arc; diff --git a/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/cache/purge_blob.rs b/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/cache/purge_blob.rs index d044404..24756c8 100644 --- a/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/cache/purge_blob.rs +++ b/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/cache/purge_blob.rs @@ -9,7 +9,7 @@ use axum::{ }; use jacquard_axum::ExtractXrpc; use jacquard_common::xrpc::XrpcError; -use lexgen::dev_blooym::porxie::cache::purge_blob::{PurgeBlobError, PurgeBlobRequest}; +use porxie_lexgen::dev_blooym::porxie::cache::purge_blob::{PurgeBlobError, PurgeBlobRequest}; use reqwest::StatusCode; use std::sync::Arc; diff --git a/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/get_blob.rs b/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/get_blob.rs index 88da021..4bd55e5 100644 --- a/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/get_blob.rs +++ b/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/get_blob.rs @@ -4,7 +4,7 @@ use axum::{ response::IntoResponse, }; use jacquard_axum::ExtractXrpc; -use lexgen::dev_blooym::porxie::get_blob::GetBlobRequest; +use porxie_lexgen::dev_blooym::porxie::get_blob::GetBlobRequest; use std::sync::Arc; /// Compatibility layer that converts the xrpc call into a diff --git a/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/get_blob_metadata.rs b/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/get_blob_metadata.rs index 9c760dd..3c40019 100644 --- a/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/get_blob_metadata.rs +++ b/crates/porxie/src/server/routes/xrpc/dev_blooym/porxie/get_blob_metadata.rs @@ -15,11 +15,11 @@ use jacquard_common::{ cowstr::ToCowStr, xrpc::{GenericXrpcError, XrpcError, XrpcRequest}, }; -use lexgen::dev_blooym::porxie::get_blob_metadata::{ +use porxie_lexgen::dev_blooym::porxie::get_blob_metadata::{ AspectRatio, GetBlobMetadata, GetBlobMetadataError, GetBlobMetadataOutput, GetBlobMetadataOutputData, GetBlobMetadataRequest, ImageData, VideoData, }; -use mediautil::{ +use porxie_mediautil::{ deps::mime, metadata::{ImageMetadata, VideoMetadata}, };