@@ -63,23 +63,17 @@ impl Downloader {
6363 if self . should_download ( file_info) . await ? {
6464 match self . download_file ( file_info) . await {
6565 Ok ( _) => {
66- let filename = std:: path:: Path :: new ( & file_info. name ) . file_name ( )
67- . and_then ( |name| name. to_str ( ) )
68- . unwrap_or ( "unknown_file" ) ;
66+ let filename = std:: path:: Path :: new ( & file_info. name ) . file_name ( ) . and_then ( |name| name. to_str ( ) ) . unwrap_or ( "unknown_file" ) ;
6967 info ! ( "✅ Successfully downloaded: {}" , filename) ;
7068 downloaded_files. push ( filename. to_string ( ) ) ;
7169 }
7270 Err ( e) => {
73- let filename = std:: path:: Path :: new ( & file_info. name ) . file_name ( )
74- . and_then ( |name| name. to_str ( ) )
75- . unwrap_or ( "unknown_file" ) ;
71+ let filename = std:: path:: Path :: new ( & file_info. name ) . file_name ( ) . and_then ( |name| name. to_str ( ) ) . unwrap_or ( "unknown_file" ) ;
7672 error ! ( "❌ Failed to download {}: {}" , filename, e) ;
7773 }
7874 }
7975 } else {
80- let filename = std:: path:: Path :: new ( & file_info. name ) . file_name ( )
81- . and_then ( |name| name. to_str ( ) )
82- . unwrap_or ( "unknown_file" ) ;
76+ let filename = std:: path:: Path :: new ( & file_info. name ) . file_name ( ) . and_then ( |name| name. to_str ( ) ) . unwrap_or ( "unknown_file" ) ;
8377 info ! ( "✅ Already have latest version of: {}" , filename) ;
8478 downloaded_files. push ( filename. to_string ( ) ) ;
8579 }
@@ -152,16 +146,14 @@ impl Downloader {
152146 . filter ( |f| f. name . ends_with ( ".xml.gz" ) )
153147 . map ( |f| {
154148 let filename = f. name . strip_prefix ( S3_PREFIX ) . unwrap_or ( & f. name ) ;
155- S3FileInfo {
156- name : filename. to_string ( ) ,
157- size : f. size ,
158- }
149+ S3FileInfo { name : filename. to_string ( ) , size : f. size }
159150 } )
160151 . collect ( ) ;
161152
162153 debug ! ( "Version {} has {} data files" , id, data_files. len( ) ) ;
163154
164- if data_files. len ( ) == 4 { // We expect exactly 4 data files
155+ if data_files. len ( ) == 4 {
156+ // We expect exactly 4 data files
165157 info ! ( "📅 Using version {} with {} data files" , id, data_files. len( ) ) ;
166158 return Ok ( data_files) ;
167159 }
@@ -173,9 +165,7 @@ impl Downloader {
173165
174166 async fn should_download ( & self , file_info : & S3FileInfo ) -> Result < bool > {
175167 // Extract just the base filename for local checks
176- let filename = std:: path:: Path :: new ( & file_info. name ) . file_name ( )
177- . and_then ( |name| name. to_str ( ) )
178- . unwrap_or ( "unknown_file" ) ;
168+ let filename = std:: path:: Path :: new ( & file_info. name ) . file_name ( ) . and_then ( |name| name. to_str ( ) ) . unwrap_or ( "unknown_file" ) ;
179169 let local_path = self . output_directory . join ( filename) ;
180170
181171 // Check if file exists locally
@@ -209,11 +199,9 @@ impl Downloader {
209199 }
210200
211201 async fn download_file ( & mut self , file_info : & S3FileInfo ) -> Result < ( ) > {
212- let s3_key = & file_info. name ; // file_info.name is already the full S3 key
202+ let s3_key = & file_info. name ; // file_info.name is already the full S3 key
213203 // Extract just the base filename for local storage (remove path components)
214- let filename = std:: path:: Path :: new ( & file_info. name ) . file_name ( )
215- . and_then ( |name| name. to_str ( ) )
216- . unwrap_or ( "unknown_file" ) ;
204+ let filename = std:: path:: Path :: new ( & file_info. name ) . file_name ( ) . and_then ( |name| name. to_str ( ) ) . unwrap_or ( "unknown_file" ) ;
217205 let local_path = self . output_directory . join ( filename) ;
218206
219207 info ! ( "⬇️ Downloading {} ({:.2} MB)..." , filename, file_info. size as f64 / 1_048_576.0 ) ;
@@ -228,7 +216,13 @@ impl Downloader {
228216 ) ;
229217
230218 // Download using AWS SDK (equivalent to boto3 download_fileobj)
231- let response = self . s3_client . get_object ( ) . bucket ( S3_BUCKET ) . key ( s3_key) . send ( ) . await
219+ let response = self
220+ . s3_client
221+ . get_object ( )
222+ . bucket ( S3_BUCKET )
223+ . key ( s3_key)
224+ . send ( )
225+ . await
232226 . with_context ( || format ! ( "Failed to start S3 download for key: {}" , s3_key) ) ?;
233227
234228 let body = response. body . collect ( ) . await . context ( "Failed to read S3 response" ) ?;
0 commit comments