chore (log): replaced empty string with Option

pull/633/head
mellbacon 2 years ago
parent 8fce15a08b
commit 49cf3e4938
No known key found for this signature in database
GPG Key ID: 6E067A4847F23797

@ -167,7 +167,7 @@ pub struct Builder {
timezone_strategy: TimezoneStrategy, timezone_strategy: TimezoneStrategy,
max_file_size: u128, max_file_size: u128,
targets: Vec<LogTarget>, targets: Vec<LogTarget>,
log_name: String log_name: Option<String>,
} }
impl Default for Builder { impl Default for Builder {
@ -184,14 +184,14 @@ impl Default for Builder {
message message
)) ))
}); });
let log_name = "".to_owned(); let log_name = None;
Self { Self {
dispatch, dispatch,
rotation_strategy: DEFAULT_ROTATION_STRATEGY, rotation_strategy: DEFAULT_ROTATION_STRATEGY,
timezone_strategy: DEFAULT_TIMEZONE_STRATEGY, timezone_strategy: DEFAULT_TIMEZONE_STRATEGY,
max_file_size: DEFAULT_MAX_FILE_SIZE, max_file_size: DEFAULT_MAX_FILE_SIZE,
targets: DEFAULT_LOG_TARGETS.into(), targets: DEFAULT_LOG_TARGETS.into(),
log_name log_name,
} }
} }
} }
@ -284,7 +284,7 @@ impl Builder {
/// ///
/// ``` /// ```
pub fn log_name(mut self, log_name: &str) -> Self { pub fn log_name(mut self, log_name: &str) -> Self {
self.log_name = log_name.to_owned(); self.log_name = Some(log_name.to_string());
self self
} }
@ -310,12 +310,12 @@ impl Builder {
plugin::Builder::new("log") plugin::Builder::new("log")
.invoke_handler(tauri::generate_handler![log]) .invoke_handler(tauri::generate_handler![log])
.setup(move |app_handle| { .setup(move |app_handle| {
let log_name = if !self.log_name.is_empty() { let name = self
&self.log_name .log_name
} .clone()
else { .unwrap_or_else(|| app_handle.package_info().name.clone());
&app_handle.package_info().name let log_name = name.as_str();
};
// setup targets // setup targets
for target in &self.targets { for target in &self.targets {
self.dispatch = self.dispatch.chain(match target { self.dispatch = self.dispatch.chain(match target {

Loading…
Cancel
Save