@@ -5,7 +5,6 @@ use crate::config::{LogLevel, CONFIG};
55use crate :: error:: InferaError ;
66use crate :: log;
77use sha2:: { Digest , Sha256 } ;
8- use std:: env;
98use std:: fs:: { self , File } ;
109use std:: io;
1110use std:: path:: { Path , PathBuf } ;
@@ -71,15 +70,16 @@ fn get_cached_files_by_access_time() -> Result<Vec<(PathBuf, SystemTime, u64)>,
7170 }
7271
7372 let mut files = Vec :: new ( ) ;
74- for entry in fs:: read_dir ( & dir) . map_err ( |e| InferaError :: IoError ( e. to_string ( ) ) ) ? {
75- if let Ok ( entry) = entry {
76- let path = entry. path ( ) ;
77- if path. is_file ( ) && path. extension ( ) . and_then ( |s| s. to_str ( ) ) == Some ( "onnx" ) {
78- if let Ok ( metadata) = fs:: metadata ( & path) {
79- let accessed = metadata. accessed ( ) . unwrap_or_else ( |_| SystemTime :: now ( ) ) ;
80- let size = metadata. len ( ) ;
81- files. push ( ( path, accessed, size) ) ;
82- }
73+ for entry in fs:: read_dir ( & dir)
74+ . map_err ( |e| InferaError :: IoError ( e. to_string ( ) ) ) ?
75+ . flatten ( )
76+ {
77+ let path = entry. path ( ) ;
78+ if path. is_file ( ) && path. extension ( ) . and_then ( |s| s. to_str ( ) ) == Some ( "onnx" ) {
79+ if let Ok ( metadata) = fs:: metadata ( & path) {
80+ let accessed = metadata. accessed ( ) . unwrap_or_else ( |_| SystemTime :: now ( ) ) ;
81+ let size = metadata. len ( ) ;
82+ files. push ( ( path, accessed, size) ) ;
8383 }
8484 }
8585 }
@@ -127,14 +127,15 @@ pub(crate) fn clear_cache() -> Result<(), InferaError> {
127127 if !dir. exists ( ) {
128128 return Ok ( ( ) ) ;
129129 }
130- for entry in fs:: read_dir ( & dir) . map_err ( |e| InferaError :: IoError ( e. to_string ( ) ) ) ? {
131- if let Ok ( entry) = entry {
132- let path = entry. path ( ) ;
133- if path. is_file ( ) {
134- fs:: remove_file ( & path) . map_err ( |e| InferaError :: IoError ( e. to_string ( ) ) ) ?;
135- } else if path. is_dir ( ) {
136- fs:: remove_dir_all ( & path) . map_err ( |e| InferaError :: IoError ( e. to_string ( ) ) ) ?;
137- }
130+ for entry in fs:: read_dir ( & dir)
131+ . map_err ( |e| InferaError :: IoError ( e. to_string ( ) ) ) ?
132+ . flatten ( )
133+ {
134+ let path = entry. path ( ) ;
135+ if path. is_file ( ) {
136+ fs:: remove_file ( & path) . map_err ( |e| InferaError :: IoError ( e. to_string ( ) ) ) ?;
137+ } else if path. is_dir ( ) {
138+ fs:: remove_dir_all ( & path) . map_err ( |e| InferaError :: IoError ( e. to_string ( ) ) ) ?;
138139 }
139140 }
140141 Ok ( ( ) )
@@ -276,6 +277,7 @@ fn download_file(url: &str, dest: &Path, timeout_secs: u64) -> Result<(), Infera
276277mod tests {
277278 use super :: * ;
278279 use mockito:: Server ;
280+ use std:: env; // moved here: used in tests only
279281 use std:: thread;
280282 use tiny_http:: { Header , Response , Server as TinyServer } ;
281283
0 commit comments