Skip to content

Commit 3ac2170

Browse files
committed
Change domain name to option
1 parent f7ce9cc commit 3ac2170

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

installer-downloader/src/ui_downloader.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@ impl<Delegate: AppDelegate, Downloader: AppDownloader + Send + 'static> AppDownl
130130

131131
/// Implementation of [fetch::ProgressUpdater] that updates some [AppDelegate].
132132
pub struct UiProgressUpdater<Delegate: AppDelegate> {
133-
domain: String,
133+
domain: Option<String>,
134134
prev_progress: Option<u32>,
135135
queue: Delegate::Queue,
136136
}
137137

138138
impl<Delegate: AppDelegate> UiProgressUpdater<Delegate> {
139139
pub fn new(queue: Delegate::Queue) -> Self {
140140
Self {
141-
domain: "unknown source".to_owned(),
141+
domain: None,
142142
prev_progress: None,
143143
queue,
144144
}
@@ -161,9 +161,13 @@ impl<Delegate: AppDelegate> UiProgressUpdater<Delegate> {
161161
format!(
162162
"{} {}... ({complete_percentage}%)",
163163
resource::DOWNLOADING_DESC_PREFIX,
164-
self.domain
164+
self.domain()
165165
)
166166
}
167+
168+
fn domain(&self) -> &str {
169+
self.domain.as_deref().unwrap_or("unknown source")
170+
}
167171
}
168172

169173
impl<Delegate: AppDelegate + 'static> fetch::ProgressUpdater for UiProgressUpdater<Delegate> {
@@ -201,6 +205,6 @@ impl<Delegate: AppDelegate + 'static> fetch::ProgressUpdater for UiProgressUpdat
201205
// Parse out domain name
202206
let url = url.strip_prefix("https://").unwrap_or(url);
203207
let (domain, _) = url.split_once('/').unwrap_or((url, ""));
204-
self.domain = domain.to_owned();
208+
self.domain = Some(domain.to_owned());
205209
}
206210
}

0 commit comments

Comments
 (0)