Browse Source

fix broken on path-prefix

pull/58/head
sigoden 3 years ago
parent
commit
634716b713
  1. 19
      assets/index.js
  2. 10
      src/server.rs

19
assets/index.js

@ -118,29 +118,30 @@ class Uploader { @@ -118,29 +118,30 @@ class Uploader {
/**
* Add breadcrumb
* @param {string} value
* @param {string} href
* @param {string} uri_prefix
*/
function addBreadcrumb(value) {
function addBreadcrumb(href, uri_prefix) {
const $breadcrumb = document.querySelector(".breadcrumb");
let parts = [];
if (value === "/") {
if (href === "/") {
parts = [""];
} else {
parts = value.split("/");
parts = href.split("/");
}
const len = parts.length;
let path = "";
let path = uri_prefix.slice(0, -1);
for (let i = 0; i < len; i++) {
const name = parts[i];
if (i > 0) {
path += "/" + name;
path += "/" + encodeURI(name);
}
if (i === 0) {
$breadcrumb.insertAdjacentHTML("beforeend", `<a href="/"><svg width="16" height="16" viewBox="0 0 16 16"><path d="M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5z"/></svg></a>`);
$breadcrumb.insertAdjacentHTML("beforeend", `<a href="${path}"><svg width="16" height="16" viewBox="0 0 16 16"><path d="M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5z"/></svg></a>`);
} else if (i === len - 1) {
$breadcrumb.insertAdjacentHTML("beforeend", `<b>${name}</b>`);
} else {
$breadcrumb.insertAdjacentHTML("beforeend", `<a href="${encodeURI(path)}">${name}</a>`);
$breadcrumb.insertAdjacentHTML("beforeend", `<a href="${path}">${name}</a>`);
}
if (i !== len - 1) {
$breadcrumb.insertAdjacentHTML("beforeend", `<span class="separator">/</span>`);
@ -335,7 +336,7 @@ function ready() { @@ -335,7 +336,7 @@ function ready() {
document.getElementById('search').value = params.q;
}
addBreadcrumb(DATA.breadcrumb);
addBreadcrumb(DATA.href, DATA.uri_prefix);
if (Array.isArray(DATA.paths)) {
const len = DATA.paths.length;
if (len > 0) {

10
src/server.rs

@ -684,9 +684,10 @@ impl Server { @@ -684,9 +684,10 @@ impl Server {
res: &mut Response,
) -> BoxResult<()> {
paths.sort_unstable();
let breadcrumb = format!("/{}", normalize_path(path.strip_prefix(&self.args.path)?));
let href = format!("/{}", normalize_path(path.strip_prefix(&self.args.path)?));
let data = IndexData {
breadcrumb: breadcrumb.clone(),
href: href.clone(),
uri_prefix: self.args.uri_prefix.clone(),
paths,
allow_upload: self.args.allow_upload,
allow_delete: self.args.allow_delete,
@ -704,7 +705,7 @@ const DATA = @@ -704,7 +705,7 @@ const DATA =
{}
{}</script>
"#,
breadcrumb, INDEX_CSS, data, INDEX_JS
href, INDEX_CSS, data, INDEX_JS
),
);
res.headers_mut()
@ -813,7 +814,8 @@ const DATA = @@ -813,7 +814,8 @@ const DATA =
#[derive(Debug, Serialize)]
struct IndexData {
breadcrumb: String,
href: String,
uri_prefix: String,
paths: Vec<PathItem>,
allow_upload: bool,
allow_delete: bool,

Loading…
Cancel
Save