sayanarijit/xplr
1
1
Fork 0
mirror of https://github.com/sayanarijit/xplr.git synced 2024-09-11 11:05:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix pipes not updating properly

Browse Source 
Let's not optimize things until we have tests.
This commit is contained in:
Arijit Basu 2021-04-29 08:05:48 +05:30 committed by Arijit Basu
parent 4dad10815a
commit 36af3e8ced
5 changed files with 66 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1630,7 +1630,7 @@ dependencies = [
[[package]]
name = "xplr"
version = "0.5.9"
version = "0.5.10"
dependencies = [
"anyhow",
"chrono",

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "xplr"
version = "0.5.9" # Update config.yml, config.rs and default.nix
version = "0.5.10" # Update config.yml, config.rs and default.nix
authors = ["Arijit Basu <sayanarijit@gmail.com>"]
edition = "2018"
description = "A hackable, minimal, fast TUI file explorer"

95
src/app.rs
View File

@ -1485,8 +1485,7 @@ impl App {
}
fs::write(&app.pipe().global_help_menu_out, app.global_help_menu_str())?;
Ok(app)
app.write_pipes(None)
}
pub fn focused_node(&self) -> Option<&Node> {
@ -1602,7 +1601,7 @@ impl App {
}
}?
.refresh_selection()
.write_pipes(&last_app)
.write_pipes(Some(&last_app))
}
fn handle_key(mut self, key: Key) -> Result<Self> {
@ -2367,46 +2366,72 @@ impl App {
.join("")
}
fn write_pipes(self, last_app: &Self) -> Result<Self> {
if self.focused_node() != last_app.focused_node() {
fs::write(&self.pipe().focus_out, self.focused_node_str())?;
};
fn write_pipes(self, last_app: Option<&Self>) -> Result<Self> {
// TODO optimize and test
if self.selection() != last_app.selection() {
fs::write(&self.pipe().selection_out, self.selection_str())?;
};
let focused_node_str = self.focused_node_str();
// if last_app
// .map(|a| a.focused_node_str() != focused_node_str)
// .unwrap_or(true)
// {
fs::write(&self.pipe().focus_out, focused_node_str)?;
// };
if self.history_str() != last_app.history_str() {
fs::write(&self.pipe().history_out, self.history_str())?;
};
let selection_str = self.selection_str();
// if last_app
// .map(|a| a.selection_str() != selection_str)
// .unwrap_or(true)
// {
fs::write(&self.pipe().selection_out, selection_str)?;
// };
if self.mode_str() != last_app.mode_str() {
fs::write(&self.pipe().mode_out, self.mode_str())?;
};
let history_str = self.history_str();
// if last_app
// .map(|a| a.history_str() != history_str)
// .unwrap_or(true)
// {
fs::write(&self.pipe().history_out, history_str)?;
// };
if self.directory_buffer() != last_app.directory_buffer() {
fs::write(&self.pipe().directory_nodes_out, self.directory_nodes_str())?;
};
let mode_str = self.mode_str();
// if last_app.map(|a| a.mode_str() != mode_str).unwrap_or(true) {
fs::write(&self.pipe().mode_out, mode_str)?;
// };
if self.logs().len() != last_app.logs().len() {
let new_logs = self
.logs()
.iter()
.skip(last_app.logs().len())
.map(|l| format!("{}\n", l))
.collect::<Vec<String>>()
.join("");
let directory_nodes_str = self.directory_nodes_str();
// if last_app
// .map(|a| a.directory_nodes_str() != directory_nodes_str)
// .unwrap_or(true)
// {
fs::write(&self.pipe().directory_nodes_out, directory_nodes_str)?;
// };
let mut file = fs::OpenOptions::new()
.append(true)
.open(&self.pipe().logs_out)?;
// if last_app
// .map(|a| a.logs().len() != self.logs().len())
// .unwrap_or(true)
// {
let new_logs = self
.logs()
.iter()
.skip(last_app.map(|a| a.logs().len()).unwrap_or(0))
.map(|l| format!("{}\n", l))
.collect::<Vec<String>>()
.join("");
file.write_all(new_logs.as_bytes())?;
};
let mut file = fs::OpenOptions::new()
.append(true)
.open(&self.pipe().logs_out)?;
if self.result() != last_app.result() {
fs::write(&self.pipe().result_out, self.result_str())?;
};
file.write_all(new_logs.as_bytes())?;
// };
let result_str = self.result_str();
// if last_app
// .map(|a| a.result_str() != result_str)
// .unwrap_or(true)
// {
fs::write(&self.pipe().result_out, result_str)?;
// };
Ok(self)
}
}

4
src/config.rs
View File

@ -1020,6 +1020,7 @@ impl Config {
pub fn is_compatible(&self) -> Result<bool> {
let result = match self.parsed_version()? {
(0, 5, 10) => true,
(0, 5, 9) => true,
(0, 5, 8) => true,
(0, 5, 7) => true,
@ -1038,7 +1039,8 @@ impl Config {
pub fn upgrade_notification(&self) -> Result<Option<&str>> {
let result = match self.parsed_version()? {
(0, 5, 9) => None,
(0, 5, 10) => None,
(0, 5, 9) => Some("App version updated. Fixed pipes not updating properly"),
(0, 5, 8) => Some("App version updated. Fixed support for filenames starting with - (hiphen)"),
(0, 5, 7) => Some("App version updated. Fixed distorted screen when opening files in GUI"),
(0, 5, 6) => Some("App version updated. Fixed piping and in-built terminal support"),

2
src/config.yml
View File

@ -1,4 +1,4 @@
version: v0.5.9
version: v0.5.10
general:
show_hidden: false
read_only: false