Merge pull request #279 from onur/remove-sources-path

Remove sources path and fix Vagrant vm

Author: QuietMisdreavus

Cargo.lock

@@ -47,7 +47,7 @@ Vagrant.configure("2") do |config|
     ############################################################
     lxc-attach -n cratesfyi-container -- apt-get update
     lxc-attach -n cratesfyi-container -- apt-get install -y --no-install-recommends curl ca-certificates binutils gcc libc6-dev libmagic1
-    lxc-attach -n cratesfyi-container -- su - cratesfyi -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2018-10-20'
+    lxc-attach -n cratesfyi-container -- su - cratesfyi -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly'
 
     ############################################################
     # Installing extra targets into cratesfyi-container        #

Vagrantfile

@@ -2,7 +2,7 @@
 use super::DocBuilder;
 use super::crates::crates_from_path;
 use super::metadata::Metadata;
-use utils::{get_package, source_path, copy_dir, copy_doc_dir,
+use utils::{get_package, source_path, copy_doc_dir,
             update_sources, parse_rustc_version, command_result};
 use db::{connect_db, add_package_into_database, add_build_into_database, add_path_into_database};
 use cargo::core::Package;
@@ -181,19 +181,6 @@ impl DocBuilder {
     }
 
 
-    /// Copies source files of a package into source_path
-    #[allow(dead_code)]  // I've been using this function before storing files in database
-    fn copy_sources(&self, package: &Package) -> Result<()> {
-        debug!("Copying sources");
-        let destination =
-            PathBuf::from(&self.options.sources_path).join(format!("{}/{}",
-                                                                   package.manifest().name(),
-                                                                   package.manifest().version()));
-        // unwrap is safe here, this function will be always called after get_package
-        copy_dir(source_path(&package).unwrap(), &destination)
-    }
-
-
     /// Copies documentation to destination directory
     fn copy_documentation(&self,
                           package: &Package,

src/docbuilder/chroot_builder.rs

@@ -13,7 +13,6 @@ pub struct DocBuilderOptions {
     pub chroot_user: String,
     pub container_name: String,
     pub crates_io_index_path: PathBuf,
-    pub sources_path: PathBuf,
     pub skip_if_exists: bool,
     pub skip_if_log_exists: bool,
     pub skip_oldest_versions: bool,
@@ -28,15 +27,14 @@ impl Default for DocBuilderOptions {
 
         let cwd = env::current_dir().unwrap();
 
-        let (prefix, destination, chroot_path, crates_io_index_path, sources_path) =
+        let (prefix, destination, chroot_path, crates_io_index_path) =
             generate_paths(cwd);
 
         DocBuilderOptions {
             prefix: prefix,
             destination: destination,
             chroot_path: chroot_path,
             crates_io_index_path: crates_io_index_path,
-            sources_path: sources_path,
 
             chroot_user: "cratesfyi".to_string(),
             container_name: "cratesfyi-container".to_string(),
@@ -57,13 +55,12 @@ impl fmt::Debug for DocBuilderOptions {
         write!(f,
                "DocBuilderOptions {{ destination: {:?}, chroot_path: {:?}, \
                 crates_io_index_path: {:?}, \
-                sources_path: {:?}, container_name: {:?}, chroot_user: {:?}, \
+                container_name: {:?}, chroot_user: {:?}, \
                 keep_build_directory: {:?}, skip_if_exists: {:?}, \
                 skip_if_log_exists: {:?}, debug: {:?} }}",
                self.destination,
                self.chroot_path,
                self.crates_io_index_path,
-               self.sources_path,
                self.container_name,
                self.chroot_user,
                self.keep_build_directory,
@@ -77,14 +74,13 @@ impl fmt::Debug for DocBuilderOptions {
 impl DocBuilderOptions {
     /// Creates new DocBuilderOptions from prefix
     pub fn from_prefix(prefix: PathBuf) -> DocBuilderOptions {
-        let (prefix, destination, chroot_path, crates_io_index_path, sources_path) =
+        let (prefix, destination, chroot_path, crates_io_index_path) =
             generate_paths(prefix);
         DocBuilderOptions {
             prefix: prefix,
             destination: destination,
             chroot_path: chroot_path,
             crates_io_index_path: crates_io_index_path,
-            sources_path: sources_path,
 
             ..Default::default()
         }
@@ -101,21 +97,17 @@ impl DocBuilderOptions {
         if !self.crates_io_index_path.exists() {
             bail!("crates.io-index path '{}' does not exist", self.crates_io_index_path.display());
         }
-        if !self.sources_path.exists() {
-            bail!("sources path '{}' does not exist", self.sources_path.display());
-        }
         Ok(())
     }
 }
 
 
 
-fn generate_paths(prefix: PathBuf) -> (PathBuf, PathBuf, PathBuf, PathBuf, PathBuf) {
+fn generate_paths(prefix: PathBuf) -> (PathBuf, PathBuf, PathBuf, PathBuf) {
 
     let destination = PathBuf::from(&prefix).join("documentations");
     let chroot_path = PathBuf::from(&prefix).join("cratesfyi-container/rootfs");
     let crates_io_index_path = PathBuf::from(&prefix).join("crates.io-index");
-    let sources_path = PathBuf::from(&prefix).join("sources");
 
-    (prefix, destination, chroot_path, crates_io_index_path, sources_path)
+    (prefix, destination, chroot_path, crates_io_index_path)
 }

src/docbuilder/options.rs

@@ -5,7 +5,6 @@ use rustc_serialize::json::Json;
 use super::page::Page;
 use super::pool::Pool;
 use time;
-use db::connect_db;
 
 pub fn sitemap_handler(req: &mut Request) -> IronResult<Response> {
     let conn = extension!(req, Pool);