fix(DiskTokenStorage): make DiskTokenStorage::new() return a Result<>

dermesser · Apr 25, 2016 · ae5e94b · ae5e94b
1 parent 2cb5250
commit ae5e94b
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/storage.rs b/src/storage.rs
@@ -113,16 +113,25 @@ pub struct DiskTokenStorage {
 }
 
 impl DiskTokenStorage {
-    pub fn new(location: &String) -> DiskTokenStorage {
+    pub fn new(location: &String) -> Result<DiskTokenStorage, io::Error> {
         use std::fs;
         let mut dts = DiskTokenStorage {
             location: location.clone(),
             tokens: HashMap::new(),
         };
 
         // best-effort
-        let _ = dts.load_from_file();
-        dts
+        let read_result = dts.load_from_file();
+
+        match read_result {
+            Result::Ok(()) => Result::Ok(dts),
+            Result::Err(e) => {
+                match e.kind() {
+                    io::ErrorKind::NotFound => Result::Ok(dts), // File not found; ignore and create new one
+                    _ => Result::Err(e), // e.g. PermissionDenied
+                }
+            }
+        }
     }
 
     fn load_from_file(&mut self) -> Result<(), io::Error> {