sashakoshka/bulb
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Posting now reads from stdin, supports multiline input

Browse Source
This commit is contained in:
Sasha Koshka 2024-10-11 11:17:52 -04:00
parent 1ca8a9ce98
commit 8f5d7d6df2
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bulb/bulb.ha
View File

@ -1,8 +1,9 @@
use bufio;
use fs; use fs;
use fmt; use fmt;
use io; use io;
use path;
use os; use os;
use path;
use strings; use strings;
let bulb_path: []str = []; let bulb_path: []str = [];
@ -25,13 +26,13 @@ export fn read(output: io::handle, board: str, number: int) (void | error) = {
let location = look_up_board(board)?; let location = look_up_board(board)?;
let file = os::open(location)?; let file = os::open(location)?;
defer io::close(file)!; defer io::close(file)!;
// we add 1 to acount for the blank line that will always be at the // we add 1 to account for the blank line that will always be at the
// bottom // bottom
seek_to_nth_last_line(file, number + 1)?; seek_to_nth_last_line(file, number + 1)?;
io::copy(output, file)?; io::copy(output, file)?;
}; };
export fn post(board: str, user_name: (str | void), message: str) (void | error) = { export fn post(input: io::handle, board: str, user_name: (str | void)) (void | error) = {
validate_board_name(board)?; validate_board_name(board)?;
let location = look_up_board(board)?; let location = look_up_board(board)?;
let file = os::open(location, fs::flag::APPEND | fs::flag::WRONLY)?; let file = os::open(location, fs::flag::APPEND | fs::flag::WRONLY)?;
@ -41,7 +42,36 @@ export fn post(board: str, user_name: (str | void), message: str) (void | error)
case let user: str => yield(user); case let user: str => yield(user);
case void => yield "anonymous"; case void => yield "anonymous";
}; };
fmt::fprintf(file, "{}: {}\n", user, message)?;
static let file_wbuf: [os::BUFSZ]u8 = [0...];
let file = bufio::init(file, [], file_wbuf);
let scanner = bufio::newscanner(input);
defer bufio::finish(&scanner);
let saw_break = false;
fmt::fprintf(&file, "{}: ", user)?;
for (true) {
let byte = match (bufio::scan_byte(&scanner)?) {
case let byte: u8 => yield byte;
case io::EOF => break;
};
if (saw_break) {
fmt::fprint(&file, "\n ")?;
saw_break = false;
};
switch (byte) {
case '\n' =>
saw_break = true;
case =>
let fake_buffer: [1]u8 = [byte];
io::write(&file, fake_buffer)?;
};
};
fmt::fprint(&file, "\n")?;
bufio::flush(&file)?;
}; };
export fn list(output: io::handle) (void | error) = { export fn list(output: io::handle) (void | error) = {

2
cmd/bulb/main.ha
View File

@ -62,7 +62,7 @@ fn subcmd_post(cmd: *getopt::command) void = {
let message = strings::join(" ", cmd.args...); let message = strings::join(" ", cmd.args...);
defer free(message); defer free(message);
match (bulb::post(board, user_name, message)) { match (bulb::post(os::stdin, board, user_name)) {
case let err: bulb::error => case let err: bulb::error =>
fmt::errorf("{}: Could not read {}: {}\n", name, board, bulb::strerror(err))!; fmt::errorf("{}: Could not read {}: {}\n", name, board, bulb::strerror(err))!;
case void => void; case void => void;