leyoda/cosmic-edit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanup.

Browse source
This commit is contained in:
Mark Tomlin 2024-01-14 00:16:15 -05:00 • committed by Jeremy Soller
parent 3233ed8ceb
commit 677c924323
2 changed files with 105 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/main.rs
View file

@ -445,7 +445,6 @@ impl App {
}
fn save_config(&mut self) -> Command<Message> {
if let Some(ref config_handler) = self.config_handler {
if let Err(err) = self.config.write_entry(config_handler) {
log::error!("failed to save config: {}", err);
@ -1667,51 +1666,47 @@ impl Application for App {
self.set_context_title(context_page.title());
// Execute commands for specific pages
if self.core.window.show_context {
match self.context_page {
ContextPage::GitManagement => {
self.git_project_status = None;
let projects = self.projects.clone();
return Command::perform(
async move {
let mut project_status = Vec::new();
for (project_name, project_path) in projects.iter() {
//TODO: send errors to UI
match GitRepository::new(project_path) {
Ok(repo) => match repo.status().await {
Ok(status) => {
if !status.is_empty() {
project_status.push((
project_name.clone(),
project_path.clone(),
status,
));
}
}
Err(err) => {
log::error!(
"failed to get status of {:?}: {}",
project_path,
err
);
}
},
Err(err) => {
log::error!(
"failed to open repository {:?}: {}",
project_path,
err
);
if self.core.window.show_context && self.context_page == ContextPage::GitManagement
{
self.git_project_status = None;
let projects = self.projects.clone();
return Command::perform(
async move {
let mut project_status = Vec::new();
for (project_name, project_path) in projects.iter() {
//TODO: send errors to UI
match GitRepository::new(project_path) {
Ok(repo) => match repo.status().await {
Ok(status) => {
if !status.is_empty() {
project_status.push((
project_name.clone(),
project_path.clone(),
status,
));
}
}
Err(err) => {
log::error!(
"failed to get status of {:?}: {}",
project_path,
err
);
}
},
Err(err) => {
log::error!(
"failed to open repository {:?}: {}",
project_path,
err
);
}
message::app(Message::GitProjectStatus(project_status))
},
|x| x,
);
}
_ => {}
}
}
}
message::app(Message::GitProjectStatus(project_status))
},
|x| x,
);
}
// Ensure focus of correct input