Rename jobs1 to jobs

async
Manos Pitsidianakis 2020-07-04 15:59:09 +03:00
parent 1ddde9ccba
commit 4721073bc3
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
10 changed files with 16 additions and 22 deletions

View File

@ -80,7 +80,7 @@ use crate::workers::*;
#[cfg(feature = "sqlite3")]
pub mod sqlite3;
pub mod jobs1;
pub mod jobs;
pub mod mailcap;
pub mod plugins;

View File

@ -22,7 +22,7 @@
use super::EntryStrings;
use super::*;
use crate::components::utilities::PageMovement;
use crate::jobs1::{oneshot, JobId};
use crate::jobs::{oneshot, JobId};
use std::cmp;
use std::convert::TryInto;
use std::iter::FromIterator;

View File

@ -22,7 +22,7 @@
use super::EntryStrings;
use super::*;
use crate::components::utilities::PageMovement;
use crate::jobs1::{oneshot, JobId, JoinHandle};
use crate::jobs::{oneshot, JobId};
use std::cmp;
use std::iter::FromIterator;

View File

@ -30,7 +30,7 @@ pub use self::widgets::*;
mod layouts;
pub use self::layouts::*;
use crate::jobs1::JobId;
use crate::jobs::JobId;
use std::collections::HashSet;
#[derive(Debug, Clone, Copy)]

View File

@ -24,7 +24,7 @@
*/
use super::{AccountConf, FileMailboxConf};
use crate::jobs1::{JobExecutor, JobId, JoinHandle};
use crate::jobs::{JobExecutor, JobId, JoinHandle};
use melib::async_workers::{Async, AsyncBuilder, AsyncStatus, WorkContext};
use melib::backends::{
AccountHash, BackendOp, Backends, MailBackend, Mailbox, MailboxHash, NotifyFn, ReadOnlyOp,
@ -1401,13 +1401,11 @@ impl Account {
}
pub fn process_event(&mut self, job_id: &JobId) -> bool {
if debug!(self.active_jobs.contains_key(job_id)) {
match debug!(self.active_jobs.remove(job_id)).unwrap() {
if self.active_jobs.contains_key(job_id) {
match self.active_jobs.remove(job_id).unwrap() {
JobRequest::Mailboxes(mut chan) => {
if let Some(mailboxes) = debug!(chan.try_recv()).unwrap() {
if mailboxes.is_err()
|| debug!(self.init(Some(mailboxes.unwrap()))).is_err()
{
if let Some(mailboxes) = chan.try_recv().unwrap() {
if mailboxes.is_err() || self.init(Some(mailboxes.unwrap())).is_err() {
if let Ok(mailboxes_job) =
self.backend.read().unwrap().mailboxes_async()
{
@ -1492,7 +1490,7 @@ impl Account {
.unwrap();
}
JobRequest::IsOnline(mut chan) => {
let is_online = debug!(chan.try_recv()).unwrap();
let is_online = chan.try_recv().unwrap();
if is_online.is_some() {
let is_online = is_online.unwrap();
if is_online.is_ok() {
@ -1510,8 +1508,8 @@ impl Account {
self.active_jobs.insert(job_id, JobRequest::IsOnline(rcvr));
}
}
JobRequest::Refresh(mailbox_hash, mut chan) => {
let r = debug!(chan.try_recv()).unwrap();
JobRequest::Refresh(_mailbox_hash, mut chan) => {
let r = chan.try_recv().unwrap();
if r.is_some() && r.unwrap().is_ok() {
self.is_online = true;
}

View File

@ -31,8 +31,7 @@ use std::time::Duration;
use uuid::Uuid;
use crate::types::ThreadEvent;
use crossbeam::channel;
use crossbeam::deque::{Injector, Steal, Stealer, Worker};
use crossbeam::deque::{Injector, Stealer, Worker};
use crossbeam::sync::{Parker, Unparker};
use crossbeam::Sender;
pub use futures::channel::oneshot;

View File

@ -69,7 +69,7 @@ use crate::workers::*;
#[cfg(feature = "sqlite3")]
pub mod sqlite3;
pub mod jobs1;
pub mod jobs;
pub mod mailcap;
pub mod plugins;

View File

@ -27,7 +27,6 @@ use melib::email::{Envelope, EnvelopeHash, Flag};
use melib::error::{MeliError, Result};
use std::collections::BTreeMap;
use std::collections::HashMap;
use std::future::Future;
use std::sync::{Arc, Mutex, RwLock};
// TODO replace with melib::Envelope after simplifying melib::Envelope's

View File

@ -32,7 +32,7 @@ use super::*;
use crate::plugins::PluginManager;
use melib::backends::{AccountHash, MailboxHash, NotifyFn};
use crate::jobs1::JobExecutor;
use crate::jobs::JobExecutor;
use crossbeam::channel::{unbounded, Receiver, Sender};
use smallvec::SmallVec;
use std::collections::HashMap;
@ -97,7 +97,6 @@ pub struct Context {
receiver: Receiver<ThreadEvent>,
input: InputHandler,
work_controller: WorkController,
job_executor: Arc<JobExecutor>,
pub children: Vec<std::process::Child>,
pub plugin_manager: PluginManager,
@ -336,7 +335,6 @@ impl State {
replies: VecDeque::with_capacity(5),
temp_files: Vec::new(),
work_controller,
job_executor,
children: vec![],
plugin_manager,

View File

@ -36,7 +36,7 @@ mod helpers;
pub use self::helpers::*;
use super::execute::Action;
use super::jobs1::JobId;
use super::jobs::JobId;
use super::terminal::*;
use melib::backends::{AccountHash, MailboxHash};