Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: make highlighting tasks cancelable even though its CPU-bound #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2023
Merged

feat: make highlighting tasks cancelable even though its CPU-bound #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions core/src/manager/preview.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::{fs::File, io::{BufRead, BufReader}, mem, path::{Path, PathBuf}, sync::OnceLock};
use std::{fs::File, io::{BufRead, BufReader}, mem, path::{Path, PathBuf}, sync::{atomic::{AtomicUsize, Ordering}, Arc, OnceLock}};

use adaptor::{Adaptor, Image};
use anyhow::{anyhow, Result};
use anyhow::{anyhow, bail, Result};
use config::{PREVIEW, THEME};
use ratatui::prelude::Rect;
use shared::{tty_size, MimeKind};
Expand All @@ -19,6 +19,7 @@ pub struct Preview {
pub lock: Option<(PathBuf, String)>,
pub data: PreviewData,

incr: Arc<AtomicUsize>,
handle: Option<JoinHandle<()>>,
}

Expand Down Expand Up @@ -57,6 +58,8 @@ impl Preview {
}

let (path, mime) = (path.to_path_buf(), mime.to_owned());
let incr = self.incr.clone();

self.handle = Some(tokio::spawn(async move {
let result = match kind {
MimeKind::Archive => Self::archive(&path).await.map(PreviewData::Text),
Expand All @@ -65,7 +68,7 @@ impl Preview {
MimeKind::Video => Self::video(&path).await,
MimeKind::JSON => Self::json(&path).await.map(PreviewData::Text),
MimeKind::PDF => Self::pdf(&path).await,
MimeKind::Text => Self::highlight(&path).await.map(PreviewData::Text),
MimeKind::Text => Self::highlight(&path, incr).await.map(PreviewData::Text),
MimeKind::Others => Err(anyhow!("Unsupported mimetype: {mime}")),
};

Expand All @@ -75,6 +78,7 @@ impl Preview {

pub fn reset(&mut self) -> bool {
self.handle.take().map(|h| h.abort());
self.incr.fetch_add(1, Ordering::Relaxed);
Adaptor::image_hide(Self::rect());

self.lock = None;
Expand All @@ -86,6 +90,7 @@ impl Preview {

pub fn reset_image(&mut self) -> bool {
self.handle.take().map(|h| h.abort());
self.incr.fetch_add(1, Ordering::Relaxed);
Adaptor::image_hide(Self::rect());

if matches!(self.data, PreviewData::Image) {
Expand Down Expand Up @@ -150,7 +155,8 @@ impl Preview {
)
}

pub async fn highlight(path: &Path) -> Result<String> {
pub async fn highlight(path: &Path, incr: Arc<AtomicUsize>) -> Result<String> {
let tick = incr.load(Ordering::Relaxed);
let syntax = SYNTECT_SYNTAX.get_or_init(|| SyntaxSet::load_defaults_newlines());
let theme = SYNTECT_THEME.get_or_init(|| {
let from_file = || -> Result<Theme> {
Expand All @@ -170,6 +176,10 @@ impl Preview {

let mut i = Self::rect().height as usize;
while i > 0 && h.reader.read_line(&mut line)? > 0 {
if tick != incr.load(Ordering::Relaxed) {
bail!("Preview cancelled");
}

i -= 1;
line = line.replace('\t', &spaces);
let regions = h.highlight_lines.highlight_line(&line, syntax)?;
Expand Down