admin::render_readmes: Extract file-not-found case of find_file_by_path

Author: nipunn1313

src/admin/render_readmes.rs

@@ -203,15 +203,17 @@ fn render_pkg_readme<R: Read>(mut archive: Archive<R>, pkg_name: &str) -> Option
 
     let manifest: Manifest = {
         let path = format!("{}/Cargo.toml", pkg_name);
-        let contents = find_file_by_path(&mut entries, Path::new(&path), pkg_name);
+        let contents = find_file_by_path(&mut entries, Path::new(&path), pkg_name)
+            .unwrap_or_else(|| panic!("[{}] couldn't open file: Cargo.toml", pkg_name));
         toml::from_str(&contents)
             .unwrap_or_else(|_| panic!("[{}] Syntax error in manifest file", pkg_name))
     };
 
     let rendered = {
         let readme_path = manifest.package.readme.as_ref()?;
         let path = format!("{}/{}", pkg_name, readme_path);
-        let contents = find_file_by_path(&mut entries, Path::new(&path), pkg_name);
+        let contents = find_file_by_path(&mut entries, Path::new(&path), pkg_name)
+            .unwrap_or_else(|| panic!("[{}] couldn't open file: {}", pkg_name, readme_path));
         text_to_html(
             &contents,
             readme_path,
@@ -237,7 +239,7 @@ fn find_file_by_path<R: Read>(
     entries: &mut tar::Entries<'_, R>,
     path: &Path,
     pkg_name: &str,
-) -> String {
+) -> Option<String> {
     let mut file = entries
         .find(|entry| match *entry {
             Err(_) => false,
@@ -248,14 +250,13 @@ fn find_file_by_path<R: Read>(
                 };
                 filepath == path
             }
-        })
-        .unwrap_or_else(|| panic!("[{}] couldn't open file: {}", pkg_name, path.display()))
+        })?
         .unwrap_or_else(|_| panic!("[{}] file is not present: {}", pkg_name, path.display()));
 
     let mut contents = String::new();
     file.read_to_string(&mut contents)
         .unwrap_or_else(|_| panic!("[{}] Couldn't read file contents", pkg_name));
-    contents
+    Some(contents)
 }
 
 #[cfg(test)]