Move all code that deals with files table to db::file

Author: Mark-Simulacrum

src/db/file.rs

@@ -8,7 +8,7 @@
 use std::path::{PathBuf, Path};
 use postgres::Connection;
 use rustc_serialize::json::{Json, ToJson};
-use std::fs::File;
+use std::fs;
 use std::io::Read;
 use error::Result;
 use failure::err_msg;
@@ -52,6 +52,32 @@ pub fn get_file_list<P: AsRef<Path>>(path: P) -> Result<Vec<PathBuf>> {
     Ok(files)
 }
 
+pub struct Blob {
+    pub path: String,
+    pub mime: String,
+    pub date_added: time::Timespec,
+    pub date_updated: time::Timespec,
+    pub content: Vec<u8>,
+}
+
+pub fn get_path(conn: &Connection, path: &str) -> Option<Blob> {
+    let rows = conn.query("SELECT path, mime, date_added, date_updated, content
+                           FROM files
+                           WHERE path = $1", &[&path]).unwrap();
+
+    if rows.len() == 0 {
+        None
+    } else {
+        let row = rows.get(0);
+        Some(Blob {
+            path: row.get(0),
+            mime: row.get(1),
+            date_added: row.get(2),
+            date_updated: row.get(3),
+            content: row.get(4),
+        })
+    }
+}
 
 /// Adds files into database and returns list of files with their mime type in Json
 pub fn add_path_into_database<P: AsRef<Path>>(conn: &Connection,
@@ -71,7 +97,7 @@ pub fn add_path_into_database<P: AsRef<Path>>(conn: &Connection,
             let path = Path::new(path.as_ref()).join(&file_path);
             // Some files have insufficient permissions (like .lock file created by cargo in
             // documentation directory). We are skipping this files.
-            let mut file = match File::open(path) {
+            let mut file = match fs::File::open(path) {
                 Ok(f) => f,
                 Err(_) => continue,
             };

src/db/mod.rs

@@ -12,7 +12,7 @@ use r2d2;
 use r2d2_postgres;
 
 mod add_package;
-mod file;
+pub mod file;
 mod migrate;
 
 

src/web/file.rs

@@ -5,59 +5,35 @@ use time;
 use postgres::Connection;
 use iron::{Handler, Request, IronResult, Response, IronError};
 use iron::status;
+use crate::db;
 
 
-pub struct File {
-    pub path: String,
-    pub mime: String,
-    pub date_added: time::Timespec,
-    pub date_updated: time::Timespec,
-    pub content: Vec<u8>,
-}
-
+pub struct File(pub db::file::Blob);
 
 impl File {
     /// Gets file from database
     pub fn from_path(conn: &Connection, path: &str) -> Option<File> {
-
-        let rows = conn.query("SELECT path, mime, date_added, date_updated, content
-                               FROM files
-                               WHERE path = $1",
-                   &[&path])
-            .unwrap();
-
-        if rows.len() == 0 {
-            None
-        } else {
-            let row = rows.get(0);
-            Some(File {
-                path: row.get(0),
-                mime: row.get(1),
-                date_added: row.get(2),
-                date_updated: row.get(3),
-                content: row.get(4),
-            })
-        }
+        Some(File(db::file::get_path(conn, path)?))
     }
 
 
     /// Consumes File and creates a iron response
     pub fn serve(self) -> Response {
         use iron::headers::{CacheControl, LastModified, CacheDirective, HttpDate, ContentType};
 
-        let mut response = Response::with((status::Ok, self.content));
+        let mut response = Response::with((status::Ok, self.0.content));
         let cache = vec![CacheDirective::Public,
                          CacheDirective::MaxAge(super::STATIC_FILE_CACHE_DURATION as u32)];
-        response.headers.set(ContentType(self.mime.parse().unwrap()));
+        response.headers.set(ContentType(self.0.mime.parse().unwrap()));
         response.headers.set(CacheControl(cache));
-        response.headers.set(LastModified(HttpDate(time::at(self.date_updated))));
+        response.headers.set(LastModified(HttpDate(time::at(self.0.date_updated))));
         response
     }
 
 
     /// Checks if mime type of file is "application/x-empty"
     pub fn is_empty(&self) -> bool {
-        self.mime == "application/x-empty"
+        self.0.mime == "application/x-empty"
     }
 }
 

src/web/rustdoc.rs

@@ -222,7 +222,7 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
 
     let mut content = RustdocPage::default();
 
-    let file_content = ctry!(String::from_utf8(file.content));
+    let file_content = ctry!(String::from_utf8(file.0.content));
 
     let (head, body, mut body_class) = ctry!(utils::extract_head_and_body(&file_content));
     content.head = head;

src/web/source.rs

@@ -222,10 +222,10 @@ pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
 
     let (content, is_rust_source) = if let Some(file) = file {
         // serve the file with DatabaseFileHandler if file isn't text and not empty
-        if !file.mime.starts_with("text") && !file.is_empty() {
+        if !file.0.mime.starts_with("text") && !file.is_empty() {
             return Ok(file.serve());
-        } else if file.mime.starts_with("text") && !file.is_empty() {
-            (String::from_utf8(file.content).ok(), file.path.ends_with(".rs"))
+        } else if file.0.mime.starts_with("text") && !file.is_empty() {
+            (String::from_utf8(file.0.content).ok(), file.0.path.ends_with(".rs"))
         } else {
             (None, false)
         }