aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md2
-rw-r--r--Cargo.lock212
-rw-r--r--Cargo.toml4
-rw-r--r--build.rs19
-rw-r--r--data/style.scss274
-rw-r--r--data/themes/archlinux.scss54
-rw-r--r--data/themes/monokai.scss54
-rw-r--r--data/themes/squirrel.scss54
-rw-r--r--data/themes/zenburn.scss54
-rw-r--r--src/args.rs8
-rw-r--r--src/config.rs8
-rw-r--r--src/errors.rs12
-rw-r--r--src/main.rs46
-rw-r--r--src/renderer.rs94
-rw-r--r--tests/serve_request.rs18
15 files changed, 483 insertions, 430 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b2f62b..69badd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
<!-- next-header -->
## [Unreleased] - ReleaseDate
+- Add `--pretty-urls` [#1193](https://github.com/svenstaro/miniserve/pull/1193) (thanks @nlopes)
+- Fix single quote display with `--show-wget-footer` [#1191](https://github.com/svenstaro/miniserve/pull/1191) (thanks @d-air1)
## [0.24.0] - 2023-07-06
- Fix ANSI color codes are printed when not a tty [#1095](https://github.com/svenstaro/miniserve/pull/1095)
diff --git a/Cargo.lock b/Cargo.lock
index 3f01835..21ee549 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -84,12 +84,12 @@ dependencies = [
[[package]]
name = "actix-macros"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6"
+checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
dependencies = [
"quote",
- "syn 1.0.109",
+ "syn 2.0.28",
]
[[package]]
@@ -227,7 +227,7 @@ dependencies = [
"serde_urlencoded",
"smallvec",
"socket2 0.4.9",
- "time 0.3.23",
+ "time 0.3.25",
"url",
]
@@ -574,11 +574,12 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.79"
+version = "1.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
dependencies = [
"jobserver",
+ "libc",
]
[[package]]
@@ -604,18 +605,18 @@ dependencies = [
[[package]]
name = "chrono-humanize"
-version = "0.2.2"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32dce1ea1988dbdf9f9815ff11425828523bd2a134ec0805d2ac8af26ee6096e"
+checksum = "799627e6b4d27827a814e837b9d8a504832086081806d45b1afa34dc982b023b"
dependencies = [
"chrono",
]
[[package]]
name = "clap"
-version = "4.3.16"
+version = "4.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74bb1b4028935821b2d6b439bba2e970bdcf740832732437ead910c632e30d7d"
+checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
dependencies = [
"clap_builder",
"clap_derive",
@@ -624,9 +625,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.3.16"
+version = "4.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ae467cbb0111869b765e13882a1dbbd6cb52f58203d8b80c44f667d4dd19843"
+checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
dependencies = [
"anstream",
"anstyle",
@@ -654,7 +655,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.26",
+ "syn 2.0.28",
]
[[package]]
@@ -776,6 +777,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca"
[[package]]
+name = "deranged"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
+
+[[package]]
name = "derive_more"
version = "0.99.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -790,9 +797,9 @@ dependencies = [
[[package]]
name = "deunicode"
-version = "0.4.3"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690"
+checksum = "d95203a6a50906215a502507c0f879a0ce7ff205a6111e2db2a5ef8e4bb92e43"
[[package]]
name = "diff"
@@ -824,9 +831,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
[[package]]
name = "either"
-version = "1.8.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "encoding_rs"
@@ -845,9 +852,9 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca"
[[package]]
name = "errno"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
dependencies = [
"errno-dragonfly",
"libc",
@@ -881,22 +888,19 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "1.9.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
[[package]]
name = "filetime"
-version = "0.2.21"
+version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
+checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.2.16",
+ "redox_syscall",
"windows-sys 0.48.0",
]
@@ -1000,7 +1004,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.26",
+ "syn 2.0.28",
]
[[package]]
@@ -1074,9 +1078,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "globset"
-version = "0.4.11"
+version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df"
+checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
dependencies = [
"aho-corasick",
"bstr",
@@ -1102,7 +1106,9 @@ version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7746cd9bf09f9bb7d98638774a70642000356f543898d9a352cd043f82744528"
dependencies = [
+ "clap",
"grass_compiler",
+ "include_sass",
]
[[package]]
@@ -1116,6 +1122,7 @@ dependencies = [
"lasso",
"once_cell",
"phf",
+ "rand",
]
[[package]]
@@ -1266,7 +1273,7 @@ dependencies = [
"futures-util",
"http",
"hyper",
- "rustls 0.21.5",
+ "rustls 0.21.6",
"tokio",
"tokio-rustls 0.24.1",
]
@@ -1332,22 +1339,24 @@ dependencies = [
]
[[package]]
-name = "indexmap"
-version = "1.9.3"
+name = "include_sass"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+checksum = "8a09c0170cacc99c494307c6482e81653a8fb767c605ee7cf8febd53d9e72ed6"
dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
+ "grass_compiler",
+ "quote",
+ "syn 1.0.109",
]
[[package]]
-name = "instant"
-version = "0.1.12"
+name = "indexmap"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
- "cfg-if",
+ "autocfg",
+ "hashbrown 0.12.3",
]
[[package]]
@@ -1374,7 +1383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi",
- "rustix 0.38.4",
+ "rustix 0.38.7",
"windows-sys 0.48.0",
]
@@ -1470,9 +1479,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
-version = "0.4.3"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
[[package]]
name = "local-channel"
@@ -1682,9 +1691,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]]
name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
dependencies = [
"autocfg",
]
@@ -1741,7 +1750,7 @@ checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.3.5",
+ "redox_syscall",
"smallvec",
"windows-targets 0.48.1",
]
@@ -1814,9 +1823,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
-version = "0.2.10"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
+checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c"
[[package]]
name = "pin-utils"
@@ -1930,9 +1939,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.31"
+version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
dependencies = [
"proc-macro2",
]
@@ -1969,15 +1978,6 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
@@ -1987,9 +1987,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.9.1"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
dependencies = [
"aho-corasick",
"memchr",
@@ -1999,9 +1999,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.3.3"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
dependencies = [
"aho-corasick",
"memchr",
@@ -2044,7 +2044,7 @@ dependencies = [
"once_cell",
"percent-encoding",
"pin-project-lite",
- "rustls 0.21.5",
+ "rustls 0.21.6",
"rustls-pemfile",
"serde",
"serde_json",
@@ -2112,7 +2112,7 @@ dependencies = [
"regex",
"relative-path",
"rustc_version",
- "syn 2.0.26",
+ "syn 2.0.28",
"unicode-ident",
]
@@ -2147,14 +2147,14 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.4"
+version = "0.38.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
+checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399"
dependencies = [
"bitflags 2.3.3",
"errno",
"libc",
- "linux-raw-sys 0.4.3",
+ "linux-raw-sys 0.4.5",
"windows-sys 0.48.0",
]
@@ -2172,9 +2172,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.21.5"
+version = "0.21.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
+checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb"
dependencies = [
"log",
"ring",
@@ -2193,9 +2193,9 @@ dependencies = [
[[package]]
name = "rustls-webpki"
-version = "0.101.1"
+version = "0.101.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e"
+checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59"
dependencies = [
"ring",
"untrusted",
@@ -2257,29 +2257,29 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
[[package]]
name = "serde"
-version = "1.0.171"
+version = "1.0.183"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
+checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.171"
+version = "1.0.183"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
+checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.26",
+ "syn 2.0.28",
]
[[package]]
name = "serde_json"
-version = "1.0.103"
+version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
dependencies = [
"itoa",
"ryu",
@@ -2337,7 +2337,7 @@ checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369"
dependencies = [
"log",
"termcolor",
- "time 0.3.23",
+ "time 0.3.25",
]
[[package]]
@@ -2439,15 +2439,15 @@ dependencies = [
[[package]]
name = "strum_macros"
-version = "0.25.1"
+version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232"
+checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059"
dependencies = [
"heck",
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.26",
+ "syn 2.0.28",
]
[[package]]
@@ -2463,9 +2463,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.26"
+version = "2.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
dependencies = [
"proc-macro2",
"quote",
@@ -2485,15 +2485,14 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.6.0"
+version = "3.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
+checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
dependencies = [
- "autocfg",
"cfg-if",
"fastrand",
- "redox_syscall 0.3.5",
- "rustix 0.37.23",
+ "redox_syscall",
+ "rustix 0.38.7",
"windows-sys 0.48.0",
]
@@ -2535,22 +2534,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
[[package]]
name = "thiserror"
-version = "1.0.43"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.43"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.26",
+ "syn 2.0.28",
]
[[package]]
@@ -2576,10 +2575,11 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.23"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
+checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
dependencies = [
+ "deranged",
"itoa",
"libc",
"num_threads",
@@ -2596,9 +2596,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
-version = "0.2.10"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
+checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
dependencies = [
"time-core",
]
@@ -2654,7 +2654,7 @@ version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
dependencies = [
- "rustls 0.21.5",
+ "rustls 0.21.6",
"tokio",
]
@@ -2849,7 +2849,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.26",
+ "syn 2.0.28",
"wasm-bindgen-shared",
]
@@ -2883,7 +2883,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.26",
+ "syn 2.0.28",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -3143,18 +3143,18 @@ dependencies = [
[[package]]
name = "zstd"
-version = "0.12.3+zstd.1.5.2"
+version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
+checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
dependencies = [
"zstd-safe",
]
[[package]]
name = "zstd-safe"
-version = "6.0.5+zstd.1.5.4"
+version = "6.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
+checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
dependencies = [
"libc",
"zstd-sys",
diff --git a/Cargo.toml b/Cargo.toml
index ecc5583..8f89ed5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,6 +35,7 @@ colored = "2"
comrak = { version = "0.18", default-features = false }
fast_qr = { version = "0.9", features = ["svg"] }
futures = "0.3"
+grass = { version = "0.13", features = ["macro"] }
hex = "0.4"
http = "0.2"
httparse = "1"
@@ -80,6 +81,3 @@ url = "2"
[target.'cfg(not(windows))'.dev-dependencies]
# fake_tty does not support Windows for now
fake-tty = "0.3.1"
-
-[build-dependencies]
-grass = { version = "0.13", default-features = false }
diff --git a/build.rs b/build.rs
deleted file mode 100644
index e65b294..0000000
--- a/build.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use std::env;
-use std::fs;
-use std::path::Path;
-
-fn main() {
- let out_dir = env::var_os("OUT_DIR").expect("OUT_DIR env var missing");
- let dest_path = Path::new(&out_dir).join("style.css");
- fs::write(
- dest_path,
- grass::from_string(
- include_str!("data/style.scss").to_string(),
- &grass::Options::default(),
- )
- .expect("scss failed to compile"),
- )
- .expect("failed to write css file");
-
- println!("cargo:rerun-if-changed=data/style.scss");
-}
diff --git a/data/style.scss b/data/style.scss
index 10c258d..6c0d284 100644
--- a/data/style.scss
+++ b/data/style.scss
@@ -1,22 +1,11 @@
-@use "sass:selector";
+@use "themes/archlinux" with ($generate_default: false);
+@use "themes/monokai" with ($generate_default: false);
+@use "themes/squirrel" with ($generate_default: false);
+@use "themes/zenburn" with ($generate_default: false);
// theme colors can be found at the bottom
$themes: squirrel, archlinux, monokai, zenburn;
-// This returns a selector that matches body when no theme class is set,
-// in which case the default light/dark mode themes should be used.
-// The result of this function can be used with #{...} interpolation
-// in a selector list.
-@function body_not_themed() {
- $s: unquote("body");
-
- @each $t in $themes {
- $s: selector.append($s, unquote(":not(.theme_#{$t})"));
- }
-
- @return $s;
-}
-
html {
font-smoothing: antialiased;
text-rendering: optimizeLegibility;
@@ -210,21 +199,6 @@ nav .theme li a:hover {
color: var(--change_theme_link_color_hover);
}
-%active_theme_link {
- font-weight: bold;
- color: var(--switch_theme_active);
-}
-
-@each $theme in $themes {
- body.theme_#{$theme} nav .theme li.theme_#{$theme} a {
- @extend %active_theme_link;
- }
-}
-
-#{body_not_themed()} nav .theme li.theme_default a {
- @extend %active_theme_link;
-}
-
p {
margin: 0;
padding: 0;
@@ -567,211 +541,21 @@ th span.active span {
}
}
-
-
-@mixin theme_squirrel {
- --background: #ffffff;
- --text_color: #323232;
- --directory_link_color: #d02474;
- --directory_link_color_visited: #9b1985;
- --file_link_color: #0086b3;
- --file_link_color_visited: #974ec2;
- --symlink_color: #ADD8E6;
- --table_background: #ffffff;
- --table_text_color: #323232;
- --table_header_background: #323232;
- --table_header_text_color: #f5f5f5;
- --table_header_active_color: #ffffff;
- --active_row_color: #f6f8fa;
- --odd_row_background: #fbfbfb;
- --even_row_background: #f2f2f2;
- --root_link_color: #323232;
- --download_button_background: #d02474;
- --download_button_background_hover: #f52d8a;
- --download_button_link_color: #ffffff;
- --download_button_link_color_hover: #ffffff;
- --back_button_background: #d02474;
- --back_button_background_hover: #d02474;
- --back_button_link_color: #ffffff;
- --back_button_link_color_hover: #ffffff;
- --date_text_color: #797979;
- --at_color: #797979;
- --switch_theme_background: #323232;
- --switch_theme_link_color: #f5f5f5;
- --switch_theme_active: #d02474;
- --switch_theme_border: #49483e;
- --change_theme_link_color: #f5f5f5;
- --change_theme_link_color_hover: #f5f5f5;
- --upload_text_color: #323232;
- --upload_form_border_color: #d2d2d2;
- --upload_form_background: #f2f2f2;
- --upload_button_background: #d02474;
- --upload_button_text_color: #ffffff;
- --drag_background: #3333338f;
- --drag_border_color: #ffffff;
- --drag_text_color: #ffffff;
- --size_background_color: #323232;
- --size_text_color: #ffffff;
- --error_color: #d02424;
- --footer_color: #898989;
-}
-
-@mixin theme_archlinux {
- --background: #383c4a;
- --text_color: #fefefe;
- --directory_link_color: #03a9f4;
- --directory_link_color_visited: #0388f4;
- --file_link_color: #ea95ff;
- --file_link_color_visited: #a595ff;
- --symlink_color: #66d9ef;
- --table_background: #353946;
- --table_text_color: #eeeeee;
- --table_header_background: #5294e2;
- --table_header_text_color: #eeeeee;
- --table_header_active_color: #ffffff;
- --active_row_color: #5194e259;
- --odd_row_background: #404552;
- --even_row_background: #4b5162;
- --root_link_color: #abb2bb;
- --download_button_background: #ea95ff;
- --download_button_background_hover: #eea7ff;
- --download_button_link_color: #ffffff;
- --download_button_link_color_hover: #ffffff;
- --back_button_background: #ea95ff;
- --back_button_background_hover: #ea95ff;
- --back_button_link_color: #ffffff;
- --back_button_link_color_hover: #ffffff;
- --date_text_color: #9ebbdc;
- --at_color: #9ebbdc;
- --switch_theme_background: #4b5162;
- --switch_theme_link_color: #fefefe;
- --switch_theme_active: #ea95ff;
- --switch_theme_border: #6a728a;
- --change_theme_link_color: #fefefe;
- --change_theme_link_color_hover: #fefefe;
- --upload_text_color: #fefefe;
- --upload_form_border_color: #353946;
- --upload_form_background: #4b5162;
- --upload_button_background: #ea95ff;
- --upload_button_text_color: #ffffff;
- --drag_background: #3333338f;
- --drag_border_color: #fefefe;
- --drag_text_color: #fefefe;
- --size_background_color: #5294e2;
- --size_text_color: #fefefe;
- --error_color: #e44b4b;
- --footer_color: #8eabcc;
-}
-
-@mixin theme_zenburn {
- --background: #3f3f3f;
- --text_color: #efefef;
- --directory_link_color: #f0dfaf;
- --directory_link_color_visited: #ebc390;
- --file_link_color: #87d6d5;
- --file_link_color_visited: #a7b9ec;
- --symlink_color: #11a8cd;
- --table_background: #4a4949;
- --table_text_color: #efefef;
- --table_header_background: #7f9f7f;
- --table_header_text_color: #efefef;
- --table_header_active_color: #efef8f;
- --active_row_color: #7e9f7f9c;
- --odd_row_background: #777777;
- --even_row_background: #5a5a5a;
- --root_link_color: #dca3a3;
- --download_button_background: #cc9393;
- --download_button_background_hover: #dca3a3;
- --download_button_link_color: #efefef;
- --download_button_link_color_hover: #efefef;
- --back_button_background: #cc9393;
- --back_button_background_hover: #cc9393;
- --back_button_link_color: #efefef;
- --back_button_link_color_hover: #efefef;
- --date_text_color: #cfbfaf;
- --at_color: #cfbfaf;
- --switch_theme_background: #4a4949;
- --switch_theme_link_color: #efefef;
- --switch_theme_active: #efef8f;
- --switch_theme_border: #5a5a5a;
- --change_theme_link_color: #efefef;
- --change_theme_link_color_hover: #efefef;
- --upload_text_color: #efefef;
- --upload_form_border_color: #4a4949;
- --upload_form_background: #777777;
- --upload_button_background: #cc9393;
- --upload_button_text_color: #efefef;
- --drag_background: #3333338f;
- --drag_border_color: #efefef;
- --drag_text_color: #efefef;
- --size_background_color: #7f9f7f;
- --size_text_color: #efefef;
- --error_color: #d06565;
- --footer_color: #bfaf9f;
-}
-
-@mixin theme_monokai {
- --background: #272822;
- --text_color: #f8f8f2;
- --directory_link_color: #f92672;
- --directory_link_color_visited: #bc39a7;
- --file_link_color: #a6e22e;
- --file_link_color_visited: #4cb936;
- --symlink_color: #29b8db;
- --table_background: #3b3a32;
- --table_text_color: #f8f8f0;
- --table_header_background: #75715e;
- --table_header_text_color: #f8f8f2;
- --table_header_active_color: #e6db74;
- --active_row_color: #ae81fe3d;
- --odd_row_background: #3e3d32;
- --even_row_background: #49483e;
- --root_link_color: #66d9ef;
- --download_button_background: #ae81ff;
- --download_button_background_hover: #c6a6ff;
- --download_button_link_color: #f8f8f0;
- --download_button_link_color_hover: #f8f8f0;
- --back_button_background: #ae81ff;
- --back_button_background_hover: #ae81ff;
- --back_button_link_color: #f8f8f0;
- --back_button_link_color_hover: #f8f8f0;
- --date_text_color: #66d9ef;
- --at_color: #66d9ef;
- --switch_theme_background: #3b3a32;
- --switch_theme_link_color: #f8f8f2;
- --switch_theme_active: #a6e22e;
- --switch_theme_border: #49483e;
- --change_theme_link_color: #f8f8f2;
- --change_theme_link_color_hover: #f8f8f2;
- --upload_text_color: #f8f8f2;
- --upload_form_border_color: #3b3a32;
- --upload_form_background: #49483e;
- --upload_button_background: #ae81ff;
- --upload_button_text_color: #f8f8f0;
- --drag_background: #3333338f;
- --drag_border_color: #f8f8f2;
- --drag_text_color: #f8f8f2;
- --size_background_color: #75715e;
- --size_text_color: #f8f8f2;
- --error_color: #d02929;
- --footer_color: #56c9df;
-}
-
@mixin theme($name) {
@if $name == squirrel {
- @include theme_squirrel();
+ @include squirrel.theme();
}
@else if $name == archlinux {
- @include theme_archlinux();
+ @include archlinux.theme();
}
@else if $name == monokai {
- @include theme_monokai();
+ @include monokai.theme();
}
@else if $name == zenburn {
- @include theme_zenburn();
+ @include zenburn.theme();
}
@else {
@@ -779,39 +563,23 @@ th span.active span {
}
}
-// For each of the themes, define a placeholder selector containing
-// the themes variables. Then add selectors for body when the theme:
-// - has explicitly been activated by .theme_*
-// - is set as default theme by .default_theme_* and no other theme is active
-// to the placeholder selector list by means of @extend.
-@each $theme in $themes {
- %theme_#{$theme} {
- @include theme($theme);
- }
-
- body.theme_#{$theme} {
- @extend %theme_#{$theme};
- }
+%active_theme_link {
+ font-weight: bold;
+ color: var(--switch_theme_active);
+}
- #{body_not_themed()}.default_theme_#{$theme} {
- @extend %theme_#{$theme};
- }
+// when no specific theme is applied, highlight the `default` theme button in
+// the theme menu
+body:not([data-theme]) nav .theme li[data-theme="default"] a {
+ @extend %active_theme_link;
}
-// Do the same thing again for the dark mode default.
-// Since the media query doesn't affect specificity, all dark mode
-// defaults need to come after all light mode defaults to override
-// them when dark mode is enabled.
@each $theme in $themes {
- @media (prefers-color-scheme: dark) {
- %theme_dark_#{$theme} {
- @include theme($theme);
+ body[data-theme="#{$theme}"] {
+ @include theme($theme);
+ // highlight the currently active theme in the theme selection menu
+ nav .theme li[data-theme="#{$theme}"] a {
+ @extend %active_theme_link;
}
}
-
- // this extension will still end up inside the media query,
- // because that is where %theme_dark_* was defined
- #{body_not_themed()}.default_theme_dark_#{$theme} {
- @extend %theme_dark_#{$theme};
- }
}
diff --git a/data/themes/archlinux.scss b/data/themes/archlinux.scss
new file mode 100644
index 0000000..f95b8bb
--- /dev/null
+++ b/data/themes/archlinux.scss
@@ -0,0 +1,54 @@
+$generate_default: true !default;
+
+@mixin theme {
+ --background: #383c4a;
+ --text_color: #fefefe;
+ --directory_link_color: #03a9f4;
+ --directory_link_color_visited: #0388f4;
+ --file_link_color: #ea95ff;
+ --file_link_color_visited: #a595ff;
+ --symlink_color: #66d9ef;
+ --table_background: #353946;
+ --table_text_color: #eeeeee;
+ --table_header_background: #5294e2;
+ --table_header_text_color: #eeeeee;
+ --table_header_active_color: #ffffff;
+ --active_row_color: #5194e259;
+ --odd_row_background: #404552;
+ --even_row_background: #4b5162;
+ --root_link_color: #abb2bb;
+ --download_button_background: #ea95ff;
+ --download_button_background_hover: #eea7ff;
+ --download_button_link_color: #ffffff;
+ --download_button_link_color_hover: #ffffff;
+ --back_button_background: #ea95ff;
+ --back_button_background_hover: #ea95ff;
+ --back_button_link_color: #ffffff;
+ --back_button_link_color_hover: #ffffff;
+ --date_text_color: #9ebbdc;
+ --at_color: #9ebbdc;
+ --switch_theme_background: #4b5162;
+ --switch_theme_link_color: #fefefe;
+ --switch_theme_active: #ea95ff;
+ --switch_theme_border: #6a728a;
+ --change_theme_link_color: #fefefe;
+ --change_theme_link_color_hover: #fefefe;
+ --upload_text_color: #fefefe;
+ --upload_form_border_color: #353946;
+ --upload_form_background: #4b5162;
+ --upload_button_background: #ea95ff;
+ --upload_button_text_color: #ffffff;
+ --drag_background: #3333338f;
+ --drag_border_color: #fefefe;
+ --drag_text_color: #fefefe;
+ --size_background_color: #5294e2;
+ --size_text_color: #fefefe;
+ --error_color: #e44b4b;
+ --footer_color: #8eabcc;
+};
+
+@if $generate_default {
+ body {
+ @include theme;
+ }
+}
diff --git a/data/themes/monokai.scss b/data/themes/monokai.scss
new file mode 100644
index 0000000..4a47794
--- /dev/null
+++ b/data/themes/monokai.scss
@@ -0,0 +1,54 @@
+$generate_default: true !default;
+
+@mixin theme {
+ --background: #272822;
+ --text_color: #f8f8f2;
+ --directory_link_color: #f92672;
+ --directory_link_color_visited: #bc39a7;
+ --file_link_color: #a6e22e;
+ --file_link_color_visited: #4cb936;
+ --symlink_color: #29b8db;
+ --table_background: #3b3a32;
+ --table_text_color: #f8f8f0;
+ --table_header_background: #75715e;
+ --table_header_text_color: #f8f8f2;
+ --table_header_active_color: #e6db74;
+ --active_row_color: #ae81fe3d;
+ --odd_row_background: #3e3d32;
+ --even_row_background: #49483e;
+ --root_link_color: #66d9ef;
+ --download_button_background: #ae81ff;
+ --download_button_background_hover: #c6a6ff;
+ --download_button_link_color: #f8f8f0;
+ --download_button_link_color_hover: #f8f8f0;
+ --back_button_background: #ae81ff;
+ --back_button_background_hover: #ae81ff;
+ --back_button_link_color: #f8f8f0;
+ --back_button_link_color_hover: #f8f8f0;
+ --date_text_color: #66d9ef;
+ --at_color: #66d9ef;
+ --switch_theme_background: #3b3a32;
+ --switch_theme_link_color: #f8f8f2;
+ --switch_theme_active: #a6e22e;
+ --switch_theme_border: #49483e;
+ --change_theme_link_color: #f8f8f2;
+ --change_theme_link_color_hover: #f8f8f2;
+ --upload_text_color: #f8f8f2;
+ --upload_form_border_color: #3b3a32;
+ --upload_form_background: #49483e;
+ --upload_button_background: #ae81ff;
+ --upload_button_text_color: #f8f8f0;
+ --drag_background: #3333338f;
+ --drag_border_color: #f8f8f2;
+ --drag_text_color: #f8f8f2;
+ --size_background_color: #75715e;
+ --size_text_color: #f8f8f2;
+ --error_color: #d02929;
+ --footer_color: #56c9df;
+};
+
+@if $generate_default {
+ body {
+ @include theme;
+ }
+}
diff --git a/data/themes/squirrel.scss b/data/themes/squirrel.scss
new file mode 100644
index 0000000..9eb572e
--- /dev/null
+++ b/data/themes/squirrel.scss
@@ -0,0 +1,54 @@
+$generate_default: true !default;
+
+@mixin theme {
+ --background: #ffffff;
+ --text_color: #323232;
+ --directory_link_color: #d02474;
+ --directory_link_color_visited: #9b1985;
+ --file_link_color: #0086b3;
+ --file_link_color_visited: #974ec2;
+ --symlink_color: #ADD8E6;
+ --table_background: #ffffff;
+ --table_text_color: #323232;
+ --table_header_background: #323232;
+ --table_header_text_color: #f5f5f5;
+ --table_header_active_color: #ffffff;
+ --active_row_color: #f6f8fa;
+ --odd_row_background: #fbfbfb;
+ --even_row_background: #f2f2f2;
+ --root_link_color: #323232;
+ --download_button_background: #d02474;
+ --download_button_background_hover: #f52d8a;
+ --download_button_link_color: #ffffff;
+ --download_button_link_color_hover: #ffffff;
+ --back_button_background: #d02474;
+ --back_button_background_hover: #d02474;
+ --back_button_link_color: #ffffff;
+ --back_button_link_color_hover: #ffffff;
+ --date_text_color: #797979;
+ --at_color: #797979;
+ --switch_theme_background: #323232;
+ --switch_theme_link_color: #f5f5f5;
+ --switch_theme_active: #d02474;
+ --switch_theme_border: #49483e;
+ --change_theme_link_color: #f5f5f5;
+ --change_theme_link_color_hover: #f5f5f5;
+ --upload_text_color: #323232;
+ --upload_form_border_color: #d2d2d2;
+ --upload_form_background: #f2f2f2;
+ --upload_button_background: #d02474;
+ --upload_button_text_color: #ffffff;
+ --drag_background: #3333338f;
+ --drag_border_color: #ffffff;
+ --drag_text_color: #ffffff;
+ --size_background_color: #323232;
+ --size_text_color: #ffffff;
+ --error_color: #d02424;
+ --footer_color: #898989;
+};
+
+@if $generate_default {
+ body {
+ @include theme;
+ }
+}
diff --git a/data/themes/zenburn.scss b/data/themes/zenburn.scss
new file mode 100644
index 0000000..9eb4d11
--- /dev/null
+++ b/data/themes/zenburn.scss
@@ -0,0 +1,54 @@
+$generate_default: true !default;
+
+@mixin theme {
+ --background: #3f3f3f;
+ --text_color: #efefef;
+ --directory_link_color: #f0dfaf;
+ --directory_link_color_visited: #ebc390;
+ --file_link_color: #87d6d5;
+ --file_link_color_visited: #a7b9ec;
+ --symlink_color: #11a8cd;
+ --table_background: #4a4949;
+ --table_text_color: #efefef;
+ --table_header_background: #7f9f7f;
+ --table_header_text_color: #efefef;
+ --table_header_active_color: #efef8f;
+ --active_row_color: #7e9f7f9c;
+ --odd_row_background: #777777;
+ --even_row_background: #5a5a5a;
+ --root_link_color: #dca3a3;
+ --download_button_background: #cc9393;
+ --download_button_background_hover: #dca3a3;
+ --download_button_link_color: #efefef;
+ --download_button_link_color_hover: #efefef;
+ --back_button_background: #cc9393;
+ --back_button_background_hover: #cc9393;
+ --back_button_link_color: #efefef;
+ --back_button_link_color_hover: #efefef;
+ --date_text_color: #cfbfaf;
+ --at_color: #cfbfaf;
+ --switch_theme_background: #4a4949;
+ --switch_theme_link_color: #efefef;
+ --switch_theme_active: #efef8f;
+ --switch_theme_border: #5a5a5a;
+ --change_theme_link_color: #efefef;
+ --change_theme_link_color_hover: #efefef;
+ --upload_text_color: #efefef;
+ --upload_form_border_color: #4a4949;
+ --upload_form_background: #777777;
+ --upload_button_background: #cc9393;
+ --upload_button_text_color: #efefef;
+ --drag_background: #3333338f;
+ --drag_border_color: #efefef;
+ --drag_text_color: #efefef;
+ --size_background_color: #7f9f7f;
+ --size_text_color: #efefef;
+ --error_color: #d06565;
+ --footer_color: #bfaf9f;
+};
+
+@if $generate_default {
+ body {
+ @include theme;
+ }
+}
diff --git a/src/args.rs b/src/args.rs
index 87ecabb..8de05ad 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -41,6 +41,14 @@ pub struct CliArgs {
#[arg(long, requires = "index", env = "MINISERVE_SPA")]
pub spa: bool,
+ /// Activate Pretty URLs mode
+ ///
+ /// This will cause the server to serve the equivalent `.html` file indicated by the path.
+ ///
+ /// `/about` will try to find `about.html` and serve it.
+ #[arg(long, env = "MINISERVE_PRETTY_URLS")]
+ pub pretty_urls: bool,
+
/// Port to use
#[arg(
short = 'p',
diff --git a/src/config.rs b/src/config.rs
index e353afd..314d186 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -81,6 +81,13 @@ pub struct MiniserveConfig {
/// allow the SPA router to handle the request instead.
pub spa: bool,
+ /// Activate Pretty URLs mode
+ ///
+ /// This will cause the server to serve the equivalent `.html` file indicated by the path.
+ ///
+ /// `/about` will try to find `about.html` and serve it.
+ pub pretty_urls: bool,
+
/// Enable QR code display
pub show_qrcode: bool,
@@ -262,6 +269,7 @@ impl MiniserveConfig {
default_color_scheme_dark,
index: args.index,
spa: args.spa,
+ pretty_urls: args.pretty_urls,
overwrite_files: args.overwrite_files,
show_qrcode: args.qrcode,
mkdir_enabled: args.mkdir_enabled,
diff --git a/src/errors.rs b/src/errors.rs
index e502634..6875b90 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -5,6 +5,7 @@ use actix_web::{
HttpRequest, HttpResponse, ResponseError,
};
use futures::prelude::*;
+use std::str::FromStr;
use thiserror::Error;
use crate::{renderer::render_error, MiniserveConfig};
@@ -131,8 +132,15 @@ where
let res = fut.await?.map_into_boxed_body();
if (res.status().is_client_error() || res.status().is_server_error())
- && res.headers().get(header::CONTENT_TYPE).map(AsRef::as_ref)
- == Some(mime::TEXT_PLAIN_UTF_8.essence_str().as_bytes())
+ && res
+ .headers()
+ .get(header::CONTENT_TYPE)
+ .map(AsRef::as_ref)
+ .and_then(|s| std::str::from_utf8(s).ok())
+ .and_then(|s| mime::Mime::from_str(s).ok())
+ .as_ref()
+ .map(mime::Mime::essence_str)
+ == Some(mime::TEXT_PLAIN.as_ref())
{
let req = res.request().clone();
Ok(res.map_body(|head, body| map_error_page(&req, head, body)))
diff --git a/src/main.rs b/src/main.rs
index 2f81baa..78e8472 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,7 +5,9 @@ use std::time::Duration;
use actix_files::NamedFile;
use actix_web::{
- http::header::ContentType, middleware, web, App, HttpRequest, HttpResponse, Responder,
+ dev::{fn_service, ServiceRequest, ServiceResponse},
+ http::header::ContentType,
+ middleware, web, App, HttpRequest, HttpResponse, Responder,
};
use actix_web_httpauth::middleware::HttpAuthentication;
use anyhow::Result;
@@ -28,6 +30,8 @@ mod renderer;
use crate::config::MiniserveConfig;
use crate::errors::ContextualError;
+static STYLESHEET: &str = grass::include!("data/style.scss");
+
fn main() -> Result<()> {
let args = args::CliArgs::parse();
@@ -181,10 +185,20 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> {
.map(|sock| sock.to_string().green().bold().to_string())
.collect::<Vec<_>>();
+ let stylesheet = web::Data::new(
+ [
+ STYLESHEET,
+ inside_config.default_color_scheme.css(),
+ inside_config.default_color_scheme_dark.css_dark().as_str(),
+ ]
+ .join("\n"),
+ );
+
let srv = actix_web::HttpServer::new(move || {
App::new()
.wrap(configure_header(&inside_config.clone()))
.app_data(inside_config.clone())
+ .app_data(stylesheet.clone())
.wrap_fn(errors::error_page_middleware)
.wrap(middleware::Logger::default())
.route(&inside_config.favicon_route, web::get().to(favicon))
@@ -304,6 +318,31 @@ fn configure_app(app: &mut web::ServiceConfig, conf: &MiniserveConfig) {
}
}
+ // Handle --pretty-urls options.
+ //
+ // We rewrite the request to append ".html" to the path and serve the file. If the
+ // path ends with a `/`, we remove it before appending ".html".
+ //
+ // This is done to allow for pretty URLs, e.g. "/about" instead of "/about.html".
+ if conf.pretty_urls {
+ files = files.default_handler(fn_service(|req: ServiceRequest| async {
+ let (req, _) = req.into_parts();
+ let conf = req
+ .app_data::<MiniserveConfig>()
+ .expect("Could not get miniserve config");
+ let mut path_base = req.path()[1..].to_string();
+ if path_base.ends_with('/') {
+ path_base.pop();
+ }
+ if !path_base.ends_with("html") {
+ path_base = format!("{}.html", path_base);
+ }
+ let file = NamedFile::open_async(conf.path.join(path_base)).await?;
+ let res = file.into_response(&req);
+ Ok(ServiceResponse::new(req, res))
+ }));
+ }
+
if conf.show_hidden {
files = files.use_hidden_files();
}
@@ -345,9 +384,8 @@ async fn favicon() -> impl Responder {
.body(logo)
}
-async fn css() -> impl Responder {
- let css = include_str!(concat!(env!("OUT_DIR"), "/style.css"));
+async fn css(stylesheet: web::Data<String>) -> impl Responder {
HttpResponse::Ok()
.insert_header(ContentType(mime::TEXT_CSS))
- .body(css)
+ .body(stylesheet.to_string())
}
diff --git a/src/renderer.rs b/src/renderer.rs
index 1257a67..028925b 100644
--- a/src/renderer.rs
+++ b/src/renderer.rs
@@ -56,33 +56,7 @@ pub fn page(
(page_header(&title_path, conf.file_upload, &conf.favicon_route, &conf.css_route))
body #drop-container
- .(format!("default_theme_{}", conf.default_color_scheme))
- .(format!("default_theme_dark_{}", conf.default_color_scheme_dark)) {
-
- (PreEscaped(r#"
- <script>
- // read theme from local storage and apply it to body
- const body = document.body;
- var theme = localStorage.getItem('theme');
-
- if (theme != null && theme != 'default') {
- body.classList.add('theme_' + theme);
- }
-
- // updates the color scheme by replacing the appropriate class
- // on body and saving the new theme to local storage
- function updateColorScheme(name) {
- body.classList.remove.apply(body.classList, Array.from(body.classList).filter(v=>v.startsWith("theme_")));
-
- if (name != "default") {
- body.classList.add('theme_' + name);
- }
-
- localStorage.setItem('theme', name);
- }
- </script>
- "#))
-
+ {
div.toolbar_box_group {
@if conf.file_upload {
div.form {
@@ -293,8 +267,10 @@ fn wget_footer(abs_path: &Uri, root_dir_name: Option<&str>, current_user: Option
None => String::new(),
};
- let command =
- format!("wget -rcnHp -R 'index.html*'{cut_dirs}{user_params} '{abs_path}?raw=true'");
+ let encoded_abs_path = abs_path.to_string().replace('\'', "%27");
+ let command = format!(
+ "wget -rcnHp -R 'index.html*'{cut_dirs}{user_params} '{encoded_abs_path}?raw=true'"
+ );
let click_to_copy = format!("navigator.clipboard.writeText(\"{command}\")");
html! {
@@ -348,6 +324,21 @@ pub enum ThemeSlug {
Monokai,
}
+impl ThemeSlug {
+ pub fn css(&self) -> &str {
+ match self {
+ ThemeSlug::Squirrel => grass::include!("data/themes/squirrel.scss"),
+ ThemeSlug::Archlinux => grass::include!("data/themes/archlinux.scss"),
+ ThemeSlug::Zenburn => grass::include!("data/themes/zenburn.scss"),
+ ThemeSlug::Monokai => grass::include!("data/themes/monokai.scss"),
+ }
+ }
+
+ pub fn css_dark(&self) -> String {
+ format!("@media (prefers-color-scheme: dark) {{\n{}}}", self.css())
+ }
+}
+
/// Partial: qr code spoiler
fn qr_spoiler(show_qrcode: bool, content: &Uri) -> Markup {
html! {
@@ -377,7 +368,7 @@ fn color_scheme_selector(hide_theme_selector: bool) -> Markup {
}
ul.theme {
@for color_scheme in THEME_PICKER_CHOICES {
- li.(format!("theme_{}", color_scheme.1)) {
+ li data-theme=(color_scheme.1) {
(color_scheme_link(color_scheme))
}
}
@@ -586,12 +577,40 @@ fn page_header(title: &str, file_upload: bool, favicon_route: &str, css_route: &
meta charset="utf-8";
meta http-equiv="X-UA-Compatible" content="IE=edge";
meta name="viewport" content="width=device-width, initial-scale=1";
+ meta name="color-scheme" content="dark light";
link rel="icon" type="image/svg+xml" href={ (favicon_route) };
link rel="stylesheet" href={ (css_route) };
title { (title) }
+ (PreEscaped(r#"
+ <script>
+ // updates the color scheme by setting the theme data attribute
+ // on body and saving the new theme to local storage
+ function updateColorScheme(name) {
+ if (name && name != "default") {
+ localStorage.setItem('theme', name);
+ document.body.setAttribute("data-theme", name)
+ } else {
+ localStorage.removeItem('theme');
+ document.body.removeAttribute("data-theme")
+ }
+ }
+
+ // read theme from local storage and apply it to body
+ function loadColorScheme() {
+ var name = localStorage.getItem('theme');
+ updateColorScheme(name);
+ }
+
+ // load saved theme on page load
+ addEventListener("load", loadColorScheme);
+ // load saved theme when local storage is changed (synchronize between tabs)
+ addEventListener("storage", loadColorScheme);
+ </script>
+ "#))
+
@if file_upload {
(PreEscaped(r#"
<script>
@@ -660,19 +679,8 @@ pub fn render_error(
html {
(page_header(&error_code.to_string(), false, &conf.favicon_route, &conf.css_route))
- body.(format!("default_theme_{}", conf.default_color_scheme))
- .(format!("default_theme_dark_{}", conf.default_color_scheme_dark)) {
-
- (PreEscaped(r#"
- <script>
- // read theme from local storage and apply it to body
- var theme = localStorage.getItem('theme');
- if (theme != null && theme != 'default') {
- document.body.classList.add('theme_' + theme);
- }
- </script>
- "#))
-
+ body
+ {
div.error {
p { (error_code.to_string()) }
@for error in error_description.lines() {
diff --git a/tests/serve_request.rs b/tests/serve_request.rs
index e717525..ac4360e 100644
--- a/tests/serve_request.rs
+++ b/tests/serve_request.rs
@@ -268,6 +268,24 @@ fn serve_index_instead_of_404_in_spa_mode(
}
#[rstest]
+#[case(server_no_stderr(&["--pretty-urls", "--index", FILES[1]]), "/")]
+#[case(server_no_stderr(&["--pretty-urls", "--index", FILES[1]]), "test.html")]
+#[case(server_no_stderr(&["--pretty-urls", "--index", FILES[1]]), "test")]
+fn serve_file_instead_of_404_in_pretty_urls_mode(
+ #[case] server: TestServer,
+ #[case] url: &str,
+) -> Result<(), Error> {
+ let body = reqwest::blocking::get(format!("{}{}", server.url(), url))?.error_for_status()?;
+ let parsed = Document::from_read(body)?;
+ assert!(parsed
+ .find(|x: &Node| x.text() == "Test Hello Yes")
+ .next()
+ .is_some());
+
+ Ok(())
+}
+
+#[rstest]
#[case(server(&["--route-prefix", "foobar"]))]
#[case(server(&["--route-prefix", "/foobar/"]))]
fn serves_requests_with_route_prefix(#[case] server: TestServer) -> Result<(), Error> {
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 18:51:07 +0000