seoxi/watcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Starting process of porting to tiny skia

Browse Source
This commit is contained in:
Seoxi Ryouko
2025-05-22 01:44:12 -05:00
parent fd87302642
commit 4d71f7fe23
5 changed files with 83 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/img.rs Normal file
View File

@ -0,0 +1,21 @@
use image::{RgbaImage, ExtendedColorType, ImageEncoder, load_from_memory};
use image::codecs::png::PngEncoder;
pub fn save_to_memory_png(p: &RgbaImage) -> Result<Vec<u8>, String> {
let (width, height) = p.dimensions();
let mut blob = Vec::<u8>::new();
let png_encoder = PngEncoder::new(&mut blob);
match png_encoder.write_image(p, width, height, ExtendedColorType::Rgba8) {
Ok(()) => Ok(blob),
Err(_) => Err("Failed to encode text png".to_string()),
}
}
pub fn ensure_32_bit_png(p: &[u8]) -> Result<Vec<u8>, String> {
let img = match load_from_memory(p) {
Ok(i) => i,
Err(e) => return Err(format!("Failed to load png: {e}")),
};
save_to_memory_png(&img.into_rgba8())
}

75
src/main.rs
View File

@ -1,3 +1,7 @@
#![allow(dead_code)]
#![allow(unused_variables)]
#![allow(unused_imports)]
#![allow(unused_macros)]
extern crate dotenvy;
extern crate lastfm;
extern crate reqwest;
@ -10,8 +14,11 @@ use serenity::model::channel::Message;
use serenity::model::id::UserId;
use serenity::prelude::*;
extern crate magick_rust;
use magick_rust::{ColorspaceType, CompositeOperator, MagickWand, PixelWand, magick_wand_genesis, FilterType};
extern crate tiny_skia;
extern crate image;
//extern crate magick_rust;
//use magick_rust::{ColorspaceType, CompositeOperator, MagickWand, PixelWand, magick_wand_genesis, FilterType};
use std::env;
use std::sync::Once;
@ -27,6 +34,7 @@ use imagetext::fontdb::FontDB;
use imagetext::superfont::SuperFont;
mod text;
mod img;
static START: Once = Once::new();
@ -60,18 +68,19 @@ macro_rules! log {
};
}
macro_rules! handle_magick_result {
macro_rules! handle_result {
($a: expr, $b: literal) => {
match $a {
Ok(_) => {
Ok(a) => {
log!("{} run successfully", stringify!($a));
a
}
Err(e) => return Reply::Text(format!("Error: {} {}", $b, e)),
}
};
}
macro_rules! handle_magick_option {
macro_rules! handle_option {
($a: expr, $b: literal) => {
match $a {
Some(res) => res,
@ -102,7 +111,7 @@ fn parse_cielab(s: String) -> Result<(f32, f32, f32), &'static str> {
}
}
fn validate_color(col: &PixelWand) -> Option<Lab> {
/*fn validate_color(col: &PixelWand) -> Option<Lab> {
let color_str = match col.get_color_as_string() {
Ok(s) => s,
Err(_) => return None,
@ -112,17 +121,18 @@ fn validate_color(col: &PixelWand) -> Option<Lab> {
Err(_) => return None,
};
Some(Lab::<D65>::from_components(color_raw))
}
}*/
const FMI_WIDTH: u32 = 548;
const FMI_HEIGHT: u32 = 147;
const FMI_GAP: i32 = 12;
async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Reply {
let lastfm_user = match arg {
"" => get_lastfm_username(ctx, id).await,
_ => Some(arg.to_string()),
};
let lastfm_client = match lastfm_user {
Some(s) => lastfm::Client::<String, String>::from_env(s),
None => return Reply::Text("No last.fm username set.".to_string()),
};
let lastfm_client = lastfm::Client::<String, String>::from_env(handle_option!(lastfm_user, "No last.fm username set."));
let now_playing = match lastfm_client.now_playing().await {
Ok(np) => np,
Err(e) => return Reply::Text(format!("Error: grabbing last.fm user data failed {e}")),
@ -141,19 +151,34 @@ async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Re
None => return Reply::Text("Error: getting image uri failed".to_string()),
};
let image = match get_image(ctx, image_uri.as_str()).await {
let image_base = match get_image(ctx, image_uri.as_str()).await {
Ok(i) => i,
Err(e) => return Reply::Text(format!("{}", e)),
Err(e) => return Reply::Text(e.to_string()),
};
let mut base_color = PixelWand::new();
//let image_base_raw = Vec::<u8>::new();
//let png_decoder = image::codecs::png::PngDecoder::new(&mut image_base);
//let mut image_rgba8 = Vec::<u8>::new();
//let png_encoder = image::codecs::png::PngEncoder::new(&mut image_rgba8);
//png_encoder.write_image(&image_base, image)
/*let mut base_color = PixelWand::new();
let mut white = PixelWand::new();
let main_wand = MagickWand::new();
let art_wand = MagickWand::new();
let mut art_wand_cluster = MagickWand::new();
let mask_wand = MagickWand::new();
let text_image_wand = MagickWand::new();
handle_magick_result!(
let text_image_wand = MagickWand::new();*/
let mut main_image = handle_option!(tiny_skia::Pixmap::new(FMI_WIDTH, FMI_HEIGHT), "Failed to load main image");
let album_image = handle_result!(tiny_skia::Pixmap::decode_png(&image_base), "Failed to load album art image");
//let album_image = handle_result!(tiny_skia::Pixmap::decode_png(&image_rgba8), "Failed to decode album art");
let art_size = (FMI_HEIGHT as i32 - 2_i32 * FMI_GAP) as f32 / 300.0;
let scale_matrix = tiny_skia::Transform::from_scale(art_size, art_size);
let paint = tiny_skia::PixmapPaint {
opacity: 1.0,
blend_mode: tiny_skia::BlendMode::Source,
quality: tiny_skia::FilterQuality::Bilinear,
};
main_image.draw_pixmap(FMI_GAP, FMI_GAP, album_image.as_ref(), &paint, scale_matrix, None);
/*handle_magick_result!(
base_color.set_color("#7f7f7f"),
"Failed to set init base color"
);
@ -329,8 +354,9 @@ async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Re
handle_magick_result!(
main_wand.compose_images(&avatar_wand, CompositeOperator::SrcOver, false, 473, 73),
"Failed to combine avatar image"
);
Reply::Image(main_wand.write_image_blob("png").unwrap())
);*/
//Reply::Image(main_wand.write_image_blob("png").unwrap())
Reply::Image(main_image.encode_png().unwrap())
}
async fn set(ctx: &Context, arg: &str, id: UserId) -> Reply {
@ -438,7 +464,7 @@ async fn set_lastfm_username(ctx: &Context, id: UserId, user: String) {
.expect("Failed to insert");
}
async fn get_image(ctx: &Context, url: &str) -> Result<Vec<u8>, reqwest_middleware::Error> {
async fn get_image(ctx: &Context, url: &str) -> Result<Vec<u8>, String> {
log!("get {}", url);
let data = ctx.data.write().await;
let http = data
@ -447,13 +473,14 @@ async fn get_image(ctx: &Context, url: &str) -> Result<Vec<u8>, reqwest_middlewa
match http.get(url).send().await {
Ok(resp) => {
log!("response received");
Ok(resp
let img_raw = resp
.bytes()
.await
.expect("Unable to resolve bytes")
.to_vec())
.to_vec();
img::ensure_32_bit_png(&img_raw)
}
Err(e) => Err(e),
Err(e) => Err(format!("{e}")),
}
}
@ -461,7 +488,7 @@ async fn get_image(ctx: &Context, url: &str) -> Result<Vec<u8>, reqwest_middlewa
async fn main() {
START.call_once(|| {
dotenvy::dotenv().expect("Failed to load .env");
magick_wand_genesis();
//magick_wand_genesis();
});
let db_url = env::var("DATABASE_URL").expect("Failed to load DATABASE_URL");

9
src/text.rs
View File

@ -11,6 +11,8 @@ use image::{RgbaImage, ExtendedColorType, ImageEncoder};
use image::codecs::png::PngEncoder;
use unicode_bidi::BidiInfo;
use crate::img;
enum TextField {
Title,
Artist,
@ -112,10 +114,5 @@ pub fn fmi_text(width: u32, height: u32, track: TrackInfo, fonts: &(SuperFont<'s
draw_info(&mut img, track.title, TextField::Title, &fonts.1.clone(), font_size, dark_text)?;
draw_info(&mut img, track.artist, TextField::Artist, &fonts.0.clone(), font_size, dark_text)?;
draw_info(&mut img, track.album, TextField::Album, &fonts.0.clone(), font_size, dark_text)?;
let mut blob = Vec::<u8>::new();
let png_encoder = PngEncoder::new(&mut blob);
match png_encoder.write_image(&img, width, height, ExtendedColorType::Rgba8) {
Ok(()) => Ok(blob),
Err(_) => Err("Failed to encode text png".to_string()),
}
img::save_to_memory_png(&img)
}