mirror of
https://github.com/itsjunetime/tdf.git
synced 2026-06-01 23:51:46 -04:00
ci cd (#132)
* ci: format * ci: run on tag push, manual dispatch * ci: release a tip on each push to `main` and tag release on tag pushes * ci: run on more platforms * ci: don't fail fast * ci: enable windows * Update .github/workflows/rust.yml Co-authored-by: June <61218022+itsjunetime@users.noreply.github.com> * Update .github/workflows/rust.yml Co-authored-by: June <61218022+itsjunetime@users.noreply.github.com> * Update .github/workflows/rust.yml Co-authored-by: June <61218022+itsjunetime@users.noreply.github.com> * chore: update custom `ratatui-image` rev * Update .github/workflows/rust.yml Co-authored-by: June <61218022+itsjunetime@users.noreply.github.com> * Update .github/workflows/rust.yml Co-authored-by: June <61218022+itsjunetime@users.noreply.github.com> * chore(deps): update kittage * Update kittage for maybe more windows fixes * Update kittage again for more windows fixes * Update kittage again..... * Maybe actually compile windows correctly now? * update kittage * oopsie forgot abt lock file * windows and kittage again ... * maybe fix the file path conversion stuff? * kittage once again........... --------- Co-authored-by: June <61218022+itsjunetime@users.noreply.github.com> Co-authored-by: itsjunetime <junewelker@gmail.com>
This commit is contained in:
+8
-4
@@ -144,10 +144,14 @@ pub async fn run_conversion_loop(
|
||||
.as_nanos() % 1_000_000;
|
||||
|
||||
let mut img = if shms_work {
|
||||
kittage::image::Image::shm_from(dyn_img, &format!("/tdf_{pid}_{rn}_{page_num}"))
|
||||
.map_err(|e| {
|
||||
RenderError::Converting(format!("Couldn't write to shm: {e:?}"))
|
||||
})?
|
||||
let shm_name = format!("/tdf_{pid}_{rn}_{page_num}");
|
||||
|
||||
#[cfg(unix)]
|
||||
let shm_name = &*shm_name;
|
||||
|
||||
kittage::image::Image::shm_from(dyn_img, shm_name).map_err(|e| {
|
||||
RenderError::Converting(format!("Couldn't create shm: {e:?}"))
|
||||
})?
|
||||
} else {
|
||||
kittage::image::Image::from(dyn_img)
|
||||
};
|
||||
|
||||
+6
-1
@@ -78,7 +78,12 @@ pub async fn run_action<'es>(
|
||||
pub async fn do_shms_work(ev_stream: &mut EventStream) -> bool {
|
||||
let img = DynamicImage::new_rgb8(1, 1);
|
||||
let pid = std::process::id();
|
||||
let Ok(mut k_img) = kittage::image::Image::shm_from(img, &format!("tdf_test_{pid}")) else {
|
||||
let shm_name = format!("tdf_test_{pid}");
|
||||
|
||||
#[cfg(unix)]
|
||||
let shm_name = &*shm_name;
|
||||
|
||||
let Ok(mut k_img) = kittage::image::Image::shm_from(img, shm_name) else {
|
||||
return false;
|
||||
};
|
||||
|
||||
|
||||
+8
-1
@@ -113,8 +113,15 @@ pub fn start_rendering(
|
||||
|
||||
let mut need_rerender = VecDeque::new();
|
||||
|
||||
#[cfg(windows)]
|
||||
let path = path.to_string_lossy();
|
||||
|
||||
'reload: loop {
|
||||
let doc = match Document::open(path) {
|
||||
// Need to do this weird borrow thing so that we convert `Cow<'_, str>` -> `&str` on windows
|
||||
// and keep unix a `&Path` -> `&Path` 'cause there are different requirements within mupdf
|
||||
// about file paths per-platform
|
||||
#[cfg_attr(unix, expect(clippy::borrow_deref_ref))]
|
||||
let doc = match Document::open(&*path) {
|
||||
Err(e) => {
|
||||
// if there's an error, tell the main loop
|
||||
sender.send(Err(RenderError::Doc(e)))?;
|
||||
|
||||
+11
-8
@@ -9,10 +9,6 @@ use crossterm::{
|
||||
}
|
||||
};
|
||||
use kittage::display::DisplayLocation;
|
||||
use nix::{
|
||||
sys::signal::{Signal::SIGSTOP, kill},
|
||||
unistd::Pid
|
||||
};
|
||||
use ratatui::{
|
||||
Frame,
|
||||
layout::{Constraint, Flex, Layout, Position, Rect},
|
||||
@@ -801,10 +797,17 @@ impl Tui {
|
||||
.unwrap();
|
||||
disable_raw_mode().unwrap();
|
||||
|
||||
// This process will hang after the SIGSTOP call until we get
|
||||
// foregrounded again by something else, at which point we need to
|
||||
// re-setup everything so that it all gets drawn again.
|
||||
kill(Pid::this(), SIGSTOP).unwrap();
|
||||
#[cfg(unix)]
|
||||
{
|
||||
// This process will hang after the SIGSTOP call until we get
|
||||
// foregrounded again by something else, at which point we need to
|
||||
// re-setup everything so that it all gets drawn again.
|
||||
nix::sys::signal::kill(
|
||||
nix::unistd::Pid::this(),
|
||||
nix::sys::signal::Signal::SIGSTOP
|
||||
)
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
enable_raw_mode().unwrap();
|
||||
execute!(
|
||||
|
||||
Reference in New Issue
Block a user