@@ -3,9 +3,9 @@ use std::sync::nonpoison::Mutex;
33use async_trait:: async_trait;
44use client:: { app_state:: AppState , app_status:: AppStatus } ;
55use database:: {
6- DownloadableMetadata , GameDownloadStatus , GameVersion , borrow_db_checked, borrow_db_mut_checked,
6+ GameDownloadStatus , GameVersion , borrow_db_checked, borrow_db_mut_checked,
77} ;
8- use log:: { info , warn} ;
8+ use log:: warn;
99use process:: PROCESS_MANAGER ;
1010use remote:: utils:: DROP_APP_HANDLE ;
1111use tauri:: Manager ;
@@ -44,12 +44,9 @@ impl ScheduleTask for GameUpdater {
4444 let state = app_handle. state :: < Mutex < AppState > > ( ) ;
4545 {
4646 let state_lock = state. lock ( ) ;
47- match state_lock. status {
48- AppStatus :: Offline => {
49- self . no_internet = true ;
50- return Ok ( ( ) ) ;
51- }
52- _ => { }
47+ if state_lock. status == AppStatus :: Offline {
48+ self . no_internet = true ;
49+ return Ok ( ( ) ) ;
5350 } ;
5451 } ;
5552
@@ -58,7 +55,9 @@ impl ScheduleTask for GameUpdater {
5855 let to_check: Vec < GameVersion > = {
5956 let db_lock = borrow_db_checked ( ) ;
6057
61- let games = db_lock
58+
59+
60+ db_lock
6261 . applications
6362 . game_statuses
6463 . values ( )
@@ -67,17 +66,14 @@ impl ScheduleTask for GameUpdater {
6766 _ => None ,
6867 } )
6968 . map ( |v| {
70- v. map ( |version_id| db_lock. applications . game_versions . get ( version_id) )
71- . flatten ( )
69+ v. and_then ( |version_id| db_lock. applications . game_versions . get ( version_id) )
7270 } )
7371 . filter ( |v| {
7472 v. map ( |v| v. user_configuration . enable_updates )
7573 . unwrap_or ( false )
7674 } )
7775 . map ( |v| v. cloned ( ) . unwrap ( ) )
78- . collect ( ) ;
79-
80- games
76+ . collect ( )
8177 } ;
8278
8379 for version in to_check {
@@ -99,7 +95,7 @@ impl ScheduleTask for GameUpdater {
9995 . filter ( |v| process_manager_lock. valid_platform ( & v. platform ) )
10096 . collect ( ) ;
10197
102- let latest = match valid_options. get ( 0 ) {
98+ let latest = match valid_options. first ( ) {
10399 Some ( v) => v,
104100 None => {
105101 warn ! ( "found no versions for game id: {}" , version. game_id) ;
@@ -113,13 +109,10 @@ impl ScheduleTask for GameUpdater {
113109 . get_mut ( & version. game_id )
114110 . ok_or ( anyhow:: anyhow!( "" ) ) ?;
115111
116- match game_status {
117- GameDownloadStatus :: Installed {
112+ if let GameDownloadStatus :: Installed {
118113 update_available, ..
119- } => {
120- * update_available = latest. version_id != version. version_id ;
121- }
122- _ => ( ) ,
114+ } = game_status {
115+ * update_available = latest. version_id != version. version_id ;
123116 } ;
124117 }
125118
0 commit comments