Compare commits
3 Commits
fd87302642
...
maybe-skia
| Author | SHA1 | Date | |
|---|---|---|---|
| d8e94cf574 | |||
| 6038240d5a | |||
| 4d71f7fe23 |
141
Cargo.lock
generated
141
Cargo.lock
generated
@ -172,6 +172,17 @@ version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
|
||||
|
||||
[[package]]
|
||||
name = "auto-palette"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "65e79afc54a4a4629411811a644e778c7d8f6889b8ecf4c1d4a13f3f33db408d"
|
||||
dependencies = [
|
||||
"image",
|
||||
"num-traits",
|
||||
"thiserror 2.0.12",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.4.0"
|
||||
@ -243,29 +254,6 @@ dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bindgen"
|
||||
version = "0.69.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"cexpr",
|
||||
"clang-sys",
|
||||
"itertools",
|
||||
"lazy_static",
|
||||
"lazycell",
|
||||
"log",
|
||||
"prettyplease",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"regex",
|
||||
"rustc-hash",
|
||||
"shlex",
|
||||
"syn 2.0.101",
|
||||
"which",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bit_field"
|
||||
version = "0.10.2"
|
||||
@ -410,24 +398,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.22"
|
||||
version = "1.2.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1"
|
||||
checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
|
||||
dependencies = [
|
||||
"jobserver",
|
||||
"libc",
|
||||
"shlex",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cexpr"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
|
||||
dependencies = [
|
||||
"nom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-expr"
|
||||
version = "0.15.8"
|
||||
@ -459,17 +438,6 @@ dependencies = [
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clang-sys"
|
||||
version = "1.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
|
||||
dependencies = [
|
||||
"glob",
|
||||
"libc",
|
||||
"libloading",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "color_quant"
|
||||
version = "1.1.0"
|
||||
@ -1653,12 +1621,6 @@ dependencies = [
|
||||
"spin",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazycell"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
||||
|
||||
[[package]]
|
||||
name = "lebe"
|
||||
version = "0.5.2"
|
||||
@ -1687,16 +1649,6 @@ dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
version = "0.8.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"windows-targets 0.53.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libm"
|
||||
version = "0.2.15"
|
||||
@ -1714,12 +1666,6 @@ dependencies = [
|
||||
"vcpkg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.4.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.9.4"
|
||||
@ -1757,15 +1703,6 @@ dependencies = [
|
||||
"imgref",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "magick_rust"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"bindgen",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "maybe-rayon"
|
||||
version = "0.1.1"
|
||||
@ -2266,16 +2203,6 @@ dependencies = [
|
||||
"zerocopy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "prettyplease"
|
||||
version = "0.2.32"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"syn 2.0.101",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.95"
|
||||
@ -2462,7 +2389,7 @@ checksum = "78c81d000a2c524133cc00d2f92f019d399e57906c3b7119271a2495354fe895"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"rustix 1.0.7",
|
||||
"rustix",
|
||||
"windows",
|
||||
]
|
||||
|
||||
@ -2644,25 +2571,6 @@ version = "0.1.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys 0.4.15",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "1.0.7"
|
||||
@ -2672,7 +2580,7 @@ dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys 0.9.4",
|
||||
"linux-raw-sys",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
@ -3477,7 +3385,7 @@ dependencies = [
|
||||
"fastrand",
|
||||
"getrandom 0.3.3",
|
||||
"once_cell",
|
||||
"rustix 1.0.7",
|
||||
"rustix",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
@ -4153,20 +4061,21 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "watcat"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"arabic_reshaper",
|
||||
"auto-palette",
|
||||
"dotenvy",
|
||||
"http-cache-reqwest",
|
||||
"image",
|
||||
"imagetext",
|
||||
"lastfm",
|
||||
"magick_rust",
|
||||
"palette",
|
||||
"reqwest 0.12.15",
|
||||
"reqwest-middleware",
|
||||
"serenity",
|
||||
"sqlx",
|
||||
"tiny-skia",
|
||||
"tokio",
|
||||
"unicode-bidi",
|
||||
]
|
||||
@ -4211,18 +4120,6 @@ version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
|
||||
|
||||
[[package]]
|
||||
name = "which"
|
||||
version = "4.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
|
||||
dependencies = [
|
||||
"either",
|
||||
"home",
|
||||
"once_cell",
|
||||
"rustix 0.38.44",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "whoami"
|
||||
version = "1.6.0"
|
||||
|
||||
@ -11,14 +11,18 @@ reqwest = "0.12"
|
||||
reqwest-middleware = "0.4.2"
|
||||
http-cache-reqwest = "0.15.1"
|
||||
palette = "0.7.6"
|
||||
tiny-skia = "0.11.4"
|
||||
auto-palette = "0.8.2"
|
||||
#rand = "0.9.1"
|
||||
#rayon = "1.10.0"
|
||||
# text rendering dependencies
|
||||
arabic_reshaper = "0.4.2"
|
||||
unicode-bidi = "0.3.18"
|
||||
image = "0.25.6"
|
||||
imagetext = { git = "https://github.com/nathanielfernandes/imagetext" }
|
||||
|
||||
[dependencies.magick_rust]
|
||||
path = "./magick-rust"
|
||||
#[dependencies.magick_rust]
|
||||
#path = "./magick-rust"
|
||||
|
||||
[dependencies.tokio]
|
||||
version = "1.21.2"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.4 KiB |
93
src/img.rs
Normal file
93
src/img.rs
Normal file
@ -0,0 +1,93 @@
|
||||
|
||||
use image::{RgbaImage, ExtendedColorType, ImageEncoder, load_from_memory};
|
||||
use image::codecs::png::PngEncoder;
|
||||
use tiny_skia::{Pixmap, Transform, PixmapPaint, BlendMode, FilterQuality, Color, Paint, Shader};
|
||||
use palette::{Srgb, Lab, FromColor};
|
||||
use auto_palette::{ImageData, Palette};
|
||||
/*use palette::color_difference::{EuclideanDistance, ImprovedDeltaE};
|
||||
use palette::white_point::D65;
|
||||
use rand::{SeedableRng};
|
||||
use rand::prelude::{IteratorRandom};
|
||||
use rand::rngs::{SmallRng};
|
||||
use std::ops::{Add, Div};//{Add, Sub, Mul};*/
|
||||
|
||||
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())
|
||||
}
|
||||
|
||||
pub fn scale_skia_pixmap(p: Pixmap, width: u32, height: u32) -> Option<Pixmap> {
|
||||
let mut new_pixmap = Pixmap::new(width, height)?;
|
||||
let width_scale = width as f32 / p.width() as f32;
|
||||
let height_scale = height as f32 / p.width() as f32;
|
||||
let matrix = Transform::from_scale(width_scale, height_scale);
|
||||
let pixmap_paint = PixmapPaint {
|
||||
opacity: 1.0,
|
||||
blend_mode: BlendMode::Source,
|
||||
quality: FilterQuality::Bilinear,
|
||||
};
|
||||
new_pixmap.draw_pixmap(0, 0, p.as_ref(), &pixmap_paint, matrix, None);
|
||||
Some(new_pixmap)
|
||||
}
|
||||
|
||||
pub fn lab_to_skia_color(c: Lab) -> Result<Color, String> {
|
||||
let rgb: Srgb<f32> = Srgb::from_color(c).into_format();
|
||||
match Color::from_rgba(rgb.red, rgb.green, rgb.blue, 1.0) {
|
||||
Some(c) => Ok(c),
|
||||
None => Err(format!("Invalid color: {rgb:?}")),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn color_paint_from_lab_color<'a>(c: Lab) -> Result<Paint<'a>, String> {
|
||||
//let color = lab_to_skia_color(c)?;
|
||||
Ok(Paint {
|
||||
shader: Shader::SolidColor(lab_to_skia_color(c)?),
|
||||
anti_alias: true,
|
||||
blend_mode: BlendMode::Source,
|
||||
force_hq_pipeline: false,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn dominant_colors_as_paints<'a>(p: &Pixmap) -> Result<(Paint<'a>, Paint<'a>), String> {
|
||||
let imagedata = match ImageData::new(p.width(), p.height(), p.data()) {
|
||||
Ok(i) => i,
|
||||
Err(_) => return Err("Failed to load imagedata".to_string()),
|
||||
};
|
||||
let pal: Palette<f32> = match Palette::extract(&imagedata) {
|
||||
Ok(p) => p,
|
||||
Err(_) => return Err("Failed to to create palette".to_string()),
|
||||
};
|
||||
let colors: Vec<_> = match pal.find_swatches(2) {
|
||||
Ok(s) => s,
|
||||
Err(_) => return Err("Failed to get swatches".to_string()),
|
||||
};
|
||||
let colors = colors.iter().map(|swatch| {
|
||||
let rgb = swatch.color().to_rgb();
|
||||
Srgb::new(rgb.r, rgb.g, rgb.b).into()
|
||||
}).collect::<Vec<Srgb<f32>>>();
|
||||
Ok((Paint {
|
||||
shader: Shader::SolidColor(Color::from_rgba(colors[0].red, colors[0].green, colors[0].blue, 1.0).unwrap()),
|
||||
anti_alias: true,
|
||||
blend_mode: BlendMode::Source,
|
||||
force_hq_pipeline: false,
|
||||
},
|
||||
Paint {
|
||||
shader: Shader::SolidColor(Color::from_rgba(colors[1].red, colors[1].green, colors[1].blue, 1.0).unwrap()),
|
||||
anti_alias: true,
|
||||
blend_mode: BlendMode::Source,
|
||||
force_hq_pipeline: false,
|
||||
}))
|
||||
}
|
||||
119
src/main.rs
119
src/main.rs
@ -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,15 +14,18 @@ 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;
|
||||
|
||||
use palette::color_difference::ImprovedCiede2000;
|
||||
use palette::lab::Lab;
|
||||
use palette::white_point::D65;
|
||||
//use palette::color_difference::ImprovedCiede2000;
|
||||
//use palette::lab::Lab;
|
||||
//use palette::white_point::D65;
|
||||
|
||||
extern crate sqlx;
|
||||
use sqlx::sqlite::SqlitePool;
|
||||
@ -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,
|
||||
@ -80,6 +89,7 @@ macro_rules! handle_magick_option {
|
||||
};
|
||||
}
|
||||
|
||||
/*
|
||||
// this function is almost assuredly the least idiomatic rust code I will ever write.
|
||||
// but until I know what the "correct" way is, it'll have to do
|
||||
fn parse_cielab(s: String) -> Result<(f32, f32, f32), &'static str> {
|
||||
@ -100,9 +110,9 @@ fn parse_cielab(s: String) -> Result<(f32, f32, f32), &'static str> {
|
||||
&[a, b, c] => Ok((a, b, c)),
|
||||
_ => Err("Error parsing cielab string"),
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
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 +122,20 @@ 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: u32 = 12;
|
||||
const FMI_AVATAR_SIZE: u32 = 64;
|
||||
const FMI_AVATAR_GAP: u32 = 10;
|
||||
|
||||
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}")),
|
||||
@ -131,6 +144,7 @@ async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Re
|
||||
Some(track) => track,
|
||||
None => return Reply::Text("Nothing playing.".to_string()),
|
||||
};
|
||||
#[allow(unused_variables)]
|
||||
let track_info = text::TrackInfo {
|
||||
title: track.name,
|
||||
artist: track.artist.name,
|
||||
@ -141,19 +155,49 @@ 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 mut 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");
|
||||
#[allow(unused_variables)]
|
||||
let (dom, sub) = match img::dominant_colors_as_paints(&album_image) {
|
||||
Ok(c) => c,
|
||||
Err(e) => return Reply::Text(e),
|
||||
};
|
||||
//let background_paint = handle_result!(img::color_paint_from_lab_color(dom), "Failed to create color paint");
|
||||
main_image.fill_rect(tiny_skia::Rect::from_xywh(0.0, 0.0, FMI_WIDTH as f32, FMI_HEIGHT as f32).unwrap(), &dom, tiny_skia::Transform::identity(), None);
|
||||
let mut pb = tiny_skia::PathBuilder::new();
|
||||
pb.move_to(FMI_WIDTH as f32, 0.0);
|
||||
pb.line_to((FMI_WIDTH - FMI_HEIGHT) as f32, FMI_HEIGHT as f32);
|
||||
pb.line_to(FMI_WIDTH as f32, FMI_HEIGHT as f32);
|
||||
pb.close();
|
||||
let path = pb.finish().unwrap();
|
||||
main_image.fill_path(&path, &sub, tiny_skia::FillRule::Winding, tiny_skia::Transform::identity(), None);
|
||||
let art_size = FMI_HEIGHT- 2 * FMI_GAP;
|
||||
album_image = handle_option!(img::scale_skia_pixmap(album_image, art_size, art_size), "Failed to scale bitmap");
|
||||
//let art_scale_matrix = tiny_skia::Transform::from_transla(art_size, art_size).pre_translate(FMI_GAP as f32, FMI_GAP as f32);
|
||||
let source_paint = tiny_skia::PixmapPaint {
|
||||
opacity: 1.0,
|
||||
blend_mode: tiny_skia::BlendMode::SourceOver,
|
||||
quality: tiny_skia::FilterQuality::Bilinear,
|
||||
};
|
||||
main_image.draw_pixmap(FMI_GAP as i32, FMI_GAP as i32, album_image.as_ref(), &source_paint, tiny_skia::Transform::identity(), None);
|
||||
/*handle_magick_result!(
|
||||
base_color.set_color("#7f7f7f"),
|
||||
"Failed to set init base color"
|
||||
);
|
||||
@ -252,8 +296,21 @@ async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Re
|
||||
avatar_wand.new_image(100, 100, &white),
|
||||
"Failed to load dummy avatar"
|
||||
),
|
||||
}
|
||||
let avatar_mask_wand = MagickWand::new();
|
||||
}*/
|
||||
let avatar_uri = avatar.unwrap(); // TODO: FIX THIS
|
||||
let avatar_base = match get_image(ctx, avatar_uri.as_str()).await {
|
||||
Ok(i) => i,
|
||||
Err(e) => return Reply::Text(e.to_string()),
|
||||
};
|
||||
let mut avatar_image = handle_result!(tiny_skia::Pixmap::decode_png(&avatar_base), "Failed to load album art image");
|
||||
let avatar_mask = handle_result!(tiny_skia::Mask::decode_png(include_bytes!("avatar_mask.png")), "Failed to load album art image");
|
||||
let (avatar_x, avatar_y) = (FMI_WIDTH - FMI_AVATAR_SIZE - FMI_AVATAR_GAP, FMI_HEIGHT - FMI_AVATAR_SIZE - FMI_AVATAR_GAP);
|
||||
avatar_image.apply_mask(&avatar_mask);
|
||||
avatar_image = handle_option!(img::scale_skia_pixmap(avatar_image, FMI_AVATAR_SIZE, FMI_AVATAR_SIZE), "Failed to scale avatar image");
|
||||
//let avatar_matrix = tiny_skia::Transform::from_scale(avatar_scale, avatar_scale).pre_translate(avatar_x as f32, avatar_y as f32);
|
||||
main_image.draw_pixmap(avatar_x as i32, avatar_y as i32, avatar_image.as_ref(), &source_paint, tiny_skia::Transform::identity(), None);
|
||||
|
||||
/*let avatar_mask_wand = MagickWand::new();
|
||||
handle_magick_result!(
|
||||
avatar_mask_wand.read_image_blob(include_bytes!("avatar_mask.png")),
|
||||
"Failed to load avatar mask"
|
||||
@ -329,8 +386,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 +496,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 +505,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 +520,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");
|
||||
|
||||
16
src/text.rs
16
src/text.rs
@ -1,3 +1,4 @@
|
||||
/*
|
||||
// this code is mostly just blindly ported from
|
||||
// https://github.com/adamanldo/Cosmo/blob/946af25dcac8a81cb7b49d1a4f83731a5f7c7b46/cogs/utils/fmi_text.py
|
||||
// since I'm using the same text rendering library, my code is almost one-to-one
|
||||
@ -11,6 +12,8 @@ use image::{RgbaImage, ExtendedColorType, ImageEncoder};
|
||||
use image::codecs::png::PngEncoder;
|
||||
use unicode_bidi::BidiInfo;
|
||||
|
||||
use crate::img;
|
||||
|
||||
enum TextField {
|
||||
Title,
|
||||
Artist,
|
||||
@ -99,23 +102,20 @@ fn draw_info(image: &mut RgbaImage, text: String, text_type: TextField, font: &S
|
||||
Ok(_) => Ok(()),
|
||||
Err(e) => Err(e.to_string()),
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub struct TrackInfo {
|
||||
pub title: String,
|
||||
pub artist: String,
|
||||
pub album: String,
|
||||
}
|
||||
|
||||
pub fn fmi_text(width: u32, height: u32, track: TrackInfo, fonts: &(SuperFont<'static>, SuperFont<'static>), font_size: f32, dark_text: bool) -> Result<Vec<u8>, String> {
|
||||
/*pub fn fmi_text(width: u32, height: u32, track: TrackInfo, fonts: &(SuperFont<'static>, SuperFont<'static>), font_size: f32, dark_text: bool) -> Result<Vec<u8>, String> {
|
||||
let mut img = RgbaImage::new(width, height);
|
||||
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)
|
||||
}
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user