From da16f1db5a7868e73332a043a749ac826e540c71 Mon Sep 17 00:00:00 2001 From: sxyazi Date: Sun, 30 Jul 2023 12:34:31 +0800 Subject: [PATCH] feat: use `std::io::stdout()` --- src/core/adaptor/iterm2.rs | 7 +++---- src/core/adaptor/kitty.rs | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/core/adaptor/iterm2.rs b/src/core/adaptor/iterm2.rs index 7200461a..ee5fc03a 100644 --- a/src/core/adaptor/iterm2.rs +++ b/src/core/adaptor/iterm2.rs @@ -1,10 +1,9 @@ -use std::{io::Write, path::Path}; +use std::{io::{stdout, Write}, path::Path}; use anyhow::Result; use base64::{engine::general_purpose, Engine}; use image::{codecs::jpeg::JpegEncoder, DynamicImage}; use ratatui::prelude::Rect; -use tokio::io::AsyncWriteExt; use super::image::Image; use crate::ui::Term; @@ -17,7 +16,7 @@ impl Iterm2 { let b = Self::encode(img).await?; Term::move_to(rect.x, rect.y).ok(); - tokio::io::stdout().write_all(&b).await.ok(); + stdout().write_all(&b).ok(); Ok(()) } @@ -26,7 +25,7 @@ impl Iterm2 { let s = " ".repeat(rect.width as usize); for y in rect.top()..=rect.bottom() { Term::move_to(rect.x, y).ok(); - std::io::stdout().write_all(s.as_bytes()).ok(); + stdout().write_all(s.as_bytes()).ok(); } } diff --git a/src/core/adaptor/kitty.rs b/src/core/adaptor/kitty.rs index 57ed456c..896778e9 100644 --- a/src/core/adaptor/kitty.rs +++ b/src/core/adaptor/kitty.rs @@ -1,10 +1,9 @@ -use std::{io::Write, path::Path}; +use std::{io::{stdout, Write}, path::Path}; use anyhow::Result; use base64::{engine::general_purpose, Engine}; use image::DynamicImage; use ratatui::prelude::Rect; -use tokio::io::AsyncWriteExt; use super::image::Image; use crate::ui::Term; @@ -17,12 +16,12 @@ impl Kitty { let b = Self::encode(img).await?; Term::move_to(rect.x, rect.y).ok(); - tokio::io::stdout().write_all(&b).await.ok(); + stdout().write_all(&b).ok(); Ok(()) } #[inline] - pub(super) fn image_hide() { std::io::stdout().write_all(b"\x1b\\\x1b_Ga=d\x1b\\").ok(); } + pub(super) fn image_hide() { stdout().write_all(b"\x1b\\\x1b_Ga=d\x1b\\").ok(); } async fn encode(img: DynamicImage) -> Result> { fn output(raw: &[u8], format: u8, size: (u32, u32)) -> Result> {