chore: upgrade version

chore: rename src/static to src/assets
feat: unzip zip file when unload
2026-04-09 09:09:03 +03:00 · 2022-05-30 16:06:31 +08:00 · 2022-05-30 14:32:41 +08:00 · 2022-05-30 14:30:08 +08:00 · 2022-05-30 12:40:57 +08:00 · 2022-05-30 12:31:29 +08:00
9 changed files with 395 additions and 286 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -296,7 +296,7 @@ dependencies = [

 [[package]]
 name = "duf"
-version = "0.4.0"
+version = "0.5.0"
 dependencies = [
 "async-walkdir",
 "async_zip",
@@ -306,6 +306,7 @@ dependencies = [
 "headers",
 "hyper",
 "log",
+ "mime_guess",
 "percent-encoding",
 "serde",
 "serde_json",
@@ -636,6 +637,16 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"

+[[package]]
+name = "mime_guess"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
 [[package]]
 name = "miniz_oxide"
 version = "0.5.1"
@@ -991,6 +1002,15 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"

+[[package]]
+name = "unicase"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+dependencies = [
+ "version_check",
+]
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "duf"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 authors = ["sigoden <sigoden@gmail.com>"]
 description = "Duf is a simple file server."
@@ -26,6 +26,7 @@ simple_logger = "2.1.0"
 async_zip = "0.0.7"
 async-walkdir = "0.2.0"
 headers = "0.3.7"
+mime_guess = "2.0.4"

 [profile.release]
 lto = true
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Duf is a simple file server.
 - Upload files
 - Delete files
 - Basic authentication
+- Unzip zip file when upload
 - Easy to use with curl

 ## Install
@@ -45,7 +46,7 @@ duf folder_name

 Only serve static files, disable editing operations such as update or delete
 ```
-duf --no-change
+duf --readonly
 ```

 Finally, run this command to see a list of all available option
@@ -71,6 +72,12 @@ Upload a file
 curl --upload-file some-file http://127.0.0.1:5000/some-file
 ```

+Unzip zip file when unload
+
+```
+curl --upload-file some-folder.zip http://127.0.0.1:5000/some-folder.zip?unzip
+```
+
 Delete a file/folder

 ```
--- a/src/args.rs
+++ b/src/args.rs
@@ -35,18 +35,23 @@ fn app() -> clap::Command<'static> {
                .help("Path to a directory for serving files"),
        )
        .arg(
-            Arg::new("no-change")
-                .short('C')
-                .long("no-change")
+            Arg::new("readonly")
+                .short('r')
+                .long("readonly")
                .help("Disable change operations such as update or delete"),
        )
        .arg(
            Arg::new("auth")
                .short('a')
                .long("auth")
-                .help("Authenticate with user and pass")
+                .help("Use HTTP authentication for all operations")
                .value_name("user:pass"),
        )
+        .arg(
+            Arg::new("no-auth-read")
+                .long("no-auth-read")
+                .help("Do not authenticate read operations like static serving"),
+        )
        .arg(
            Arg::new("cors")
                .long("cors")
@@ -65,6 +70,7 @@ pub struct Args {
    pub path: PathBuf,
    pub readonly: bool,
    pub auth: Option<String>,
+    pub no_auth_read: bool,
    pub cors: bool,
 }

@@ -78,9 +84,10 @@ impl Args {
        let port = matches.value_of_t::<u16>("port")?;
        let path = matches.value_of_os("path").unwrap_or_default();
        let path = Args::parse_path(path)?;
-        let readonly = matches.is_present("no-change");
+        let readonly = matches.is_present("readonly");
        let cors = matches.is_present("cors");
        let auth = matches.value_of("auth").map(|v| v.to_owned());
+        let no_auth_read = matches.is_present("no-auth-read");

        Ok(Args {
            address,
@@ -88,6 +95,7 @@ impl Args {
            path,
            readonly,
            auth,
+            no_auth_read,
            cors,
        })
    }
--- a/src/assets/index.css
+++ b/src/assets/index.css
@@ -8,6 +8,10 @@ body {
  width: 700px;
 }

+.hidden {
+  display: none;
+}
+
 .head {
  display: flex;
  flex-wrap: wrap;
@@ -115,7 +119,7 @@ body {

 .main .cell-size {
  text-align: right;
-  width: 60px;
+  width: 70px;
  padding-left: 0.6em;
 }

--- a/src/assets/index.html
+++ b/src/assets/index.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width" />
+  __SLOB__
+</head>
+<body>
+  <div class="head">
+    <div class="breadcrumb"></div>
+    <div class="toolbox">
+      <div>
+        <a href="?zip" title="Download folder as a .zip file">
+          <svg width="16" height="16" viewBox="0 0 16 16"><path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/><path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/></svg>
+        </a>
+      </div>
+      <div class="upload-control hidden" title="Upload file">
+        <label for="file">
+          <svg width="16" height="16" viewBox="0 0 16 16"><path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/><path d="M7.646 1.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1-.708.708L8.5 2.707V11.5a.5.5 0 0 1-1 0V2.707L5.354 4.854a.5.5 0 1 1-.708-.708l3-3z"/></svg>
+        </label>
+        <input type="file" id="file" name="file" multiple>
+      </div>
+    </div>
+    <form class="searchbar">
+      <div class="icon">
+        <svg width="16" height="16" fill="currentColor" viewBox="0 0 16 16"><path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z"/></svg>
+      </div>
+      <input id="search" name="q" type="text" maxlength="128" autocomplete="off" tabindex="1">
+      <input type="submit" hidden />
+    </form>
+  </div>
+  <div class="main">
+    <div class="uploaders">
+    </div>
+    <table>
+      <thead>
+        <tr>
+          <th class="cell-name">Name</th>
+          <th class="cell-mtime">Date modify</th>
+          <th class="cell-size">Size</th>
+          <th class="cell-actions">Actions</th>
+        </tr>
+      </thead>
+      <tbody>
+      </tbody>
+    </table>
+  </div>
+  <script>
+    window.addEventListener("DOMContentLoaded", ready);
+  </script>
+</body>
+</html>
--- a/src/assets/index.js
+++ b/src/assets/index.js
@@ -0,0 +1,191 @@
+var $toolbox, $tbody, $breadcrumb, $uploaders, $uploadControl;
+var uploaderIdx = 0;
+var baseDir;
+
+class Uploader {
+  idx = 0;
+  file;
+  $elem;
+  constructor(idx, file) {
+    this.idx = idx;
+    this.file = file;
+  }
+
+  upload() {
+    var { file, idx } = this;
+    var url = getUrl(file.name);
+    if (file.name == baseDir + ".zip") {
+      url += "?unzip";
+    }
+    $uploaders.insertAdjacentHTML("beforeend", `
+  <div class="uploader path">
+    <div><svg height="16" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M6 5H2V4h4v1zM2 8h7V7H2v1zm0 2h7V9H2v1zm0 2h7v-1H2v1zm10-7.5V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h7.5L12 4.5zM11 5L8 2H1v12h10V5z"></path></svg></div>
+    <a href="${url}" id="file${idx}">${file.name} (0%)</a>
+  </div>`);
+    this.$elem = document.getElementById(`file${idx}`);
+
+    var ajax = new XMLHttpRequest();
+    ajax.upload.addEventListener("progress", e => this.progress(e), false);
+    ajax.addEventListener("load", e => this.complete(e), false);
+    ajax.addEventListener("error", e => this.fail(e), false);
+    ajax.addEventListener("abort", e => this.fail(e), false);
+    ajax.open("PUT", url);
+    ajax.send(file);
+  }
+
+  progress(event) {
+    var percent = (event.loaded / event.total) * 100;
+    this.$elem.innerHTML = `${this.file.name} (${percent.toFixed(2)}%)`;
+  }
+
+  complete(event) {
+    this.$elem.innerHTML = `${this.file.name}`;
+  }
+
+  fail(event) {
+    this.$elem.innerHTML = `<strike>${this.file.name}</strike>`;
+  }
+}
+
+function addBreadcrumb(value) {
+  var parts = value.split("/").filter(v => !!v);
+  var len = parts.length;
+  var path = "";
+  for (var i = 0; i < len; i++) {
+    var name = parts[i];
+    if (i > 0) {
+      path  += "/" + name;
+    }
+    if (i === len - 1) {
+      $breadcrumb.insertAdjacentHTML("beforeend", `<b>${name}</b>`);
+      baseDir = name;
+    } else if (i === 0) {
+      $breadcrumb.insertAdjacentHTML("beforeend", `<a href="/"><b>${name}</b></a>`);
+    } else {
+      $breadcrumb.insertAdjacentHTML("beforeend", `<a href="${encodeURI(path)}">${name}</a>`);
+    }
+    $breadcrumb.insertAdjacentHTML("beforeend", `<span class="separator">/</span>`);
+  }
+}
+
+function addPath(file, index) {
+  var url = getUrl(file.name)
+  var actionDelete = "";
+  var actionDownload = "";
+  if (file.path_type.endsWith("Dir")) {
+    actionDownload = `
+    <div class="action-btn">
+      <a href="${url}?zip" title="Download folder as a .zip file">
+        <svg width="16" height="16" viewBox="0 0 16 16"><path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/><path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/></svg>
+      </a>
+    </div>`;
+  } else {
+    actionDownload = `
+    <div class="action-btn" >
+      <a href="${url}" title="Download file" download>
+        <svg width="16" height="16" viewBox="0 0 16 16"><path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/><path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/></svg>
+      </a>
+    </div>`;
+  }
+  if (!DATA.readonly) {
+    actionDelete = `
+    <div onclick="deletePath(${index})" class="action-btn" id="deleteBtn${index}" title="Delete ${file.name}">
+      <svg width="16" height="16" fill="currentColor"viewBox="0 0 16 16"><path d="M6.854 7.146a.5.5 0 1 0-.708.708L7.293 9l-1.147 1.146a.5.5 0 0 0 .708.708L8 9.707l1.146 1.147a.5.5 0 0 0 .708-.708L8.707 9l1.147-1.146a.5.5 0 0 0-.708-.708L8 8.293 6.854 7.146z"/><path d="M14 14V4.5L9.5 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2zM9.5 3A1.5 1.5 0 0 0 11 4.5h2V14a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h5.5v2z"/></svg>
+    </div>`;
+  }
+  var actionCell = `
+  <td class="cell-actions">
+    ${actionDownload}
+    ${actionDelete}
+  </td>`
+
+  $tbody.insertAdjacentHTML("beforeend", `
+<tr id="addPath${index}">
+<td class="path cell-name">
+  <div>${getSvg(file.path_type)}</div>
+  <a href="${url}" title="${file.name}">${file.name}</a>
+</td>
+<td class="cell-mtime">${formatMtime(file.mtime)}</td>
+<td class="cell-size">${formatSize(file.size)}</td>
+${actionCell}
+</tr>`)
+}
+
+async function deletePath(index) {
+  var file = DATA.paths[index];
+  if (!file) return;
+
+  var ajax = new XMLHttpRequest();
+  ajax.open("DELETE", getUrl(file.name));
+  ajax.addEventListener("readystatechange", function() {
+    if(ajax.readyState === 4 && ajax.status === 200) {
+        document.getElementById(`addPath${index}`).remove();
+    }
+  });
+  ajax.send();
+}
+
+function getUrl(name) {
+    var url = location.href.split('?')[0];
+    if (!url.endsWith("/")) url += "/";
+    url += encodeURI(name);
+    return url;
+}
+
+function getSvg(path_type) {
+  switch (path_type) {
+    case "Dir":
+      return `<svg height="16" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M13 4H7V3c0-.66-.31-1-1-1H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1zM6 4H1V3h5v1z"></path></svg>`;
+    case "File":
+      return `<svg height="16" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M6 5H2V4h4v1zM2 8h7V7H2v1zm0 2h7V9H2v1zm0 2h7v-1H2v1zm10-7.5V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h7.5L12 4.5zM11 5L8 2H1v12h10V5z"></path></svg>`;
+    case "SymlinkDir":
+      return `<svg height="16" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M13 4H7V3c0-.66-.31-1-1-1H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1zM1 3h5v1H1V3zm6 9v-2c-.98-.02-1.84.22-2.55.7-.71.48-1.19 1.25-1.45 2.3.02-1.64.39-2.88 1.13-3.73C4.86 8.43 5.82 8 7.01 8V6l4 3-4 3H7z"></path></svg>`;
+    default:
+      return `<svg height="16" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M8.5 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V4.5L8.5 1zM11 14H1V2h7l3 3v9zM6 4.5l4 3-4 3v-2c-.98-.02-1.84.22-2.55.7-.71.48-1.19 1.25-1.45 2.3.02-1.64.39-2.88 1.13-3.73.73-.84 1.69-1.27 2.88-1.27v-2H6z"></path></svg>`;
+  }
+}
+
+function formatMtime(mtime) {
+  if (!mtime) return ""
+  var date = new Date(mtime);
+  var year = date.getFullYear();
+  var month = padZero(date.getMonth() + 1, 2);
+  var day = padZero(date.getDate(), 2);
+  var hours = padZero(date.getHours(), 2);
+  var minutes = padZero(date.getMinutes(), 2);
+  return `${year}/${month}/${day} ${hours}:${minutes}`;
+}
+
+function padZero(value, size) {
+  return ("0".repeat(size) + value).slice(-1 * size)
+}
+
+function formatSize(size) {
+  if (!size) return ""
+  var sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
+  if (size == 0) return '0 Byte';
+  var i = parseInt(Math.floor(Math.log(size) / Math.log(1024)));
+  return Math.round(size / Math.pow(1024, i), 2) + ' ' + sizes[i];
+}
+
+
+function ready() {
+  $toolbox = document.querySelector(".toolbox");
+  $tbody = document.querySelector(".main tbody");
+  $breadcrumb = document.querySelector(".breadcrumb");
+  $uploaders = document.querySelector(".uploaders");
+
+  addBreadcrumb(DATA.breadcrumb);
+  DATA.paths.forEach((file, index) => addPath(file, index));
+  if (!DATA.readonly) {
+    document.querySelector(".upload-control").classList.remove(["hidden"]);
+    document.getElementById("file").addEventListener("change", e => {
+      var files = e.target.files;
+      for (var file of files) {
+        uploaderIdx += 1;
+        var uploader = new Uploader(uploaderIdx, file);
+        uploader.upload();
+      }
+    });
+  }
+}
--- a/src/index.html
+++ b/src/index.html
@@ -1,246 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width" />
-  <title>Duf</title>
-  __STYLE__
-</head>
-<body>
-  <div class="head">
-    <div class="breadcrumb"></div>
-    <div class="toolbox">
-      <div>
-        <a href="?zip" title="Download folder as a .zip file">
-          <svg width="16" height="16" viewBox="0 0 16 16"><path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/><path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/></svg>
-        </a>
-      </div>
-    </div>
-    <form class="searchbar">
-      <div class="icon">
-        <svg width="16" height="16" fill="currentColor" viewBox="0 0 16 16"><path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z"/></svg>
-      </div>
-      <input id="search" name="q" type="text" maxlength="128" autocomplete="off" tabindex="1">
-      <input type="submit" hidden />
-    </form>
-  </div>
-  <div class="main">
-    <div class="uploaders">
-    </div>
-    <table>
-      <thead>
-        <tr>
-          <th class="cell-name">Name</th>
-          <th class="cell-mtime">Date modify</th>
-          <th class="cell-size">Size</th>
-          <th class="cell-actions">Actions</th>
-        </tr>
-      </thead>
-      <tbody>
-      </tbody>
-    </table>
-  </div>
-  <script>
-
-    const $toolbox = document.querySelector(".toolbox");
-    const $tbody = document.querySelector(".main tbody");
-    const $breadcrumb = document.querySelector(".breadcrumb");
-    const $uploaders = document.querySelector(".uploaders");
-    const $uploadControl = document.querySelector(".upload-control");
-    const { breadcrumb, paths, readonly } = __DATA__;
-    let uploaderIdx = 0;
-
-    class Uploader {
-      idx = 0;
-      file;
-      $elem;
-      constructor(idx, file) {
-        this.idx = idx;
-        this.file = file;
-      }
-
-      upload() {
-        const { file, idx } = this;
-        const url = getUrl(file.name);
-        $uploaders.insertAdjacentHTML("beforeend", `
-      <div class="uploader path">
-        <div><svg height="16" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M6 5H2V4h4v1zM2 8h7V7H2v1zm0 2h7V9H2v1zm0 2h7v-1H2v1zm10-7.5V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h7.5L12 4.5zM11 5L8 2H1v12h10V5z"></path></svg></div>
-        <a href="${url}" id="file${idx}">${file.name} (0%)</a>
-      </div>`);
-        this.$elem = document.getElementById(`file${idx}`);
-
-        const ajax = new XMLHttpRequest();
-        ajax.upload.addEventListener("progress", e => this.progress(e), false);
-        ajax.addEventListener("load", e => this.complete(e), false);
-        ajax.addEventListener("error", e => this.fail(e), false);
-        ajax.addEventListener("abort", e => this.fail(e), false);
-        ajax.open("PUT", url);
-        ajax.send(file);
-      }
-
-      progress(event) {
-        const percent = (event.loaded / event.total) * 100;
-        this.$elem.innerHTML = `${this.file.name} (${percent.toFixed(2)}%)`;
-      }
-
-      complete(event) {
-        this.$elem.innerHTML = `${this.file.name}`;
-      }
-
-      fail(event) {
-        this.$elem.innerHTML = `<strike>${this.file.name}</strike>`;
-      }
-    }
-
-    function addBreadcrumb(value) {
-      const parts = value.split("/").filter(v => !!v);
-      const len = parts.length;
-      let path = "";
-      for (let i = 0; i < len; i++) {
-        const name = parts[i];
-        if (i > 0) {
-          path  += "/" + name;
-        }
-        if (i === len - 1) {
-          $breadcrumb.insertAdjacentHTML("beforeend", `<b>${name}</b>`);
-        } else if (i === 0) {
-          $breadcrumb.insertAdjacentHTML("beforeend", `<a href="/"><b>${name}</b></a>`);
-        } else {
-          $breadcrumb.insertAdjacentHTML("beforeend", `<a href="${encodeURI(path)}">${name}</a>`);
-        }
-        $breadcrumb.insertAdjacentHTML("beforeend", `<span class="separator">/</span>`);
-      }
-    }
-
-    function addPath(file, index) {
-      const url = getUrl(file.name)
-      let actionDelete = "";
-      let actionDownload = "";
-      if (file.path_type.endsWith("Dir")) {
-        actionDownload = `
-        <div class="action-btn">
-          <a href="${url}?zip" title="Download folder as a .zip file">
-            <svg width="16" height="16" viewBox="0 0 16 16"><path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/><path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/></svg>
-          </a>
-        </div>`;
-      } else {
-        actionDownload = `
-        <div class="action-btn" >
-          <a href="${url}" title="Download file" download>
-            <svg width="16" height="16" viewBox="0 0 16 16"><path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/><path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/></svg>
-          </a>
-        </div>`;
-      }
-      if (!readonly) {
-        actionDelete = `
-        <div onclick="deletePath(${index})" class="action-btn" id="deleteBtn${index}" title="Delete ${file.name}">
-          <svg width="16" height="16" fill="currentColor"viewBox="0 0 16 16"><path d="M6.854 7.146a.5.5 0 1 0-.708.708L7.293 9l-1.147 1.146a.5.5 0 0 0 .708.708L8 9.707l1.146 1.147a.5.5 0 0 0 .708-.708L8.707 9l1.147-1.146a.5.5 0 0 0-.708-.708L8 8.293 6.854 7.146z"/><path d="M14 14V4.5L9.5 0H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2zM9.5 3A1.5 1.5 0 0 0 11 4.5h2V14a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h5.5v2z"/></svg>
-        </div>`;
-      }
-      const actionCell = `
-      <td class="cell-actions">
-        ${actionDownload}
-        ${actionDelete}
-      </td>`
-
-      $tbody.insertAdjacentHTML("beforeend", `
-  <tr id="addPath${index}">
-    <td class="path cell-name">
-      <div>${getSvg(file.path_type)}</div>
-      <a href="${url}" title="${file.name}">${file.name}</a>
-    </td>
-    <td class="cell-mtime">${formatMtime(file.mtime)}</td>
-    <td class="cell-size">${formatSize(file.size)}</td>
-    ${actionCell}
-  </tr>`)
-    }
-
-    async function deletePath(index) {
-      const file = paths[index];
-      if (!file) return;
-
-      const ajax = new XMLHttpRequest();
-      ajax.open("DELETE", getUrl(file.name));
-      ajax.addEventListener("readystatechange", function() {
-        if(ajax.readyState === 4 && ajax.status === 200) {
-            document.getElementById(`addPath${index}`).remove();
-        }
-      });
-      ajax.send();
-    }
-
-    function addUploadControl() {
-      $toolbox.insertAdjacentHTML("beforeend", `
-    <div class="upload-control" title="Upload file">
-      <label for="file">
-        <svg width="16" height="16" viewBox="0 0 16 16"><path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/><path d="M7.646 1.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1-.708.708L8.5 2.707V11.5a.5.5 0 0 1-1 0V2.707L5.354 4.854a.5.5 0 1 1-.708-.708l3-3z"/></svg>
-      </label>
-      <input type="file" id="file" name="file" multiple>
-    </div>
-`);
-    }
-
-    function getUrl(name) {
-        let url = location.href.split('?')[0];
-        if (!url.endsWith("/")) url += "/";
-        url += encodeURI(name);
-        return url;
-    }
-
-    function getSvg(path_type) {
-      switch (path_type) {
-        case "Dir":
-          return `<svg height="16" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M13 4H7V3c0-.66-.31-1-1-1H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1zM6 4H1V3h5v1z"></path></svg>`;
-        case "File":
-          return `<svg height="16" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M6 5H2V4h4v1zM2 8h7V7H2v1zm0 2h7V9H2v1zm0 2h7v-1H2v1zm10-7.5V14c0 .55-.45 1-1 1H1c-.55 0-1-.45-1-1V2c0-.55.45-1 1-1h7.5L12 4.5zM11 5L8 2H1v12h10V5z"></path></svg>`;
-        case "SymlinkDir":
-          return `<svg height="16" viewBox="0 0 14 16" width="14"><path fill-rule="evenodd" d="M13 4H7V3c0-.66-.31-1-1-1H1c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1V5c0-.55-.45-1-1-1zM1 3h5v1H1V3zm6 9v-2c-.98-.02-1.84.22-2.55.7-.71.48-1.19 1.25-1.45 2.3.02-1.64.39-2.88 1.13-3.73C4.86 8.43 5.82 8 7.01 8V6l4 3-4 3H7z"></path></svg>`;
-        default:
-          return `<svg height="16" viewBox="0 0 12 16" width="12"><path fill-rule="evenodd" d="M8.5 1H1c-.55 0-1 .45-1 1v12c0 .55.45 1 1 1h10c.55 0 1-.45 1-1V4.5L8.5 1zM11 14H1V2h7l3 3v9zM6 4.5l4 3-4 3v-2c-.98-.02-1.84.22-2.55.7-.71.48-1.19 1.25-1.45 2.3.02-1.64.39-2.88 1.13-3.73.73-.84 1.69-1.27 2.88-1.27v-2H6z"></path></svg>`;
-      }
-    }
-
-    function formatMtime(mtime) {
-      if (!mtime) return ""
-      const date = new Date(mtime);
-      const year = date.getFullYear();
-      const month = padZero(date.getMonth() + 1, 2);
-      const day = padZero(date.getDate(), 2);
-      const hours = padZero(date.getHours(), 2);
-      const minutes = padZero(date.getMinutes(), 2);
-      return `${year}/${month}/${day} ${hours}:${minutes}`;
-    }
-
-    function padZero(value, size) {
-      return ("0".repeat(size) + value).slice(-1 * size)
-    }
-
-    function formatSize(size) {
-      if (!size) return ""
-      const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
-      if (size == 0) return '0 Byte';
-      const i = parseInt(Math.floor(Math.log(size) / Math.log(1024)));
-      return Math.round(size / Math.pow(1024, i), 2) + ' ' + sizes[i];
-    }
-
-
-
-    document.addEventListener('DOMContentLoaded', () => {
-      addBreadcrumb(breadcrumb);
-      paths.forEach((file, index) => addPath(file, index));
-      if (!readonly) {
-        addUploadControl();
-        document.getElementById("file").addEventListener("change", e => {
-          const files = e.target.files;
-          for (const file of files) {
-            uploaderIdx += 1;
-            const uploader = new Uploader(uploaderIdx, file);
-            uploader.upload();
-          }
-        });
-      }
-    });
-  </script>
-</body>
-</html>
--- a/src/server.rs
+++ b/src/server.rs
@@ -1,11 +1,15 @@
 use crate::{Args, BoxResult};

 use async_walkdir::WalkDir;
+use async_zip::read::seek::ZipFileReader;
 use async_zip::write::{EntryOptions, ZipFileWriter};
 use async_zip::Compression;
 use futures::stream::StreamExt;
 use futures::TryStreamExt;
-use headers::{AccessControlAllowHeaders, AccessControlAllowOrigin, HeaderMapExt};
+use headers::{
+    AccessControlAllowHeaders, AccessControlAllowOrigin, ContentType, ETag, HeaderMapExt,
+    IfModifiedSince, IfNoneMatch, LastModified,
+};
 use hyper::header::{HeaderValue, ACCEPT, CONTENT_TYPE, ORIGIN, RANGE, WWW_AUTHENTICATE};
 use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Method, StatusCode};
@@ -33,8 +37,9 @@ macro_rules! status_code {
    };
 }

-const INDEX_HTML: &str = include_str!("index.html");
-const INDEX_CSS: &str = include_str!("index.css");
+const INDEX_HTML: &str = include_str!("assets/index.html");
+const INDEX_CSS: &str = include_str!("assets/index.css");
+const INDEX_JS: &str = include_str!("assets/index.js");
 const BUF_SIZE: usize = 1024 * 16;

 pub async fn serve(args: Args) -> BoxResult<()> {
@@ -121,7 +126,7 @@ impl InnerService {
                    }
                    self.handle_ls_dir(path.as_path(), true).await
                } else {
-                    self.handle_send_file(path.as_path()).await
+                    self.handle_send_file(&req, path.as_path()).await
                }
            }
            Err(_) => {
@@ -153,7 +158,7 @@ impl InnerService {
            None => return Ok(forbidden),
        }

-        let mut file = fs::File::create(path).await?;
+        let mut file = fs::File::create(&path).await?;

        let body_with_io_error = req
            .body_mut()
@@ -165,6 +170,30 @@ impl InnerService {

        io::copy(&mut body_reader, &mut file).await?;

+        let req_query = req.uri().query().unwrap_or_default();
+        if req_query == "unzip" {
+            let root = path.parent().unwrap();
+            let mut zip = ZipFileReader::new(File::open(&path).await?).await?;
+            for i in 0..zip.entries().len() {
+                let entry = &zip.entries()[i];
+                let entry_name = entry.name();
+                let entry_path = root.join(entry_name);
+                if entry_name.ends_with('/') {
+                    fs::create_dir_all(entry_path).await?;
+                } else {
+                    if let Some(parent) = entry_path.parent() {
+                        if fs::symlink_metadata(parent).await.is_err() {
+                            fs::create_dir_all(&parent).await?;
+                        }
+                    }
+                    let mut outfile = fs::File::create(&entry_path).await?;
+                    let mut reader = zip.entry_reader(i).await?;
+                    io::copy(&mut reader, &mut outfile).await?;
+                }
+            }
+            fs::remove_file(&path).await?;
+        }
+
        return Ok(status_code!(StatusCode::OK));
    }

@@ -234,27 +263,72 @@ impl InnerService {
        Ok(Response::new(body))
    }

-    async fn handle_send_file(&self, path: &Path) -> BoxResult<Response> {
-        let file = fs::File::open(path).await?;
+    async fn handle_send_file(&self, req: &Request, path: &Path) -> BoxResult<Response> {
+        let (file, meta) = tokio::join!(fs::File::open(path), fs::metadata(path),);
+        let (file, meta) = (file?, meta?);
+        let mut res = Response::default();
+        if let Ok(mtime) = meta.modified() {
+            let timestamp = get_timestamp(&mtime);
+            let size = meta.len();
+            let etag = format!(r#""{}-{}""#, timestamp, size)
+                .parse::<ETag>()
+                .unwrap();
+            let last_modified = LastModified::from(mtime);
+            let fresh = {
+                // `If-None-Match` takes presedence over `If-Modified-Since`.
+                if let Some(if_none_match) = req.headers().typed_get::<IfNoneMatch>() {
+                    !if_none_match.precondition_passes(&etag)
+                } else if let Some(if_modified_since) = req.headers().typed_get::<IfModifiedSince>()
+                {
+                    !if_modified_since.is_modified(mtime)
+                } else {
+                    false
+                }
+            };
+            res.headers_mut().typed_insert(last_modified);
+            res.headers_mut().typed_insert(etag);
+            if fresh {
+                *res.status_mut() = StatusCode::NOT_MODIFIED;
+                return Ok(res);
+            }
+        }
+        if let Some(mime) = mime_guess::from_path(&path).first() {
+            res.headers_mut().typed_insert(ContentType::from(mime));
+        }
        let stream = FramedRead::new(file, BytesCodec::new());
        let body = Body::wrap_stream(stream);
-        Ok(Response::new(body))
+        *res.body_mut() = body;
+        Ok(res)
    }

    fn send_index(&self, path: &Path, mut paths: Vec<PathItem>) -> BoxResult<Response> {
        paths.sort_unstable();
-        let breadcrumb = self.get_breadcrumb(path);
+        let rel_path = match self.args.path.parent() {
+            Some(p) => path.strip_prefix(p).unwrap(),
+            None => path,
+        };
        let data = IndexData {
-            breadcrumb,
+            breadcrumb: normalize_path(rel_path),
            paths,
            readonly: self.args.readonly,
        };
        let data = serde_json::to_string(&data).unwrap();
-        let mut output =
-            INDEX_HTML.replace("__STYLE__", &format!("<style>\n{}</style>", INDEX_CSS));
-        output = output.replace("__DATA__", &data);
+        let output = INDEX_HTML.replace(
+            "__SLOB__",
+            &format!(
+                r#"
+<title>Files in {} - Duf/</title>
+<style>{}</style>
+<script>var DATA = {}; {}</script>
+"#,
+                rel_path.display(),
+                INDEX_CSS,
+                data,
+                INDEX_JS
+            ),
+        );

-        Ok(hyper::Response::builder().body(output.into()).unwrap())
+        Ok(Response::new(output.into()))
    }

    fn auth_guard(&self, req: &Request) -> BoxResult<bool> {
@@ -270,20 +344,15 @@ impl InnerService {
                let value = std::str::from_utf8(&value)?;
                return Ok(value == auth);
            } else {
+                if self.args.no_auth_read && req.method() == Method::GET {
+                    return Ok(true);
+                }
                return Ok(false);
            }
        }
        Ok(true)
    }

-    fn get_breadcrumb(&self, path: &Path) -> String {
-        let path = match self.args.path.parent() {
-            Some(p) => path.strip_prefix(p).unwrap(),
-            None => path,
-        };
-        normalize_path(path)
-    }
-
    fn get_file_path(&self, path: &str) -> BoxResult<Option<PathBuf>> {
        let decoded_path = percent_decode(path[1..].as_bytes()).decode_utf8()?;
        let slashes_switched = if cfg!(windows) {
@@ -311,7 +380,7 @@ struct IndexData {
 struct PathItem {
    path_type: PathType,
    name: String,
-    mtime: Option<u64>,
+    mtime: u64,
    size: Option<u64>,
 }

@@ -326,21 +395,17 @@ enum PathType {
 async fn get_path_item<P: AsRef<Path>>(path: P, base_path: P) -> BoxResult<PathItem> {
    let path = path.as_ref();
    let rel_path = path.strip_prefix(base_path).unwrap();
-    let meta = fs::metadata(&path).await?;
-    let s_meta = fs::symlink_metadata(&path).await?;
+    let (meta, meta2) = tokio::join!(fs::metadata(&path), fs::symlink_metadata(&path));
+    let (meta, meta2) = (meta?, meta2?);
    let is_dir = meta.is_dir();
-    let is_symlink = s_meta.file_type().is_symlink();
+    let is_symlink = meta2.file_type().is_symlink();
    let path_type = match (is_symlink, is_dir) {
        (true, true) => PathType::SymlinkDir,
        (false, true) => PathType::Dir,
        (true, false) => PathType::SymlinkFile,
        (false, false) => PathType::File,
    };
-    let mtime = meta
-        .modified()?
-        .duration_since(SystemTime::UNIX_EPOCH)
-        .ok()
-        .map(|v| v.as_millis() as u64);
+    let mtime = get_timestamp(&meta.modified()?);
    let size = match path_type {
        PathType::Dir | PathType::SymlinkDir => None,
        PathType::File | PathType::SymlinkFile => Some(meta.len()),
@@ -354,6 +419,12 @@ async fn get_path_item<P: AsRef<Path>>(path: P, base_path: P) -> BoxResult<PathI
    })
 }

+fn get_timestamp(time: &SystemTime) -> u64 {
+    time.duration_since(SystemTime::UNIX_EPOCH)
+        .unwrap()
+        .as_millis() as u64
+}
+
 fn normalize_path<P: AsRef<Path>>(path: P) -> String {
    let path = path.as_ref().to_str().unwrap_or_default();
    if cfg!(windows) {
Author	SHA1	Message	Date
sigoden	54df4633e1	chore: upgrade version	2022-05-30 16:06:31 +08:00
sigoden	6b293c0f2e	chore: rename src/static to src/assets	2022-05-30 14:32:41 +08:00
sigoden	62696b45fd	feat: unzip zip file when unload	2022-05-30 14:30:08 +08:00
sigoden	d9547ad00b	feat: add no-auth-read options	2022-05-30 12:40:57 +08:00
sigoden	8fbc742c52	chore: reorganize web static files	2022-05-30 12:31:29 +08:00
sigoden	d8d5aae898	feat: add mime and cache headers to response	2022-05-30 11:22:28 +08:00