From 43f1b0b3a84d547a692d4bcb35798c286deb30bd Mon Sep 17 00:00:00 2001 From: p11 Date: Tue, 7 Nov 2023 20:42:59 +0100 Subject: [PATCH] Display count and number of story entry --- src/main.rs | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/main.rs b/src/main.rs index 5acc869..f3a318a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -384,9 +384,6 @@ fn handle_relative_connection( .rsplit_once('/') .map(|(_, title)| title) .unwrap_or(relative_path); - if !title.is_empty() { - let _ = writeln!(stream, "

{title}

"); - } let handle_entry = |mut entry: &str, output: &mut TcpStream, level: usize| { let level = level + 1; @@ -440,6 +437,19 @@ fn handle_relative_connection( } } + for line in lines.clone() { + let empty = line.trim().is_empty(); + if empty == last_empty { + continue; + } + if empty { + block += 1; + } + last_empty = empty; + } + + let _ = writeln!(stream, "

{title} ({}/{})

", i + 1, block); + let _ = writeln!( stream, "< Stop >

" @@ -451,16 +461,6 @@ fn handle_relative_connection( let _ = writeln!(stream, "< Prev"); } - for line in lines.clone() { - let empty = line.trim().is_empty(); - if empty == last_empty { - continue; - } - if empty { - block += 1; - } - last_empty = empty; - } if i + 1 < block { let next = i + 1; let _ = writeln!(stream, "Next >"); @@ -488,6 +488,9 @@ fn handle_relative_connection( .with_use_textboxes(true), ); } else { + if !title.is_empty() { + let _ = writeln!(stream, "

{title}

"); + } let _ = writeln!(stream, "< Play >"); convert_extended( lines.map(|line| line.unwrap_or_default()),