Merge pull request #441 from rekka/feat-433-test-local-cache-tar-bundle

Test local cache and tar bundle

Author: pkgw

Cargo.lock

@@ -70,4 +70,8 @@ serialization = ["serde"]
 # libz-sys = "^1.0"
 
 [dev-dependencies]
+futures = "0.1"
+headers = "0.2"
+hyper = "0.12"
 tempfile = "^3.1"
+tokio = "0.1.22"

Cargo.toml

@@ -1,7 +1,8 @@
 // Copyright 2019 the Tectonic Project
 // Licensed under the MIT License.
 
-use app_dirs::{AppDataType, AppDirsError};
+use crate::errors::Result;
+use app_dirs::AppDataType;
 use std::path::PathBuf;
 
 pub use app_dirs::sanitized;
@@ -11,14 +12,14 @@ const APP_INFO: app_dirs::AppInfo = app_dirs::AppInfo {
     author: "TectonicProject",
 };
 
-pub fn user_config() -> Result<PathBuf, AppDirsError> {
-    app_dirs::app_root(AppDataType::UserConfig, &APP_INFO)
+pub fn user_config() -> Result<PathBuf> {
+    Ok(app_dirs::app_root(AppDataType::UserConfig, &APP_INFO)?)
 }
 
-pub fn get_user_config() -> Result<PathBuf, AppDirsError> {
-    app_dirs::get_app_root(AppDataType::UserConfig, &APP_INFO)
+pub fn get_user_config() -> Result<PathBuf> {
+    Ok(app_dirs::get_app_root(AppDataType::UserConfig, &APP_INFO)?)
 }
 
-pub fn user_cache_dir(path: &str) -> Result<PathBuf, AppDirsError> {
-    app_dirs::app_dir(AppDataType::UserCache, &APP_INFO, path)
+pub fn user_cache_dir(path: &str) -> Result<PathBuf> {
+    Ok(app_dirs::app_dir(AppDataType::UserCache, &APP_INFO, path)?)
 }

src/app_dirs.rs

@@ -125,6 +125,7 @@ fn inner(
         sess_builder.bundle(Box::new(config.make_cached_url_provider(
             &u,
             only_cached,
+            None,
             status,
         )?));
     } else {

src/bin/tectonic.rs

@@ -10,14 +10,16 @@
 //! running the command-line client. So we begrudgingly have a *little*
 //! configuration.
 
+use error_chain::bail;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 use std::ffi::OsStr;
-use std::fs::File;
-use std::path::PathBuf;
+use std::fs::{self, File};
+use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicBool, Ordering};
 
 use crate::app_dirs;
+use crate::ctry;
 use crate::errors::{ErrorKind, Result};
 use crate::io::itarbundle::{HttpITarIoFactory, ITarBundle};
 use crate::io::local_cache::LocalCache;
@@ -110,18 +112,19 @@ impl PersistentConfig {
         &self,
         url: &str,
         only_cached: bool,
+        custom_cache_root: Option<&Path>,
         status: &mut dyn StatusBackend,
     ) -> Result<Box<dyn Bundle>> {
         let itb = ITarBundle::<HttpITarIoFactory>::new(url);
 
-        let mut url2digest_path = app_dirs::user_cache_dir("urls")?;
+        let mut url2digest_path = cache_dir("urls", custom_cache_root)?;
         url2digest_path.push(app_dirs::sanitized(url));
 
         let bundle = LocalCache::<ITarBundle<HttpITarIoFactory>>::new(
             itb,
             &url2digest_path,
-            &app_dirs::user_cache_dir("manifests")?,
-            &app_dirs::user_cache_dir("files")?,
+            &cache_dir("manifests", custom_cache_root)?,
+            &cache_dir("files", custom_cache_root)?,
             only_cached,
             status,
         )?;
@@ -134,8 +137,6 @@ impl PersistentConfig {
         file_path: &OsStr,
         _status: &mut dyn StatusBackend,
     ) -> Result<Box<dyn Bundle>> {
-        use std::path::Path;
-
         let zip_bundle = ZipBundle::<File>::open(Path::new(file_path))?;
 
         Ok(Box::new(zip_bundle) as _)
@@ -172,7 +173,7 @@ impl PersistentConfig {
             return Ok(Box::new(zip_bundle) as _);
         }
         let bundle =
-            self.make_cached_url_provider(&self.default_bundles[0].url, only_cached, status)?;
+            self.make_cached_url_provider(&self.default_bundles[0].url, only_cached, None, status)?;
         Ok(Box::new(bundle) as _)
     }
 
@@ -194,3 +195,16 @@ impl Default for PersistentConfig {
         }
     }
 }
+
+fn cache_dir(path: &str, custom_cache_root: Option<&Path>) -> Result<PathBuf> {
+    if let Some(root) = custom_cache_root {
+        if !root.is_dir() {
+            bail!("Custom cache path {} is not a directory", root.display());
+        }
+        let full_path = root.join(path);
+        ctry!(fs::create_dir_all(&full_path); "failed to create directory {}", full_path.display());
+        Ok(full_path)
+    } else {
+        app_dirs::user_cache_dir(path)
+    }
+}