From 3f8f1701207b34155c92df94ec1a144eed703161 Mon Sep 17 00:00:00 2001
From: CrLF0710 <crlf0710@gmail.com>
Date: Wed, 15 Aug 2018 02:08:41 +0800
Subject: [PATCH 1/2] Implement configuration for automatic local bundle
 loading.

---
 src/config.rs | 43 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 3f67c8c8d..e90c7745d 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -14,14 +14,16 @@ use std::io::{Read, Write};
 use std::io::ErrorKind as IoErrorKind;
 use std::fs::File;
 use std::path::PathBuf;
+use std::ffi::OsStr;
 
 use app_dirs::{app_dir, app_root, get_app_root, sanitized, AppDataType};
 use toml;
 
 use errors::{ErrorKind, Result};
-use io::Bundle;
 use io::itarbundle::{HttpITarIoFactory, ITarBundle};
 use io::local_cache::LocalCache;
+use io::zipbundle::ZipBundle;
+use io::Bundle;
 use status::StatusBackend;
 
 
@@ -40,7 +42,6 @@ pub struct BundleInfo {
     url: String,
 }
 
-
 impl PersistentConfig {
     pub fn open(auto_create_config_file: bool) -> Result<PersistentConfig> {
         let mut cfg_path = if auto_create_config_file {
@@ -74,27 +75,55 @@ impl PersistentConfig {
         Ok(config)
     }
 
-    pub fn make_cached_url_provider(&self, url: &str, status: &mut StatusBackend) -> Result<LocalCache<ITarBundle<HttpITarIoFactory>>> {
+    pub fn make_cached_url_provider(&self, url: &str, status: &mut StatusBackend) -> Result<Box<Bundle>> {
         let itb = ITarBundle::<HttpITarIoFactory>::new(url);
 
         let mut url2digest_path = app_dir(AppDataType::UserCache, &::APP_INFO, "urls")?;
         url2digest_path.push(sanitized(url));
 
-        LocalCache::<ITarBundle<HttpITarIoFactory>>::new(
+        let bundle = LocalCache::<ITarBundle<HttpITarIoFactory>>::new(
             itb,
             &url2digest_path,
             &app_dir(AppDataType::UserCache, &::APP_INFO, "manifests")?,
             &app_dir(AppDataType::UserCache, &::APP_INFO, "files")?,
-            status
-        )
+            status,
+        )?;
+        
+        Ok(Box::new(bundle) as _)
+    }
+
+    pub fn make_local_file_provider(
+        &self,
+        file_path: &OsStr,
+        _status: &mut StatusBackend,
+    ) -> Result<Box<Bundle>> {
+        use std::path::Path;
+
+        let zip_bundle = ZipBundle::<File>::open(Path::new(file_path))?;
+
+        Ok(Box::new(zip_bundle) as _)
     }
 
     pub fn default_bundle(&self, status: &mut StatusBackend) -> Result<Box<Bundle>> {
+        use std::io;
+        use hyper::Url;
+
         if self.default_bundles.len() != 1 {
             return Err(ErrorKind::Msg("exactly one default_bundle item must be specified (for now)".to_owned()).into());
         }
 
-        Ok(Box::new(self.make_cached_url_provider(&self.default_bundles[0].url, status)?))
+        let url = Url::parse(&self.default_bundles[0].url)
+            .map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "failed to parse url"))?;
+        if url.scheme() == "file" {
+            // load the local zip file.
+            let file_path = url.to_file_path()
+                .map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "failed to parse local path"))?;
+            let zip_bundle = self.make_local_file_provider(file_path.as_os_str(), status)?;
+
+            return Ok(Box::new(zip_bundle) as _);
+        }
+        let bundle = self.make_cached_url_provider(&self.default_bundles[0].url, status)?;
+		return Ok(Box::new(bundle) as _);
     }
 
     pub fn format_cache_path(&self) -> Result<PathBuf> {

From 6cddca53266fdfe094a20bc2e956c8f325ed2470 Mon Sep 17 00:00:00 2001
From: CrLF0710 <crlf0710@gmail.com>
Date: Sun, 19 Aug 2018 00:06:18 +0800
Subject: [PATCH 2/2] Add new unit test.

---
 tests/tex-outputs.rs           |   3 +++
 tests/tex-outputs/tex_logo.log |   3 +++
 tests/tex-outputs/tex_logo.pdf | Bin 0 -> 1844 bytes
 tests/tex-outputs/tex_logo.tex |   6 ++++++
 tests/tex-outputs/tex_logo.xdv | Bin 0 -> 228 bytes
 5 files changed, 12 insertions(+)
 create mode 100644 tests/tex-outputs/tex_logo.log
 create mode 100644 tests/tex-outputs/tex_logo.pdf
 create mode 100644 tests/tex-outputs/tex_logo.tex
 create mode 100644 tests/tex-outputs/tex_logo.xdv

diff --git a/tests/tex-outputs.rs b/tests/tex-outputs.rs
index 343ef50a1..96e3bf64d 100644
--- a/tests/tex-outputs.rs
+++ b/tests/tex-outputs.rs
@@ -194,6 +194,9 @@ fn md5_of_hello() { TestCase::new("md5_of_hello").check_pdf(true).go() }
 #[test]
 fn negative_roman_numeral() { TestCase::new("negative_roman_numeral").go() }
 
+#[test]
+fn tex_logo() { TestCase::new("tex_logo").go() }
+
 #[test]
 fn pdfoutput() { TestCase::new("pdfoutput").go() }
 
diff --git a/tests/tex-outputs/tex_logo.log b/tests/tex-outputs/tex_logo.log
new file mode 100644
index 000000000..aeabfb223
--- /dev/null
+++ b/tests/tex-outputs/tex_logo.log
@@ -0,0 +1,3 @@
+**
+(tex_logo.tex [1] )
+Output written on tex_logo.xdv (1 page, 228 bytes).
diff --git a/tests/tex-outputs/tex_logo.pdf b/tests/tex-outputs/tex_logo.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..640368f39225cd2b26ea1d4887e2eb81f095bd1e
GIT binary patch
literal 1844
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

literal 0
HcmV?d00001

diff --git a/tests/tex-outputs/tex_logo.tex b/tests/tex-outputs/tex_logo.tex
new file mode 100644
index 000000000..d3386b06e
--- /dev/null
+++ b/tests/tex-outputs/tex_logo.tex
@@ -0,0 +1,6 @@
+\def\makeatletter{\catcode `\@ 11\relax}%
+\makeatletter%
+\def\@{\spacefactor \@m {}}%
+\def\TeXlogo{T\kern -.1667em\lower .5ex\hbox {E}\kern -.125em X\@}%
+\TeXlogo%
+\bye
\ No newline at end of file
diff --git a/tests/tex-outputs/tex_logo.xdv b/tests/tex-outputs/tex_logo.xdv
new file mode 100644
index 0000000000000000000000000000000000000000..9d8dc0414a9bce1e9214de66a8d27bc6e5891b64
GIT binary patch
literal 228
zcmey)&e%NZfQ&T*5HP>sC`nB&$<ND7?gnxhL1Ki!e;{}-Qjn5nRgjpTTAW#xs*sYJ
zmROoo(mVeX14G{ere@<?y$k-fol)zZD8j(-nZf&GLL~zi&|DB^P0lScG*}(dJMmwr
z-Fzl>8P~pv%#SM~`ugTeFfjB^VtA3T*s!nX2T-XvvO}3>8{cBQdeEJLnSl|jkw1Yt
Jma*Rl0|2f7M0EfF

literal 0
HcmV?d00001