p/pukram-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated pukram2html version, no need to add newline at end of block anymore

Browse Source
This commit is contained in:
p11 2023-11-12 12:11:59 +01:00
parent 43f1b0b3a8
commit 8b84aaaf61
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Cargo.lock generated
View File

@ -8,11 +8,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "405b47b778683e13f388382bf1fb59e54e1008a2e6d048fb2b63672632863c95" checksum = "405b47b778683e13f388382bf1fb59e54e1008a2e6d048fb2b63672632863c95"
[[package]]
name = "formatting"
version = "0.1.0"
source = "git+https://gitlab.com/porky11/formatting#7edec9731c042bd2cdd7f3a1674cb2e1b0303e42"
[[package]] [[package]]
name = "hermit-abi" name = "hermit-abi"
version = "0.3.2" version = "0.3.2"
@ -102,6 +97,12 @@ dependencies = [
"unicode-ident", "unicode-ident",
] ]
[[package]]
name = "pukram-formatting"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1bee8fffac6d7af5542feccd3e2010dffcc1384498ed0834712c4958ece2fe7"
[[package]] [[package]]
name = "pukram-server" name = "pukram-server"
version = "0.1.0" version = "0.1.0"
@ -116,9 +117,9 @@ dependencies = [
[[package]] [[package]]
name = "pukram2html" name = "pukram2html"
version = "0.1.0" version = "0.1.0"
source = "git+https://gitlab.com/porky11/pukram2html#fd8d848986f80ea9ec173fd0b91966f88ea6fa6d" source = "git+https://gitlab.com/porky11/pukram2html#ba7292d514eccc10c2774f97dccb9e871234e982"
dependencies = [ dependencies = [
"formatting", "pukram-formatting",
] ]
[[package]] [[package]]

13
src/main.rs
View File

@ -472,15 +472,13 @@ fn handle_relative_connection(
let mut has_text = false; let mut has_text = false;
convert_extended( convert_extended(
lines lines.take_while(|line| {
.take_while(|line| {
let empty = line.trim().is_empty(); let empty = line.trim().is_empty();
if !empty { if !empty {
has_text = true; has_text = true;
} }
!empty || !has_text !empty || !has_text
}) }),
.chain(std::iter::once(String::new())),
&mut stream, &mut stream,
Settings::default() Settings::default()
.with_handler(handle_entry) .with_handler(handle_entry)
@ -539,14 +537,11 @@ fn handle_relative_connection(
} }
} }
convert_subheader( convert_subheader(
lines lines.clone().take_while(|line| {
.clone()
.take_while(|line| {
let empty = line.trim().is_empty(); let empty = line.trim().is_empty();
last_empty = empty; last_empty = empty;
empty && !last_empty empty && !last_empty
}) }),
.chain(std::iter::once(String::new())),
&mut stream, &mut stream,
1, 1,
); );