Skip to content

Commit 41b6707

Browse files
IMB11IMB11
committed
fix: rev
1 parent 03c311b commit 41b6707

5 files changed

Lines changed: 62 additions & 68 deletions

File tree

‎apps/app/src/api/ads.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ const ADS_USER_AGENT: &str = concat!(
3333
);
3434

3535
fn emit_ads_consent_required(required: bool) {
36-
if let Ok(events) = EventState::get() {
37-
events.send(AppEvent::AdsConsentRequired(required)).ok();
38-
}
36+
EventState::get()
37+
.send(AppEvent::AdsConsentRequired(required))
38+
.ok();
3939
}
4040

4141
#[cfg(windows)]

‎packages/app-lib/src/event/emit.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ pub async fn init_loading_unsafe(
6161
total: f64,
6262
title: &str,
6363
) -> crate::Result<LoadingBarId> {
64-
let event_state = crate::EventState::get()?;
64+
let event_state = crate::EventState::get();
6565
let key = LoadingBarId(Uuid::new_v4());
6666

6767
event_state.loading_bars.insert(
@@ -105,7 +105,7 @@ pub fn emit_loading(
105105
increment_frac: f64,
106106
message: Option<&str>,
107107
) -> crate::Result<()> {
108-
let event_state = crate::EventState::get()?;
108+
let event_state = crate::EventState::get();
109109

110110
let Some(mut loading_bar) = event_state.loading_bars.get_mut(&key.0) else {
111111
return Err(EventError::NoLoadingBar(key.0).into());
@@ -156,7 +156,7 @@ pub fn emit_loading(
156156
pub async fn emit_warning(message: &str) -> crate::Result<()> {
157157
#[cfg(feature = "tauri")]
158158
{
159-
let event_state = crate::EventState::get()?;
159+
let event_state = crate::EventState::get();
160160
event_state.send(AppEvent::Warning(WarningPayload {
161161
message: message.to_string(),
162162
}))?;
@@ -171,7 +171,7 @@ pub async fn emit_instance_bulk_update_progress(
171171
) -> crate::Result<()> {
172172
#[cfg(feature = "tauri")]
173173
{
174-
let event_state = crate::EventState::get()?;
174+
let event_state = crate::EventState::get();
175175
event_state.send(AppEvent::InstanceBulkUpdateProgress(payload))?;
176176
}
177177
Ok(())
@@ -184,7 +184,7 @@ pub async fn emit_command(command: CommandPayload) -> crate::Result<()> {
184184
tracing::debug!("Command: {}", serde_json::to_string(&command)?);
185185
#[cfg(feature = "tauri")]
186186
{
187-
let event_state = crate::EventState::get()?;
187+
let event_state = crate::EventState::get();
188188
event_state.send(AppEvent::Command(command))?;
189189

190190
if let Some(window) = event_state.app.get_window("main") {
@@ -204,7 +204,7 @@ pub async fn emit_process(
204204
) -> crate::Result<()> {
205205
#[cfg(feature = "tauri")]
206206
{
207-
let event_state = crate::EventState::get()?;
207+
let event_state = crate::EventState::get();
208208
event_state.send(AppEvent::Process(ProcessPayload {
209209
instance_id: instance_id.to_string(),
210210
uuid: uuid.to_string(),
@@ -223,7 +223,7 @@ pub async fn emit_instance(
223223
) -> crate::Result<()> {
224224
#[cfg(feature = "tauri")]
225225
{
226-
let event_state = crate::EventState::get()?;
226+
let event_state = crate::EventState::get();
227227
event_state.send(AppEvent::Instance(InstancePayload {
228228
instance_id: instance_id.to_string(),
229229
event,
@@ -236,7 +236,7 @@ pub async fn emit_instance(
236236
pub async fn emit_friend(payload: FriendPayload) -> crate::Result<()> {
237237
#[cfg(feature = "tauri")]
238238
{
239-
let event_state = crate::EventState::get()?;
239+
let event_state = crate::EventState::get();
240240
event_state.send(AppEvent::Friend(payload))?;
241241
}
242242

@@ -247,7 +247,7 @@ pub async fn emit_friend(payload: FriendPayload) -> crate::Result<()> {
247247
pub async fn emit_notification(payload: Value) -> crate::Result<()> {
248248
#[cfg(feature = "tauri")]
249249
{
250-
let event_state = crate::EventState::get()?;
250+
let event_state = crate::EventState::get();
251251
event_state
252252
.send(AppEvent::Notification(serde_json::to_string(&payload)?))?;
253253
}

‎packages/app-lib/src/event/mod.rs‎

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,11 @@ impl EventState {
6060
.cloned()
6161
}
6262

63-
pub fn get() -> crate::Result<Arc<Self>> {
64-
Ok(EVENT_STATE.get().ok_or(EventError::NotInitialized)?.clone())
63+
pub fn get() -> Arc<Self> {
64+
EVENT_STATE
65+
.get()
66+
.expect("should be initialized when used")
67+
.clone()
6568
}
6669

6770
#[cfg(feature = "tauri")]
@@ -78,15 +81,15 @@ impl EventState {
7881
// Values provided should not be used directly, as they are clones and are not guaranteed to be up-to-date
7982
pub async fn list_progress_bars() -> crate::Result<DashMap<Uuid, LoadingBar>>
8083
{
81-
let value = Self::get()?;
84+
let value = Self::get();
8285
Ok(value.loading_bars.clone())
8386
}
8487

8588
#[cfg(feature = "tauri")]
8689
pub async fn get_main_window() -> crate::Result<Option<tauri::WebviewWindow>>
8790
{
8891
use tauri::Manager;
89-
let value = Self::get()?;
92+
let value = Self::get();
9093
Ok(value.app.get_webview_window("main"))
9194
}
9295
}
@@ -225,42 +228,40 @@ impl Drop for LoadingBarId {
225228
fn drop(&mut self) {
226229
let loader_uuid = self.0;
227230
tokio::spawn(async move {
228-
if let Ok(event_state) = EventState::get() {
229-
#[cfg(any(feature = "tauri", feature = "cli"))]
230-
if let Some((_, bar)) =
231-
event_state.loading_bars.remove(&loader_uuid)
231+
let event_state = EventState::get();
232+
#[cfg(any(feature = "tauri", feature = "cli"))]
233+
if let Some((_, bar)) =
234+
event_state.loading_bars.remove(&loader_uuid)
235+
{
236+
#[cfg(feature = "tauri")]
232237
{
233-
#[cfg(feature = "tauri")]
234-
{
235-
let loader_uuid = bar.loading_bar_uuid;
236-
let event = bar.bar_type.clone();
237-
let fraction = bar.current / bar.total;
238-
239-
let _ = event_state.send(AppEvent::Loading(
240-
LoadingPayload {
241-
fraction: None,
242-
message: "Completed".to_string(),
243-
event,
244-
loader_uuid: loader_uuid.to_string(),
245-
},
246-
));
247-
tracing::trace!(
248-
"Exited at {fraction} for loading bar: {:?}",
249-
loader_uuid
250-
);
251-
}
252-
253-
// Emit event to indicatif progress bar arc
254-
#[cfg(feature = "cli")]
255-
{
256-
let cli_progress_bar = bar.cli_progress_bar;
257-
cli_progress_bar.finish();
258-
}
238+
let loader_uuid = bar.loading_bar_uuid;
239+
let event = bar.bar_type.clone();
240+
let fraction = bar.current / bar.total;
241+
242+
let _ =
243+
event_state.send(AppEvent::Loading(LoadingPayload {
244+
fraction: None,
245+
message: "Completed".to_string(),
246+
event,
247+
loader_uuid: loader_uuid.to_string(),
248+
}));
249+
tracing::trace!(
250+
"Exited at {fraction} for loading bar: {:?}",
251+
loader_uuid
252+
);
259253
}
260254

261-
#[cfg(not(any(feature = "tauri", feature = "cli")))]
262-
event_state.loading_bars.remove(&loader_uuid);
255+
// Emit event to indicatif progress bar arc
256+
#[cfg(feature = "cli")]
257+
{
258+
let cli_progress_bar = bar.cli_progress_bar;
259+
cli_progress_bar.finish();
260+
}
263261
}
262+
263+
#[cfg(not(any(feature = "tauri", feature = "cli")))]
264+
event_state.loading_bars.remove(&loader_uuid);
264265
});
265266
}
266267
}
@@ -546,9 +547,6 @@ mod log_types {
546547

547548
#[derive(Debug, thiserror::Error)]
548549
pub enum EventError {
549-
#[error("Event state was not properly initialized")]
550-
NotInitialized,
551-
552550
#[error("Non-existent loading bar of key: {0}")]
553551
NoLoadingBar(Uuid),
554552

‎packages/app-lib/src/install/events.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ pub async fn emit_install_job(
201201
#[cfg(feature = "tauri")]
202202
{
203203
let result: crate::Result<()> = (|| {
204-
let event_state = crate::EventState::get()?;
204+
let event_state = crate::EventState::get();
205205
event_state.send(crate::event::AppEvent::InstallJob(
206206
std::sync::Arc::new(snapshot.clone()),
207207
))?;

‎packages/app-lib/src/state/process.rs‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -608,13 +608,11 @@ impl Process {
608608

609609
#[cfg(feature = "tauri")]
610610
{
611-
if let Ok(event_state) = crate::EventState::get() {
612-
let _ =
613-
event_state.send(crate::event::AppEvent::Log(LogPayload {
614-
instance_id: instance_id.to_string(),
615-
event: LogEvent::Log4j(event.clone()),
616-
}));
617-
}
611+
let event_state = crate::EventState::get();
612+
let _ = event_state.send(crate::event::AppEvent::Log(LogPayload {
613+
instance_id: instance_id.to_string(),
614+
event: LogEvent::Log4j(event.clone()),
615+
}));
618616
}
619617
#[cfg(not(feature = "tauri"))]
620618
{
@@ -627,15 +625,13 @@ impl Process {
627625

628626
#[cfg(feature = "tauri")]
629627
{
630-
if let Ok(event_state) = crate::EventState::get() {
631-
let _ =
632-
event_state.send(crate::event::AppEvent::Log(LogPayload {
633-
instance_id: instance_id.to_string(),
634-
event: LogEvent::Legacy {
635-
message: message.to_string(),
636-
},
637-
}));
638-
}
628+
let event_state = crate::EventState::get();
629+
let _ = event_state.send(crate::event::AppEvent::Log(LogPayload {
630+
instance_id: instance_id.to_string(),
631+
event: LogEvent::Legacy {
632+
message: message.to_string(),
633+
},
634+
}));
639635
}
640636
#[cfg(not(feature = "tauri"))]
641637
{

0 commit comments

Comments
 (0)