Implement private AndroidFormatter for AndroidSink

Author: SpriteOvO

spdlog/src/formatter/android_formatter.rs

@@ -0,0 +1,75 @@
+// TODO: Remove this file, use `PatternFormatter` instead
+//
+// Need to keep waiting for conditional space and brackets to be supported in
+// pattern template strings (optional fields require these, e.g. `logger_name`)
+
+use std::fmt::{self, Write};
+
+use cfg_if::cfg_if;
+
+use crate::{
+    formatter::{Formatter, FormatterContext},
+    Error, Record, StringBuf,
+};
+
+#[derive(Clone)]
+pub(crate) struct AndroidFormatter {}
+
+impl AndroidFormatter {
+    #[must_use]
+    pub(crate) fn new() -> Self {
+        Self {}
+    }
+
+    fn format_impl(
+        &self,
+        record: &Record,
+        dest: &mut StringBuf,
+        _ctx: &mut FormatterContext,
+    ) -> Result<(), fmt::Error> {
+        cfg_if! {
+            if #[cfg(not(feature = "flexible-string"))] {
+                dest.reserve(crate::string_buf::RESERVE_SIZE);
+            }
+        }
+
+        if let Some(logger_name) = record.logger_name() {
+            dest.write_str("[")?;
+            dest.write_str(logger_name)?;
+            dest.write_str("] ")?;
+        }
+
+        if let Some(srcloc) = record.source_location() {
+            dest.write_str("[")?;
+            dest.write_str(srcloc.module_path())?;
+            dest.write_str(", ")?;
+            dest.write_str(srcloc.file())?;
+            dest.write_str(":")?;
+            write!(dest, "{}", srcloc.line())?;
+            dest.write_str("] ")?;
+        }
+
+        dest.write_str(record.payload())?;
+
+        record.key_values().write_to(dest, true)?;
+        Ok(())
+    }
+}
+
+impl Formatter for AndroidFormatter {
+    fn format(
+        &self,
+        record: &Record,
+        dest: &mut StringBuf,
+        ctx: &mut FormatterContext,
+    ) -> crate::Result<()> {
+        self.format_impl(record, dest, ctx)
+            .map_err(Error::FormatRecord)
+    }
+}
+
+impl Default for AndroidFormatter {
+    fn default() -> Self {
+        Self::new()
+    }
+}

spdlog/src/formatter/mod.rs

@@ -51,6 +51,11 @@
 //! [`SinkPropAccess::set_formatter`]: crate::sink::SinkPropAccess::set_formatter
 //! [./examples]: https://github.com/SpriteOvO/spdlog-rs/tree/main/spdlog/examples
 
+#[cfg(any(
+    all(target_os = "android", feature = "native", feature = "android_log"),
+    all(doc, not(doctest))
+))]
+mod android_formatter;
 mod full_formatter;
 #[cfg(any(
     all(target_os = "linux", feature = "native", feature = "libsystemd"),
@@ -65,6 +70,11 @@ mod unreachable_formatter;
 
 use std::ops::Range;
 
+#[cfg(any(
+    all(target_os = "android", feature = "native", feature = "android_log"),
+    all(doc, not(doctest))
+))]
+pub(crate) use android_formatter::*;
 use dyn_clone::*;
 pub use full_formatter::*;
 #[cfg(any(

spdlog/src/sink/android_sink.rs

@@ -3,7 +3,7 @@ use std::{ffi::CString, io, ptr::null, result::Result as StdResult};
 use libc::EPERM;
 
 use crate::{
-    formatter::{Formatter, FormatterContext},
+    formatter::{AndroidFormatter, Formatter, FormatterContext},
     prelude::*,
     sink::{GetSinkProp, Sink, SinkProp},
     Error, ErrorHandler, Record, Result, StringBuf,
@@ -184,7 +184,7 @@ impl AndroidSink {
     /// | Parameter       | Default Value               |
     /// |-----------------|-----------------------------|
     /// | [level_filter]  | `All`                       |
-    /// | [formatter]     | `FullFormatter`             |
+    /// | [formatter]     | `AndroidFormatter`          |
     /// | [error_handler] | [`ErrorHandler::default()`] |
     /// |                 |                             |
     /// | [tag]           | `AndroidSink::Default`      |
@@ -196,8 +196,11 @@ impl AndroidSink {
     /// [tag]: AndroidSinkBuilder::tag
     #[must_use]
     pub fn builder() -> AndroidSinkBuilder {
+        let prop = SinkProp::default();
+        prop.set_formatter(AndroidFormatter::new());
+
         AndroidSinkBuilder {
-            prop: SinkProp::default(),
+            prop,
             tag: AndroidLogTag::Default,
         }
     }