From 89aad4b9649971f2d3113700d1a8f74b942f54f9 Mon Sep 17 00:00:00 2001 From: lifegpc Date: Mon, 30 May 2022 10:57:52 +0000 Subject: [PATCH] Remove unneeded RwLock --- src/opthelper.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/opthelper.rs b/src/opthelper.rs index d3e0439..ffb110d 100644 --- a/src/opthelper.rs +++ b/src/opthelper.rs @@ -21,7 +21,7 @@ pub struct OptHelper { opt: RwLock, /// Settings settings: RwLock, - default_retry_interval: RwLock>, + default_retry_interval: NonTailList, _author_name_filters: RwLock>, _use_progress_bar: RwLock>, } @@ -57,9 +57,6 @@ impl OptHelper { } pub fn update(&self, opt: CommandOpts, settings: SettingStore) { - let mut l = NonTailList::default(); - l += Duration::new(3, 0); - self.default_retry_interval.replace_with2(l); if settings.have("author-name-filters") { self._author_name_filters.replace_with2(AuthorNameFilter::from_json(settings.get("author-name-filters").unwrap()).unwrap()); } @@ -103,7 +100,7 @@ impl OptHelper { let v = self.settings.get_ref().get("retry-interval").unwrap(); return parse_retry_interval_from_json(v).unwrap(); } - self.default_retry_interval.get_ref().clone() + self.default_retry_interval.clone() } /// Return whether to use data from webpage first. @@ -161,10 +158,12 @@ impl OptHelper { impl Default for OptHelper { fn default() -> Self { + let mut l = NonTailList::default(); + l += Duration::new(3, 0); Self { opt: RwLock::new(CommandOpts::default()), settings: RwLock::new(SettingStore::default()), - default_retry_interval: RwLock::new(NonTailList::default()), + default_retry_interval: l, _author_name_filters: RwLock::new(Vec::new()), _use_progress_bar: RwLock::new(None), }