utilities/pueue
utilities/pueue
1
0
Fork 0
mirror of https://github.com/nukesor/pueue synced 2024-07-24 03:35:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cargo fmt

Browse source
This commit is contained in:
Arne Beer 2020-05-14 14:54:36 +02:00
parent 35c66bb480
commit e8f80973a8
5 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
client/message.rs
View file

@ -63,7 +63,11 @@ pub fn get_message_from_opt(opt: &Opt, settings: &Settings) -> Result<Message> {
};
Ok(Message::Enqueue(message))
}
SubCommand::Start { task_ids, group, all } => {
SubCommand::Start {
task_ids,
group,
all,
} => {
let message = StartMessage {
task_ids: task_ids.clone(),
group: group.clone(),
@ -97,7 +101,12 @@ pub fn get_message_from_opt(opt: &Opt, settings: &Settings) -> Result<Message> {
};
Ok(Message::Pause(message))
}
SubCommand::Kill { task_ids, group, default, all} => {
SubCommand::Kill {
task_ids,
group,
default,
all,
} => {
let message = KillMessage {
task_ids: task_ids.clone(),
group: group.clone(),

2
client/output.rs
View file

@ -65,7 +65,7 @@ pub fn print_state(state: State, cli_command: &SubCommand) {
// Skip unwanted groups, if a single group is requested
if let Some(group_only) = &group_only {
if group_only != &group {
continue
continue;
}
}
println!("{}", get_group_headline(&group, &state));

2
daemon/instructions.rs
View file

@ -286,7 +286,7 @@ fn restart(message: RestartMessage, sender: &Sender<Message>, state: &SharedStat
/// Invoked when calling `pueue pause`.
/// Forward the pause message to the task handler, which then pauses groups/tasks/everything.
fn pause(message: PauseMessage, sender: &Sender<Message>, state: &SharedState) -> Message {
// Check whether a given group exists
// Check whether a given group exists
if let Some(group) = &message.group {
let state = state.lock().unwrap();
if !state.groups.contains_key(group) {

13
daemon/task_handler.rs
View file

@ -493,11 +493,11 @@ impl TaskHandler {
state.set_status_for_all_groups(true);
self.children.keys().cloned().collect()
} else if let Some(group) = &message.group {
} else if let Some(group) = &message.group {
let mut state = self.state.lock().unwrap();
// Ensure that a given group exists. (Might not happen due to concurrency)
if !state.groups.contains_key(group) {
return
return;
}
// Set the group to running.
state.groups.insert(group.clone(), true);
@ -573,7 +573,7 @@ impl TaskHandler {
// Ensure that a given group exists. (Might not happen due to concurrency)
let mut state = self.state.lock().unwrap();
if !state.groups.contains_key(group) {
return
return;
}
// Pause a specific group.
state.groups.insert(group.clone(), false);
@ -647,13 +647,16 @@ impl TaskHandler {
// Ensure that a given group exists. (Might not happen due to concurrency)
let mut state = self.state.lock().unwrap();
if !state.groups.contains_key(group) {
return
return;
}
// Pause a specific group.
state.groups.insert(group.clone(), false);
info!("Killing tasks of group {}", group);
state.task_ids_in_group_with_stati(&message.group, vec![TaskStatus::Running, TaskStatus::Paused])
state.task_ids_in_group_with_stati(
&message.group,
vec![TaskStatus::Running, TaskStatus::Paused],
)
} else {
// Pause the default queue
let mut state = self.state.lock().unwrap();

4
shared/state.rs
View file

@ -117,9 +117,7 @@ impl State {
self.tasks
.iter()
.filter(|(_, task)| stati.contains(&task.status))
.filter(|(_, task)| {
group == &task.group
})
.filter(|(_, task)| group == &task.group)
.map(|(id, _)| *id)
.collect()
}