cadey/xesite
cadey
/
xesite
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

fix atom feeds

This commit is contained in:
Cadey Ratio 2020-07-26 21:54:58 -04:00
parent de80df68ae
commit 309443d6b7
6 changed files with 180 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
Cargo.lock generated
View File

@ -68,9 +68,9 @@ dependencies = [
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.31" version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f" checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
[[package]] [[package]]
name = "arrayvec" name = "arrayvec"
@ -79,18 +79,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
[[package]] [[package]]
name = "atom_syndication" name = "async-channel"
version = "0.9.0" version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d0b2fa7aedc48c4fbe1d38b25c1462a6e7b962397f27a3a8d7cbb1c08f0008b" checksum = "ee81ba99bee79f3c8ae114ae4baa7eaa326f63447cf2ec65e4393618b63f8770"
dependencies = [ dependencies = [
"chrono", "concurrent-queue",
"derive_builder", "event-listener",
"diligent-date-parser", "futures-core",
"quick-xml 0.18.1",
"serde",
] ]
[[package]]
name = "atomic-waker"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
[[package]] [[package]]
name = "atty" name = "atty"
version = "0.2.14" version = "0.2.14"
@ -169,12 +173,13 @@ dependencies = [
[[package]] [[package]]
name = "blocking" name = "blocking"
version = "0.4.6" version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d17efb70ce4421e351d61aafd90c16a20fb5bfe339fcdc32a86816280e62ce0" checksum = "d2468ff7bf85066b4a3678fede6fe66db31846d753ff0adfbfab2c6a6e81612b"
dependencies = [ dependencies = [
"futures-channel", "async-channel",
"futures-util", "atomic-waker",
"futures-lite",
"once_cell", "once_cell",
"parking", "parking",
"waker-fn", "waker-fn",
@ -220,6 +225,12 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
[[package]]
name = "cache-padded"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.58" version = "1.0.58"
@ -294,6 +305,15 @@ dependencies = [
"unicode_categories", "unicode_categories",
] ]
[[package]]
name = "concurrent-queue"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1582139bb74d97ef232c30bc236646017db06f13ee7cc01fa24c9e55640f86d4"
dependencies = [
"cache-padded",
]
[[package]] [[package]]
name = "core-foundation" name = "core-foundation"
version = "0.7.0" version = "0.7.0"
@ -427,15 +447,6 @@ dependencies = [
"generic-array", "generic-array",
] ]
[[package]]
name = "diligent-date-parser"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28caca0eb64b9b22bdcab47424e0f7716af92d33ad035f765e5ec2b08cf14fcc"
dependencies = [
"chrono",
]
[[package]] [[package]]
name = "doc-comment" name = "doc-comment"
version = "0.3.3" version = "0.3.3"
@ -477,7 +488,7 @@ checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
dependencies = [ dependencies = [
"atty", "atty",
"humantime", "humantime",
"log 0.4.8", "log 0.4.11",
"regex", "regex",
"termcolor", "termcolor",
] ]
@ -501,12 +512,24 @@ dependencies = [
"version_check 0.9.2", "version_check 0.9.2",
] ]
[[package]]
name = "event-listener"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "829694371bd7bbc6aee17c4ff624aad8bf9f4dc06c6f9f6071eaa08c89530d10"
[[package]] [[package]]
name = "fake-simd" name = "fake-simd"
version = "0.1.2" version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
[[package]]
name = "fastrand"
version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36a9cb09840f81cd211e435d00a4e487edd263dc3c8ff815c32dd76ad668ebed"
[[package]] [[package]]
name = "fnv" name = "fnv"
version = "1.0.7" version = "1.0.7"
@ -598,6 +621,21 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
[[package]]
name = "futures-lite"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cc8771bd1bb4c7be3c5f072a1d5e18086ef220f100a0a4efece41076e87b9f2"
dependencies = [
"fastrand",
"futures-core",
"futures-io",
"memchr",
"parking",
"pin-project-lite",
"waker-fn",
]
[[package]] [[package]]
name = "futures-macro" name = "futures-macro"
version = "0.3.5" version = "0.3.5"
@ -711,6 +749,15 @@ version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177" checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
[[package]]
name = "hashbrown"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34f595585f103464d8d2f6e9864682d74c1601fed5e07d62b1c9058dba8246fb"
dependencies = [
"autocfg 1.0.0",
]
[[package]] [[package]]
name = "headers" name = "headers"
version = "0.3.2" version = "0.3.2"
@ -843,11 +890,12 @@ dependencies = [
[[package]] [[package]]
name = "indexmap" name = "indexmap"
version = "1.4.0" version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe" checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7"
dependencies = [ dependencies = [
"autocfg 1.0.0", "autocfg 1.0.0",
"hashbrown",
] ]
[[package]] [[package]]
@ -868,6 +916,12 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "ipnet"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.9.0" version = "0.9.0"
@ -885,9 +939,9 @@ checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
[[package]] [[package]]
name = "js-sys" name = "js-sys"
version = "0.3.41" version = "0.3.42"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4b9172132a62451e56142bff9afc91c8e4a4500aa5b847da36815b63bfda916" checksum = "52732a3d3ad72c58ad2dc70624f9c17b46ecd0943b9a4f1ee37c4c18c5d983e2"
dependencies = [ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
@ -939,9 +993,9 @@ dependencies = [
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.72" version = "0.2.73"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701" checksum = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9"
[[package]] [[package]]
name = "libflate" name = "libflate"
@ -973,14 +1027,14 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
dependencies = [ dependencies = [
"log 0.4.8", "log 0.4.11",
] ]
[[package]] [[package]]
name = "log" name = "log"
version = "0.4.8" version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
] ]
@ -1067,7 +1121,7 @@ dependencies = [
"iovec", "iovec",
"kernel32-sys", "kernel32-sys",
"libc", "libc",
"log 0.4.8", "log 0.4.11",
"miow", "miow",
"net2", "net2",
"slab", "slab",
@ -1094,7 +1148,7 @@ checksum = "136eed74cadb9edd2651ffba732b19a450316b680e4f48d6c79e905799e19d01"
dependencies = [ dependencies = [
"buf_redux", "buf_redux",
"httparse", "httparse",
"log 0.4.8", "log 0.4.11",
"mime 0.2.6", "mime 0.2.6",
"mime_guess 1.8.8", "mime_guess 1.8.8",
"quick-error", "quick-error",
@ -1112,7 +1166,7 @@ checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"libc", "libc",
"log 0.4.8", "log 0.4.11",
"openssl", "openssl",
"openssl-probe", "openssl-probe",
"openssl-sys", "openssl-sys",
@ -1226,9 +1280,9 @@ dependencies = [
[[package]] [[package]]
name = "parking" name = "parking"
version = "1.0.4" version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1efcee3c6d23b94012e240525f131c6abaa9e5eeb8f211002d93beec3b7be350" checksum = "6cb300f271742d4a2a66c01b6b2fa0c83dfebd2e0bf11addb879a3547b4ed87c"
[[package]] [[package]]
name = "patreon" name = "patreon"
@ -1236,7 +1290,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"chrono", "chrono",
"envy", "envy",
"log 0.3.9", "log 0.4.11",
"pretty_env_logger", "pretty_env_logger",
"reqwest", "reqwest",
"serde", "serde",
@ -1417,14 +1471,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
dependencies = [ dependencies = [
"env_logger", "env_logger",
"log 0.4.8", "log 0.4.11",
] ]
[[package]] [[package]]
name = "proc-macro-hack" name = "proc-macro-hack"
version = "0.5.16" version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
[[package]] [[package]]
name = "proc-macro-nested" name = "proc-macro-nested"
@ -1434,9 +1488,9 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.18" version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
dependencies = [ dependencies = [
"unicode-xid", "unicode-xid",
] ]
@ -1486,16 +1540,6 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "quick-xml"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cc440ee4802a86e357165021e3e255a9143724da31db1e2ea540214c96a0f82"
dependencies = [
"encoding_rs",
"memchr",
]
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.7" version = "1.0.7"
@ -1696,9 +1740,9 @@ dependencies = [
[[package]] [[package]]
name = "reqwest" name = "reqwest"
version = "0.10.6" version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b82c9238b305f26f53443e3a4bc8528d64b8d0bee408ec949eb7bf5635ec680" checksum = "12427a5577082c24419c9c417db35cfeb65962efc7675bb6b0d5f1f9d315bfe6"
dependencies = [ dependencies = [
"base64 0.12.3", "base64 0.12.3",
"bytes", "bytes",
@ -1709,9 +1753,10 @@ dependencies = [
"http-body", "http-body",
"hyper", "hyper",
"hyper-tls", "hyper-tls",
"ipnet",
"js-sys", "js-sys",
"lazy_static", "lazy_static",
"log 0.4.8", "log 0.4.11",
"mime 0.3.16", "mime 0.3.16",
"mime_guess 2.0.3", "mime_guess 2.0.3",
"native-tls", "native-tls",
@ -1742,7 +1787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99979205510c60f80a119dedbabd0b8426517384edf205322f8bcd51796bcef9" checksum = "99979205510c60f80a119dedbabd0b8426517384edf205322f8bcd51796bcef9"
dependencies = [ dependencies = [
"derive_builder", "derive_builder",
"quick-xml 0.17.2", "quick-xml",
] ]
[[package]] [[package]]
@ -1871,9 +1916,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.56" version = "1.0.57"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
dependencies = [ dependencies = [
"itoa", "itoa",
"ryu", "ryu",
@ -1996,9 +2041,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.34" version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b" checksum = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2084,9 +2129,9 @@ checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "0.2.21" version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58" checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
dependencies = [ dependencies = [
"bytes", "bytes",
"fnv", "fnv",
@ -2129,7 +2174,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8b8fe88007ebc363512449868d7da4389c9400072a3f666f212c7280082882a" checksum = "b8b8fe88007ebc363512449868d7da4389c9400072a3f666f212c7280082882a"
dependencies = [ dependencies = [
"futures", "futures",
"log 0.4.8", "log 0.4.11",
"pin-project", "pin-project",
"tokio", "tokio",
"tungstenite", "tungstenite",
@ -2144,7 +2189,7 @@ dependencies = [
"bytes", "bytes",
"futures-core", "futures-core",
"futures-sink", "futures-sink",
"log 0.4.8", "log 0.4.11",
"pin-project-lite", "pin-project-lite",
"tokio", "tokio",
] ]
@ -2157,12 +2202,12 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
[[package]] [[package]]
name = "tracing" name = "tracing"
version = "0.1.16" version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2e2a2de6b0d5cbb13fc21193a2296888eaab62b6044479aafb3c54c01c29fcd" checksum = "dbdf4ccd1652592b01286a5dbe1e2a77d78afaa34beadd9872a5f7396f92aaa9"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"log 0.4.8", "log 0.4.11",
"tracing-core", "tracing-core",
] ]
@ -2175,6 +2220,16 @@ dependencies = [
"lazy_static", "lazy_static",
] ]
[[package]]
name = "tracing-futures"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
dependencies = [
"pin-project",
"tracing",
]
[[package]] [[package]]
name = "try-lock" name = "try-lock"
version = "0.2.3" version = "0.2.3"
@ -2193,7 +2248,7 @@ dependencies = [
"http", "http",
"httparse", "httparse",
"input_buffer", "input_buffer",
"log 0.4.8", "log 0.4.11",
"rand 0.7.3", "rand 0.7.3",
"sha-1", "sha-1",
"url", "url",
@ -2367,22 +2422,22 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
dependencies = [ dependencies = [
"log 0.4.8", "log 0.4.11",
"try-lock", "try-lock",
] ]
[[package]] [[package]]
name = "warp" name = "warp"
version = "0.2.3" version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e95175b7a927258ecbb816bdada3cc469cb68593e7940b96a60f4af366a9970" checksum = "df341dee97c9ae29dfa5e0b0fbbbf620e0d6a36686389bedf83b3daeb8b0d0ac"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures", "futures",
"headers", "headers",
"http", "http",
"hyper", "hyper",
"log 0.4.8", "log 0.4.11",
"mime 0.3.16", "mime 0.3.16",
"mime_guess 2.0.3", "mime_guess 2.0.3",
"multipart", "multipart",
@ -2394,6 +2449,8 @@ dependencies = [
"tokio", "tokio",
"tokio-tungstenite", "tokio-tungstenite",
"tower-service", "tower-service",
"tracing",
"tracing-futures",
"urlencoding", "urlencoding",
] ]
@ -2405,9 +2462,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]] [[package]]
name = "wasm-bindgen" name = "wasm-bindgen"
version = "0.2.64" version = "0.2.65"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a634620115e4a229108b71bde263bb4220c483b3f07f5ba514ee8d15064c4c2" checksum = "f3edbcc9536ab7eababcc6d2374a0b7bfe13a2b6d562c5e07f370456b1a8f33d"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"serde", "serde",
@ -2417,13 +2474,13 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-backend" name = "wasm-bindgen-backend"
version = "0.2.64" version = "0.2.65"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e53963b583d18a5aa3aaae4b4c1cb535218246131ba22a71f05b518098571df" checksum = "89ed2fb8c84bfad20ea66b26a3743f3e7ba8735a69fe7d95118c33ec8fc1244d"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"lazy_static", "lazy_static",
"log 0.4.8", "log 0.4.11",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn",
@ -2432,9 +2489,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-futures" name = "wasm-bindgen-futures"
version = "0.4.14" version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dba48d66049d2a6cc8488702e7259ab7afc9043ad0dc5448444f46f2a453b362" checksum = "41ad6e4e8b2b7f8c90b6e09a9b590ea15cb0d1dbe28502b5a405cd95d1981671"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"js-sys", "js-sys",
@ -2444,9 +2501,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro" name = "wasm-bindgen-macro"
version = "0.2.64" version = "0.2.65"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fcfd5ef6eec85623b4c6e844293d4516470d8f19cd72d0d12246017eb9060b8" checksum = "eb071268b031a64d92fc6cf691715ca5a40950694d8f683c5bb43db7c730929e"
dependencies = [ dependencies = [
"quote", "quote",
"wasm-bindgen-macro-support", "wasm-bindgen-macro-support",
@ -2454,9 +2511,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro-support" name = "wasm-bindgen-macro-support"
version = "0.2.64" version = "0.2.65"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9adff9ee0e94b926ca81b57f57f86d5545cdcb1d259e21ec9bdd95b901754c75" checksum = "cf592c807080719d1ff2f245a687cbadb3ed28b2077ed7084b47aba8b691f2c6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2467,15 +2524,15 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-shared" name = "wasm-bindgen-shared"
version = "0.2.64" version = "0.2.65"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f7b90ea6c632dd06fd765d44542e234d5e63d9bb917ecd64d79778a13bd79ae" checksum = "72b6c0220ded549d63860c78c38f3bcc558d1ca3f4efa74942c536ddbbb55e87"
[[package]] [[package]]
name = "web-sys" name = "web-sys"
version = "0.3.41" version = "0.3.42"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "863539788676619aac1a23e2df3655e96b32b0e05eb72ca34ba045ad573c625d" checksum = "8be2398f326b7ba09815d0b403095f34dd708579220d099caae89be0b32137b2"
dependencies = [ dependencies = [
"js-sys", "js-sys",
"wasm-bindgen", "wasm-bindgen",
@ -2545,10 +2602,9 @@ dependencies = [
[[package]] [[package]]
name = "xesite" name = "xesite"
version = "2.0.0" version = "2.0.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"atom_syndication",
"chrono", "chrono",
"comrak", "comrak",
"envy", "envy",
@ -2558,7 +2614,7 @@ dependencies = [
"jsonfeed", "jsonfeed",
"kankyo", "kankyo",
"lazy_static", "lazy_static",
"log 0.4.8", "log 0.4.11",
"mime 0.3.16", "mime 0.3.16",
"patreon", "patreon",
"pretty_env_logger", "pretty_env_logger",

6
Cargo.toml
View File

@ -1,15 +1,15 @@
[package] [package]
name = "xesite" name = "xesite"
version = "2.0.0" version = "2.0.1"
authors = ["Christine Dodrill <me@christine.website>"] authors = ["Christine Dodrill <me@christine.website>"]
edition = "2018" edition = "2018"
build = "src/build.rs" build = "src/build.rs"
repository = "https://github.com/Xe/site"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
atom_syndication = { version = "0.9", features = ["with-serde"] }
chrono = "0.4" chrono = "0.4"
comrak = "0.8" comrak = "0.8"
envy = "0.4" envy = "0.4"
@ -17,7 +17,7 @@ glob = "0.3"
hyper = "0.13" hyper = "0.13"
kankyo = "0.3" kankyo = "0.3"
lazy_static = "1.4" lazy_static = "1.4"
log = "0" log = "0.4"
mime = "0.3.0" mime = "0.3.0"
pretty_env_logger = "0" pretty_env_logger = "0"
prometheus = { version = "0.9", default-features = false, features = ["process"] } prometheus = { version = "0.9", default-features = false, features = ["process"] }

22
src/app.rs
View File

@ -1,6 +1,5 @@
use crate::{post::Post, signalboost::Person}; use crate::{post::Post, signalboost::Person};
use anyhow::Result; use anyhow::Result;
use atom_syndication as atom;
use comrak::{markdown_to_html, ComrakOptions}; use comrak::{markdown_to_html, ComrakOptions};
use serde::Deserialize; use serde::Deserialize;
use std::{fs, path::PathBuf}; use std::{fs, path::PathBuf};
@ -66,7 +65,6 @@ pub struct State {
pub everything: Vec<Post>, pub everything: Vec<Post>,
pub jf: jsonfeed::Feed, pub jf: jsonfeed::Feed,
pub rf: rss::Channel, pub rf: rss::Channel,
pub af: atom::Feed,
pub sitemap: Vec<u8>, pub sitemap: Vec<u8>,
pub patrons: Option<patreon::Users>, pub patrons: Option<patreon::Users>,
} }
@ -94,7 +92,6 @@ pub async fn init(cfg: PathBuf) -> Result<State> {
everything.reverse(); everything.reverse();
let mut ri: Vec<rss::Item> = vec![]; let mut ri: Vec<rss::Item> = vec![];
let mut ai: Vec<atom::Entry> = vec![];
let mut jfb = jsonfeed::Feed::builder() let mut jfb = jsonfeed::Feed::builder()
.title("Christine Dodrill's Blog") .title("Christine Dodrill's Blog")
@ -115,26 +112,8 @@ pub async fn init(cfg: PathBuf) -> Result<State> {
let post = post.clone(); let post = post.clone();
jfb = jfb.item(post.clone().into()); jfb = jfb.item(post.clone().into());
ri.push(post.clone().into()); ri.push(post.clone().into());
ai.push(post.clone().into());
} }
let af = {
let mut af = atom::FeedBuilder::default();
af.title("Christine Dodrill's Blog");
af.id("https://christine.website/blog");
af.generator({
let mut generator = atom::Generator::default();
generator.set_value(env!("CARGO_PKG_NAME"));
generator.set_version(env!("CARGO_PKG_VERSION").to_string());
generator.set_uri("https://github.com/Xe/site".to_string());
generator
});
af.entries(ai);
af.build().unwrap()
};
let rf = { let rf = {
let mut rf = rss::ChannelBuilder::default(); let mut rf = rss::ChannelBuilder::default();
rf.title("Christine Dodrill's Blog"); rf.title("Christine Dodrill's Blog");
@ -173,7 +152,6 @@ pub async fn init(cfg: PathBuf) -> Result<State> {
talks: talks, talks: talks,
everything: everything, everything: everything,
jf: jfb.build(), jf: jfb.build(),
af: af,
rf: rf, rf: rf,
sitemap: sm, sitemap: sm,
patrons: patrons().await?, patrons: patrons().await?,

12
src/handlers/feeds.rs
View File

@ -1,7 +1,7 @@
use crate::app::State; use crate::{app::State, templates};
use lazy_static::lazy_static; use lazy_static::lazy_static;
use prometheus::{opts, register_int_counter_vec, IntCounterVec}; use prometheus::{opts, register_int_counter_vec, IntCounterVec};
use std::sync::Arc; use std::{sync::Arc, io};
use warp::{http::Response, Rejection, Reply}; use warp::{http::Response, Rejection, Reply};
lazy_static! { lazy_static! {
@ -20,9 +20,9 @@ pub async fn jsonfeed(state: Arc<State>) -> Result<impl Reply, Rejection> {
#[derive(Debug)] #[derive(Debug)]
pub enum RenderError { pub enum RenderError {
WriteAtom(atom_syndication::Error),
WriteRss(rss::Error), WriteRss(rss::Error),
Build(warp::http::Error), Build(warp::http::Error),
IO(io::Error),
} }
impl warp::reject::Reject for RenderError {} impl warp::reject::Reject for RenderError {}
@ -31,10 +31,8 @@ pub async fn atom(state: Arc<State>) -> Result<impl Reply, Rejection> {
HIT_COUNTER.with_label_values(&["atom"]).inc(); HIT_COUNTER.with_label_values(&["atom"]).inc();
let state = state.clone(); let state = state.clone();
let mut buf = Vec::new(); let mut buf = Vec::new();
state templates::blog_atom_xml(&mut buf, state.everything.clone())
.af .map_err(RenderError::IO)
.write_to(&mut buf)
.map_err(RenderError::WriteAtom)
.map_err(warp::reject::custom)?; .map_err(warp::reject::custom)?;
Response::builder() Response::builder()
.status(200) .status(200)

33
src/post/mod.rs
View File

@ -1,5 +1,4 @@
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use atom_syndication as atom;
use chrono::prelude::*; use chrono::prelude::*;
use glob::glob; use glob::glob;
use std::{cmp::Ordering, fs}; use std::{cmp::Ordering, fs};
@ -53,38 +52,6 @@ impl Into<jsonfeed::Item> for Post {
} }
} }
impl Into<atom::Entry> for Post {
fn into(self) -> atom::Entry {
let mut content = atom::ContentBuilder::default();
content.src(format!("https://christine.website/{}", self.link));
content.content_type(Some("text/html;charset=utf-8".into()));
content.value(Some(xml::escape::escape_str_pcdata(&self.body_html).into()));
let content = content.build().unwrap();
let mut result = atom::EntryBuilder::default();
result.id(format!("https://christine.website/{}", self.link));
result.contributors({
let mut me = atom::Person::default();
me.set_name("Christine Dodrill");
me.set_email("me@christine.website".to_string());
me.set_uri("https://christine.website".to_string());
vec![me]
});
result.title(self.front_matter.title);
let mut link = atom::Link::default();
link.href = format!("https://christine.website/{}", self.link);
result.links(vec![link]);
result.content(content);
result.published(self.date);
result.build().unwrap()
}
}
impl Into<rss::Item> for Post { impl Into<rss::Item> for Post {
fn into(self) -> rss::Item { fn into(self) -> rss::Item {
let mut guid = rss::Guid::default(); let mut guid = rss::Guid::default();

24
templates/blog_atom.rs.xml Normal file
View File

@ -0,0 +1,24 @@
@use crate::post::Post;
@(posts: Vec<Post>)
<?xml version='1.0' encoding='UTF-8'?>
<feed xmlns="http://www.w3.org/2005/Atom">
<id>https://christine.website/blog.atom</id>
<title>Christine Dodrill's Blog</title>
<author>
<name>Christine Dodrill</name>
<email>me@@christine.website</email>
</author>
<link href="https://christine.website/blog.atom" rel="self"/>
<link href="https://christine.website/blog" rel="alternate"/>
<generator uri="@env!("CARGO_PKG_REPOSITORY")" version="@env!("CARGO_PKG_VERSION")">@env!("CARGO_PKG_NAME")</generator>
@for post in posts {
<entry>
<id>https://christine.website/@post.link</id>
<title>@post.front_matter.title</title>
<updated>@post.front_matter.date+00:00</updated>
<link href="https://christine.website/@post.link" rel="alternate"/>
</entry>
}
</feed>