π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Share FRB logging adapter
Manav Rathif36f5a2d7fe9
diff --git a/rust/Cargo.lock b/rust/Cargo.lockindex 4ab691a439..e77a531550 100644--- a/rust/Cargo.lock+++ b/rust/Cargo.lock@@ -2453,6 +2453,14 @@ dependencies = ["uuid",]+[[package]]+name = "ente-frb-log"+version = "0.0.0"+dependencies = [+ "flutter_rust_bridge",+ "log",+]+[[package]]name = "ente-image"version = "0.0.0"@@ -2644,10 +2652,10 @@ dependencies = [name = "ente_photos_rust"version = "0.0.0"dependencies = [+ "ente-frb-log","ente-image","ente-photos","flutter_rust_bridge",- "log",][[package]]@@ -2657,8 +2665,8 @@ dependencies = ["ente-accounts","ente-contacts","ente-core",+ "ente-frb-log","flutter_rust_bridge",- "log",][[package]]diff --git a/rust/Cargo.toml b/rust/Cargo.tomlindex 3d2aa3a858..02ec3fc6c3 100644--- a/rust/Cargo.toml+++ b/rust/Cargo.toml@@ -5,6 +5,7 @@ members = ["apps/codegen","apps/ensu/src-tauri","bindings/frb/ente-rust",+ "bindings/frb/log","bindings/frb/photos","bindings/napi/photos","bindings/uniffi/cast",@@ -32,6 +33,7 @@ ente-assets = { path = "crates/assets" }ente-contacts = { path = "crates/contacts" }ente-core = { path = "crates/core" }ente-ensu = { path = "crates/ensu" }+ente-frb-log = { path = "bindings/frb/log" }ente-image = { path = "crates/image" }ente-paste = { path = "crates/paste" }ente-photos = { path = "crates/photos" }diff --git a/rust/bindings/frb/ente-rust/Cargo.toml b/rust/bindings/frb/ente-rust/Cargo.tomlindex 7ef262d009..1fef786422 100644--- a/rust/bindings/frb/ente-rust/Cargo.toml+++ b/rust/bindings/frb/ente-rust/Cargo.toml@@ -9,8 +9,8 @@ crate-type = ["cdylib", "staticlib"]ente-accounts.workspace = trueente-contacts.workspace = trueente-core.workspace = true+ente-frb-log.workspace = trueflutter_rust_bridge.workspace = true-log.workspace = true[features]default = []diff --git a/rust/bindings/frb/ente-rust/src/api/log.rs b/rust/bindings/frb/ente-rust/src/api/log.rsindex c2affcd727..8719b5f7ae 100644--- a/rust/bindings/frb/ente-rust/src/api/log.rs+++ b/rust/bindings/frb/ente-rust/src/api/log.rs@@ -1,98 +1 @@-use std::sync::atomic::{AtomicU64, Ordering};-use std::sync::{Mutex, Once};--use flutter_rust_bridge::frb;--use crate::frb_generated::StreamSink;--#[derive(Clone, Copy)]-pub enum LogLevel {- Error,- Warn,- Info,-}--pub struct LogEntry {- pub level: LogLevel,- pub target: String,- pub message: String,-}--static NEXT_SINK_ID: AtomicU64 = AtomicU64::new(0);-static SINKS: Mutex<Vec<(u64, StreamSink<LogEntry>)>> = Mutex::new(Vec::new());-static LOGGER: StreamLogger = StreamLogger;-static LOGGER_INIT: Once = Once::new();--struct StreamLogger;--#[frb(opaque)]-pub struct LogSinkGuard {- id: u64,-}--impl LogSinkGuard {- #[frb(sync)]- pub fn new() -> Self {- Self {- id: NEXT_SINK_ID.fetch_add(1, Ordering::Relaxed),- }- }-- pub fn attach_log_stream(&self, sink: StreamSink<LogEntry>) {- SINKS.lock().unwrap().push((self.id, sink));- log::set_max_level(log::LevelFilter::Info);- }-}--impl Drop for LogSinkGuard {- fn drop(&mut self) {- let _sink = {- let mut sinks = SINKS.lock().unwrap();- sinks- .iter()- .position(|(id, _)| *id == self.id)- .map(|index| sinks.remove(index).1)- };- }-}--impl log::Log for StreamLogger {- fn enabled(&self, metadata: &log::Metadata) -> bool {- metadata.level() <= log::Level::Info- }-- fn log(&self, record: &log::Record) {- if !self.enabled(record.metadata()) {- return;- }- let level = match record.level() {- log::Level::Error => LogLevel::Error,- log::Level::Warn => LogLevel::Warn,- log::Level::Info => LogLevel::Info,- log::Level::Debug | log::Level::Trace => return,- };- let mut sinks = SINKS.lock().unwrap();- while let Some((_, sink)) = sinks.first() {- if sink- .add(LogEntry {- level,- target: record.target().to_string(),- message: record.args().to_string(),- })- .is_ok()- {- break;- }- sinks.remove(0);- }- }-- fn flush(&self) {}-}--pub(crate) fn install() {- LOGGER_INIT.call_once(|| {- log::set_logger(&LOGGER).expect("Rust logger already initialized");- log::set_max_level(log::LevelFilter::Info);- });-}+ente_frb_log::setup!();diff --git a/rust/bindings/frb/log/Cargo.toml b/rust/bindings/frb/log/Cargo.tomlnew file mode 100644index 0000000000..185ab7b998--- /dev/null+++ b/rust/bindings/frb/log/Cargo.toml@@ -0,0 +1,7 @@+[package]+name = "ente-frb-log"+edition = "2024"++[dependencies]+flutter_rust_bridge.workspace = true+log.workspace = truediff --git a/rust/bindings/frb/log/src/lib.rs b/rust/bindings/frb/log/src/lib.rsnew file mode 100644index 0000000000..4b0aad12d6--- /dev/null+++ b/rust/bindings/frb/log/src/lib.rs@@ -0,0 +1,108 @@+#[macro_export]+macro_rules! setup {+ () => {+ use std::sync::atomic::{AtomicU64, Ordering};+ use std::sync::{Mutex, Once};++ use $crate::__flutter_rust_bridge::frb;++ use crate::frb_generated::StreamSink;++ #[derive(Clone, Copy)]+ pub enum LogLevel {+ Error,+ Warn,+ Info,+ }++ pub struct LogEntry {+ pub level: LogLevel,+ pub target: String,+ pub message: String,+ }++ static NEXT_SINK_ID: AtomicU64 = AtomicU64::new(0);+ static SINKS: Mutex<Vec<(u64, StreamSink<LogEntry>)>> = Mutex::new(Vec::new());+ static LOGGER: StreamLogger = StreamLogger;+ static LOGGER_INIT: Once = Once::new();++ struct StreamLogger;++ #[frb(opaque)]+ pub struct LogSinkGuard {+ id: u64,+ }++ impl LogSinkGuard {+ #[frb(sync)]+ pub fn new() -> Self {+ Self {+ id: NEXT_SINK_ID.fetch_add(1, Ordering::Relaxed),+ }+ }++ pub fn attach_log_stream(&self, sink: StreamSink<LogEntry>) {+ SINKS.lock().unwrap().push((self.id, sink));+ $crate::__log::set_max_level($crate::__log::LevelFilter::Info);+ }+ }++ impl Drop for LogSinkGuard {+ fn drop(&mut self) {+ let _sink = {+ let mut sinks = SINKS.lock().unwrap();+ sinks+ .iter()+ .position(|(id, _)| *id == self.id)+ .map(|index| sinks.remove(index).1)+ };+ }+ }++ impl $crate::__log::Log for StreamLogger {+ fn enabled(&self, metadata: &$crate::__log::Metadata) -> bool {+ metadata.level() <= $crate::__log::Level::Info+ }++ fn log(&self, record: &$crate::__log::Record) {+ if !self.enabled(record.metadata()) {+ return;+ }+ let level = match record.level() {+ $crate::__log::Level::Error => LogLevel::Error,+ $crate::__log::Level::Warn => LogLevel::Warn,+ $crate::__log::Level::Info => LogLevel::Info,+ $crate::__log::Level::Debug | $crate::__log::Level::Trace => return,+ };+ let mut sinks = SINKS.lock().unwrap();+ while let Some((_, sink)) = sinks.first() {+ if sink+ .add(LogEntry {+ level,+ target: record.target().to_string(),+ message: record.args().to_string(),+ })+ .is_ok()+ {+ break;+ }+ sinks.remove(0);+ }+ }++ fn flush(&self) {}+ }++ pub(crate) fn install() {+ LOGGER_INIT.call_once(|| {+ $crate::__log::set_logger(&LOGGER).expect("Rust logger already initialized");+ $crate::__log::set_max_level($crate::__log::LevelFilter::Info);+ });+ }+ };+}++#[doc(hidden)]+pub use flutter_rust_bridge as __flutter_rust_bridge;+#[doc(hidden)]+pub use log as __log;diff --git a/rust/bindings/frb/photos/Cargo.toml b/rust/bindings/frb/photos/Cargo.tomlindex ff5430877e..c077a5d970 100644--- a/rust/bindings/frb/photos/Cargo.toml+++ b/rust/bindings/frb/photos/Cargo.toml@@ -6,10 +6,10 @@ edition = "2024"crate-type = ["cdylib", "staticlib"][dependencies]+ente-frb-log.workspace = trueente-image.workspace = trueente-photos = { workspace = true, features = ["usearch"] }flutter_rust_bridge.workspace = true-log.workspace = true[lints.rust]unexpected_cfgs = { level = "warn", check-cfg = ['cfg(frb_expand)'] }diff --git a/rust/bindings/frb/photos/src/api/log.rs b/rust/bindings/frb/photos/src/api/log.rsindex c2affcd727..8719b5f7ae 100644--- a/rust/bindings/frb/photos/src/api/log.rs+++ b/rust/bindings/frb/photos/src/api/log.rs@@ -1,98 +1 @@-use std::sync::atomic::{AtomicU64, Ordering};-use std::sync::{Mutex, Once};--use flutter_rust_bridge::frb;--use crate::frb_generated::StreamSink;--#[derive(Clone, Copy)]-pub enum LogLevel {- Error,- Warn,- Info,-}--pub struct LogEntry {- pub level: LogLevel,- pub target: String,- pub message: String,-}--static NEXT_SINK_ID: AtomicU64 = AtomicU64::new(0);-static SINKS: Mutex<Vec<(u64, StreamSink<LogEntry>)>> = Mutex::new(Vec::new());-static LOGGER: StreamLogger = StreamLogger;-static LOGGER_INIT: Once = Once::new();--struct StreamLogger;--#[frb(opaque)]-pub struct LogSinkGuard {- id: u64,-}--impl LogSinkGuard {- #[frb(sync)]- pub fn new() -> Self {- Self {- id: NEXT_SINK_ID.fetch_add(1, Ordering::Relaxed),- }- }-- pub fn attach_log_stream(&self, sink: StreamSink<LogEntry>) {- SINKS.lock().unwrap().push((self.id, sink));- log::set_max_level(log::LevelFilter::Info);- }-}--impl Drop for LogSinkGuard {- fn drop(&mut self) {- let _sink = {- let mut sinks = SINKS.lock().unwrap();- sinks- .iter()- .position(|(id, _)| *id == self.id)- .map(|index| sinks.remove(index).1)- };- }-}--impl log::Log for StreamLogger {- fn enabled(&self, metadata: &log::Metadata) -> bool {- metadata.level() <= log::Level::Info- }-- fn log(&self, record: &log::Record) {- if !self.enabled(record.metadata()) {- return;- }- let level = match record.level() {- log::Level::Error => LogLevel::Error,- log::Level::Warn => LogLevel::Warn,- log::Level::Info => LogLevel::Info,- log::Level::Debug | log::Level::Trace => return,- };- let mut sinks = SINKS.lock().unwrap();- while let Some((_, sink)) = sinks.first() {- if sink- .add(LogEntry {- level,- target: record.target().to_string(),- message: record.args().to_string(),- })- .is_ok()- {- break;- }- sinks.remove(0);- }- }-- fn flush(&self) {}-}--pub(crate) fn install() {- LOGGER_INIT.call_once(|| {- log::set_logger(&LOGGER).expect("Rust logger already initialized");- log::set_max_level(log::LevelFilter::Info);- });-}+ente_frb_log::setup!();