Kieran/zap-stream-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
kieran 2025-01-09 14:30:44 +00:00
parent dc7fee4151
commit 85ef186048
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
3 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Cargo.lock generated
View File

@ -38,7 +38,7 @@ dependencies = [
"accesskit_consumer", "accesskit_consumer",
"atspi-common", "atspi-common",
"serde", "serde",
"thiserror 1.0.64", "thiserror 1.0.69",
"zvariant", "zvariant",
] ]
@ -230,7 +230,7 @@ dependencies = [
"ndk-context", "ndk-context",
"ndk-sys 0.6.0+11769913", "ndk-sys 0.6.0+11769913",
"num_enum 0.7.3", "num_enum 0.7.3",
"thiserror 1.0.64", "thiserror 1.0.69",
] ]
[[package]] [[package]]
@ -897,7 +897,7 @@ dependencies = [
"polling", "polling",
"rustix", "rustix",
"slab", "slab",
"thiserror 1.0.64", "thiserror 1.0.69",
] ]
[[package]] [[package]]
@ -1490,7 +1490,7 @@ dependencies = [
"egui", "egui",
"epaint", "epaint",
"log", "log",
"thiserror 1.0.64", "thiserror 1.0.69",
"type-map", "type-map",
"web-time", "web-time",
"wgpu", "wgpu",
@ -2222,7 +2222,7 @@ checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7"
dependencies = [ dependencies = [
"log", "log",
"presser", "presser",
"thiserror 1.0.64", "thiserror 1.0.69",
"winapi", "winapi",
"windows 0.52.0", "windows 0.52.0",
] ]
@ -2283,7 +2283,7 @@ dependencies = [
"com", "com",
"libc", "libc",
"libloading", "libloading",
"thiserror 1.0.64", "thiserror 1.0.69",
"widestring", "widestring",
"winapi", "winapi",
] ]
@ -2529,6 +2529,15 @@ dependencies = [
"either", "either",
] ]
[[package]]
name = "itertools"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
dependencies = [
"either",
]
[[package]] [[package]]
name = "itoa" name = "itoa"
version = "1.0.11" version = "1.0.11"
@ -2546,7 +2555,7 @@ dependencies = [
"combine", "combine",
"jni-sys", "jni-sys",
"log", "log",
"thiserror 1.0.64", "thiserror 1.0.69",
"walkdir", "walkdir",
"windows-sys 0.45.0", "windows-sys 0.45.0",
] ]
@ -2845,7 +2854,7 @@ dependencies = [
"rustc-hash", "rustc-hash",
"spirv", "spirv",
"termcolor", "termcolor",
"thiserror 1.0.64", "thiserror 1.0.69",
"unicode-xid", "unicode-xid",
] ]
@ -2860,7 +2869,7 @@ dependencies = [
"ndk-sys 0.4.1+23.1.7779620", "ndk-sys 0.4.1+23.1.7779620",
"num_enum 0.5.11", "num_enum 0.5.11",
"raw-window-handle 0.5.2", "raw-window-handle 0.5.2",
"thiserror 1.0.64", "thiserror 1.0.69",
] ]
[[package]] [[package]]
@ -2874,7 +2883,7 @@ dependencies = [
"log", "log",
"ndk-sys 0.5.0+25.2.9519653", "ndk-sys 0.5.0+25.2.9519653",
"num_enum 0.7.3", "num_enum 0.7.3",
"thiserror 1.0.64", "thiserror 1.0.69",
] ]
[[package]] [[package]]
@ -2889,7 +2898,7 @@ dependencies = [
"ndk-sys 0.6.0+11769913", "ndk-sys 0.6.0+11769913",
"num_enum 0.7.3", "num_enum 0.7.3",
"raw-window-handle 0.6.2", "raw-window-handle 0.6.2",
"thiserror 1.0.64", "thiserror 1.0.69",
] ]
[[package]] [[package]]
@ -3913,7 +3922,7 @@ dependencies = [
"rand_chacha", "rand_chacha",
"simd_helpers", "simd_helpers",
"system-deps", "system-deps",
"thiserror 1.0.64", "thiserror 1.0.69",
"v_frame", "v_frame",
"wasm-bindgen", "wasm-bindgen",
] ]
@ -3996,7 +4005,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
dependencies = [ dependencies = [
"getrandom", "getrandom",
"libredox", "libredox",
"thiserror 1.0.64", "thiserror 1.0.69",
] ]
[[package]] [[package]]
@ -4449,7 +4458,7 @@ dependencies = [
"log", "log",
"memmap2", "memmap2",
"rustix", "rustix",
"thiserror 1.0.64", "thiserror 1.0.69",
"wayland-backend", "wayland-backend",
"wayland-client", "wayland-client",
"wayland-csd-frame", "wayland-csd-frame",
@ -4610,11 +4619,11 @@ dependencies = [
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.64" version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
dependencies = [ dependencies = [
"thiserror-impl 1.0.64", "thiserror-impl 1.0.69",
] ]
[[package]] [[package]]
@ -4628,9 +4637,9 @@ dependencies = [
[[package]] [[package]]
name = "thiserror-impl" name = "thiserror-impl"
version = "1.0.64" version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -4826,7 +4835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
dependencies = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"thiserror 1.0.64", "thiserror 1.0.69",
"time", "time",
"tracing-subscriber", "tracing-subscriber",
] ]
@ -4914,7 +4923,7 @@ dependencies = [
"rustls", "rustls",
"rustls-pki-types", "rustls-pki-types",
"sha1", "sha1",
"thiserror 1.0.64", "thiserror 1.0.69",
"utf-8", "utf-8",
"webpki-roots", "webpki-roots",
] ]
@ -5424,7 +5433,7 @@ dependencies = [
"raw-window-handle 0.6.2", "raw-window-handle 0.6.2",
"rustc-hash", "rustc-hash",
"smallvec", "smallvec",
"thiserror 1.0.64", "thiserror 1.0.69",
"wgpu-hal", "wgpu-hal",
"wgpu-types", "wgpu-types",
] ]
@ -5464,7 +5473,7 @@ dependencies = [
"renderdoc-sys", "renderdoc-sys",
"rustc-hash", "rustc-hash",
"smallvec", "smallvec",
"thiserror 1.0.64", "thiserror 1.0.69",
"wasm-bindgen", "wasm-bindgen",
"web-sys", "web-sys",
"wgpu-types", "wgpu-types",
@ -6019,10 +6028,9 @@ dependencies = [
"eframe", "eframe",
"egui", "egui",
"egui-video", "egui-video",
"egui_inbox",
"ehttp 0.5.0", "ehttp 0.5.0",
"enostr", "enostr",
"itertools 0.13.0", "itertools 0.14.0",
"log", "log",
"nostr", "nostr",
"nostrdb", "nostrdb",

12
Cargo.toml
View File

@ -7,18 +7,16 @@ edition = "2021"
crate-type = ["lib", "cdylib"] crate-type = ["lib", "cdylib"]
[features] [features]
default = ["notedeck"] default = []
notedeck = ["dep:notedeck", "dep:notedeck-chrome", "dep:enostr"]
[dependencies] [dependencies]
tokio = { version = "1.40.0", features = ["fs", "rt-multi-thread", "rt"] } tokio = { version = "1.40.0", features = ["fs", "rt-multi-thread", "rt"] }
egui = { version = "0.29.1", default-features = false, features = [] } egui = { version = "0.29.1", default-features = false, features = [] }
log = "0.4.22" log = "0.4.22"
pretty_env_logger = "0.5.0" pretty_env_logger = "0.5.0"
egui_inbox = "0.6.0"
bech32 = "0.11.0" bech32 = "0.11.0"
anyhow = "^1.0.91" anyhow = "^1.0.91"
itertools = "0.13.0" itertools = "0.14.0"
serde = { version = "1.0.214", features = ["derive"] } serde = { version = "1.0.214", features = ["derive"] }
directories = "5.0.1" directories = "5.0.1"
egui-video = { git = "https://github.com/v0l/egui-video.git", rev = "d2ea3b4db21eb870a207db19e4cd21c7d1d24836" } egui-video = { git = "https://github.com/v0l/egui-video.git", rev = "d2ea3b4db21eb870a207db19e4cd21c7d1d24836" }
@ -26,9 +24,9 @@ egui-video = { git = "https://github.com/v0l/egui-video.git", rev = "d2ea3b4db21
# notedeck stuff # notedeck stuff
nostr = { version = "0.37.0", default-features = false, features = ["std", "nip49"] } nostr = { version = "0.37.0", default-features = false, features = ["std", "nip49"] }
nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "2111948b078b24a1659d0bd5d8570f370269c99b" } nostrdb = { git = "https://github.com/damus-io/nostrdb-rs", rev = "2111948b078b24a1659d0bd5d8570f370269c99b" }
notedeck-chrome = { git = "https://github.com/damus-io/notedeck", rev = "06417ff69e772f24ffd7fb2b025f879463d8c51f", package = "notedeck_chrome", optional = true } notedeck-chrome = { git = "https://github.com/damus-io/notedeck", rev = "06417ff69e772f24ffd7fb2b025f879463d8c51f", package = "notedeck_chrome" }
notedeck = { git = "https://github.com/damus-io/notedeck", rev = "06417ff69e772f24ffd7fb2b025f879463d8c51f", package = "notedeck", optional = true } notedeck = { git = "https://github.com/damus-io/notedeck", rev = "06417ff69e772f24ffd7fb2b025f879463d8c51f", package = "notedeck" }
enostr = { git = "https://github.com/damus-io/notedeck", rev = "06417ff69e772f24ffd7fb2b025f879463d8c51f", package = "enostr", optional = true } enostr = { git = "https://github.com/damus-io/notedeck", rev = "06417ff69e772f24ffd7fb2b025f879463d8c51f", package = "enostr" }
poll-promise = "0.3.0" poll-promise = "0.3.0"
ehttp = "0.5.0" ehttp = "0.5.0"

1
src/route/mod.rs
View File

@ -2,7 +2,6 @@ use crate::link::NostrLink;
use crate::services::ffmpeg_loader::FfmpegLoader; use crate::services::ffmpeg_loader::FfmpegLoader;
use egui::load::SizedTexture; use egui::load::SizedTexture;
use egui::{Context, Image, TextureHandle}; use egui::{Context, Image, TextureHandle};
use egui_inbox::RequestRepaintTrait;
use enostr::EventClientMessage; use enostr::EventClientMessage;
use itertools::Itertools; use itertools::Itertools;
use log::{info, warn}; use log::{info, warn};