mirrors/img2irc
1
Fork 0
mirror of https://github.com/waveplate/img2irc.git synced 2024-11-25 00:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix irc rendering bug, remove trailing newline after irc/ansi

Browse Source
This commit is contained in:
Anatoly Bazarov 2023-06-22 22:30:59 -04:00
parent ff9ac2667f
commit ff7b1d8b2f
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/draw.rs
View File

@ -116,7 +116,7 @@ pub fn halfblock_bitmap(bitmap: &Vec<Vec<u32>>) -> Vec<Vec<AnsiPixelPair>> {
pub fn ansi_draw_24bit(image: AnsiImage) -> String { pub fn ansi_draw_24bit(image: AnsiImage) -> String {
let mut out: String = String::new(); let mut out: String = String::new();
for row in image.halfblock { for (y, row) in image.halfblock.iter().enumerate() {
for pixel_pair in row.iter() { for pixel_pair in row.iter() {
let fg = make_rgb_u8(pixel_pair.top.orig) let fg = make_rgb_u8(pixel_pair.top.orig)
.to_vec() .to_vec()
@ -133,14 +133,17 @@ pub fn ansi_draw_24bit(image: AnsiImage) -> String {
out.push_str(format!("\x1b[38;2;{}m\x1b[48;2;{}m{}", fg.join(";"), bg.join(";"), CHAR).as_str()); out.push_str(format!("\x1b[38;2;{}m\x1b[48;2;{}m{}", fg.join(";"), bg.join(";"), CHAR).as_str());
} }
out.push_str("\x1b[0m"); out.push_str("\x1b[0m");
out.push_str("\n");
if y != image.halfblock.len() - 1 {
out.push_str("\n");
}
} }
return out return out
} }
pub fn ansi_draw_8bit(image: AnsiImage) -> String { pub fn ansi_draw_8bit(image: AnsiImage) -> String {
let mut out: String = String::new(); let mut out: String = String::new();
for row in image.halfblock { for (y, row) in image.halfblock.iter().enumerate() {
for pixel_pair in row.iter() { for pixel_pair in row.iter() {
let fg = pixel_pair.top.ansi; let fg = pixel_pair.top.ansi;
let bg = pixel_pair.bottom.ansi; let bg = pixel_pair.bottom.ansi;
@ -148,32 +151,44 @@ pub fn ansi_draw_8bit(image: AnsiImage) -> String {
out.push_str(format!("\x1b[38;5;{}m\x1b[48;5;{}m{}", fg, bg, CHAR).as_str()); out.push_str(format!("\x1b[38;5;{}m\x1b[48;5;{}m{}", fg, bg, CHAR).as_str());
} }
out.push_str("\x1b[0m"); out.push_str("\x1b[0m");
out.push_str("\n");
if y != image.halfblock.len() - 1 {
out.push_str("\n");
}
} }
return out return out
} }
pub fn irc_draw(image: AnsiImage) -> String { pub fn irc_draw(image: AnsiImage) -> String {
let mut out: String = String::new(); let mut out: String = String::new();
for row in image.halfblock { for (y, row) in image.halfblock.iter().enumerate() {
let mut last_fg: u8 = 0; let mut last_fg: u8 = 0;
let mut last_bg: u8 = 0; let mut last_bg: u8 = 0;
for pixel_pair in row.iter() { for (x, pixel_pair) in row.iter().enumerate() {
let fg = pixel_pair.top.irc; let fg = pixel_pair.top.irc;
let bg = pixel_pair.bottom.irc; let bg = pixel_pair.bottom.irc;
if fg == last_fg && bg == last_bg { if x != 0 {
out.push_str(format!("{}", CHAR).as_str()); if fg == last_fg && bg == last_bg {
} else if bg == last_bg { out.push_str(&format!("{}", CHAR));
out.push_str(format!("\x03{}{}", fg, CHAR).as_str()); } else if bg == last_bg {
out.push_str(&format!("\x03{}{}", fg, CHAR));
} else {
out.push_str(&format!("\x03{},{}{}", fg, bg, CHAR));
}
} else { } else {
out.push_str(format!("\x03{},{}{}", fg, bg, CHAR).as_str()); out.push_str(&format!("\x03{},{}{}", fg, bg, CHAR));
} }
last_fg = fg; last_fg = fg;
last_bg = bg; last_bg = bg;
} }
out.push_str("\n");
out.push_str("\x0f");
if y != image.halfblock.len() - 1 {
out.push_str("\n");
}
} }
return out return out
} }