add cache struct in Account
parent
d1184d4ea5
commit
e9d17f6897
|
@ -0,0 +1,110 @@
|
||||||
|
/*
|
||||||
|
* meli - ui crate.
|
||||||
|
*
|
||||||
|
* Copyright 2017-2018 Manos Pitsidianakis
|
||||||
|
*
|
||||||
|
* This file is part of meli.
|
||||||
|
*
|
||||||
|
* meli is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* meli is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with meli. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
use melib::backends::{FolderHash, MailBackend};
|
||||||
|
use melib::email::{EnvelopeHash, Flag, UnixTimestamp};
|
||||||
|
use melib::mailbox::*;
|
||||||
|
use melib::thread::{ThreadHash, ThreadNode};
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum Query {
|
||||||
|
Before(UnixTimestamp),
|
||||||
|
After(UnixTimestamp),
|
||||||
|
Between(UnixTimestamp, UnixTimestamp),
|
||||||
|
On(UnixTimestamp),
|
||||||
|
/* * * * */
|
||||||
|
From(String),
|
||||||
|
To(String),
|
||||||
|
Cc(String),
|
||||||
|
Bcc(String),
|
||||||
|
InReplyTo(String),
|
||||||
|
References(String),
|
||||||
|
AllAddresses(String),
|
||||||
|
/* * * * */
|
||||||
|
Body(String),
|
||||||
|
Subject(String),
|
||||||
|
AllText(String),
|
||||||
|
/* * * * */
|
||||||
|
Flag(Flag),
|
||||||
|
}
|
||||||
|
|
||||||
|
enum CacheType {
|
||||||
|
Sqlite3,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct Cache {
|
||||||
|
collection: Collection,
|
||||||
|
kind: CacheType,
|
||||||
|
backend: Box<dyn MailBackend>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Cache {
|
||||||
|
pub fn build_index(&mut self) {
|
||||||
|
unimplemented!()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn new(backend: Box<dyn MailBackend>) -> Self {
|
||||||
|
unimplemented!()
|
||||||
|
}
|
||||||
|
pub fn get_env(&self, h: &EnvelopeHash) -> &Envelope {
|
||||||
|
&self.collection[h]
|
||||||
|
}
|
||||||
|
pub fn get_env_mut(&mut self, h: &EnvelopeHash) -> &mut Envelope {
|
||||||
|
self.collection.entry(*h).or_default()
|
||||||
|
}
|
||||||
|
pub fn contains_key(&self, h: EnvelopeHash) -> bool {
|
||||||
|
self.collection.contains_key(&h)
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
pub fn operation(&self, h: EnvelopeHash) -> Box<dyn BackendOp> {
|
||||||
|
//let operation = self.backend.operation(h, m.folder.hash())
|
||||||
|
unimplemented!()
|
||||||
|
unreachable!()
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
pub fn thread_to_mail_mut(&mut self, h: ThreadHash, f: FolderHash) -> &mut Envelope {
|
||||||
|
self.collection
|
||||||
|
.envelopes
|
||||||
|
.entry(self.collection.threads[&f].thread_to_mail(h))
|
||||||
|
.or_default()
|
||||||
|
}
|
||||||
|
pub fn thread_to_mail(&self, h: ThreadHash, f: FolderHash) -> &Envelope {
|
||||||
|
&self.collection.envelopes[&self.collection.threads[&f].thread_to_mail(h)]
|
||||||
|
}
|
||||||
|
pub fn threaded_mail(&self, h: ThreadHash, f: FolderHash) -> EnvelopeHash {
|
||||||
|
self.collection.threads[&f].thread_to_mail(h)
|
||||||
|
}
|
||||||
|
pub fn mail_and_thread(
|
||||||
|
&mut self,
|
||||||
|
i: EnvelopeHash,
|
||||||
|
f: FolderHash,
|
||||||
|
) -> (&mut Envelope, &ThreadNode) {
|
||||||
|
let thread;
|
||||||
|
{
|
||||||
|
let x = &mut self.collection.envelopes.entry(i).or_default();
|
||||||
|
thread = &self.collection.threads[&f][&x.thread()];
|
||||||
|
}
|
||||||
|
(self.collection.envelopes.entry(i).or_default(), thread)
|
||||||
|
}
|
||||||
|
pub fn thread(&self, h: ThreadHash, f: FolderHash) -> &ThreadNode {
|
||||||
|
&self.collection.threads[&f].thread_nodes()[&h]
|
||||||
|
}
|
||||||
|
}
|
|
@ -360,13 +360,7 @@ impl ListingTrait for CompactListing {
|
||||||
|
|
||||||
let account = &context.accounts[self.cursor_pos.0];
|
let account = &context.accounts[self.cursor_pos.0];
|
||||||
let folder_hash = account[self.cursor_pos.1].unwrap().folder.hash();
|
let folder_hash = account[self.cursor_pos.1].unwrap().folder.hash();
|
||||||
match crate::search::filter(
|
match account.search(filter_term, self.sort, folder_hash) {
|
||||||
filter_term,
|
|
||||||
context,
|
|
||||||
self.cursor_pos.0,
|
|
||||||
self.sort,
|
|
||||||
folder_hash,
|
|
||||||
) {
|
|
||||||
Ok(results) => {
|
Ok(results) => {
|
||||||
let threads = &account.collection.threads[&folder_hash];
|
let threads = &account.collection.threads[&folder_hash];
|
||||||
for env_hash in results {
|
for env_hash in results {
|
||||||
|
|
|
@ -351,13 +351,7 @@ impl ListingTrait for ConversationsListing {
|
||||||
|
|
||||||
let account = &context.accounts[self.cursor_pos.0];
|
let account = &context.accounts[self.cursor_pos.0];
|
||||||
let folder_hash = account[self.cursor_pos.1].unwrap().folder.hash();
|
let folder_hash = account[self.cursor_pos.1].unwrap().folder.hash();
|
||||||
match crate::search::filter(
|
match account.search(filter_term, self.sort, folder_hash) {
|
||||||
filter_term,
|
|
||||||
context,
|
|
||||||
self.cursor_pos.0,
|
|
||||||
self.sort,
|
|
||||||
folder_hash,
|
|
||||||
) {
|
|
||||||
Ok(results) => {
|
Ok(results) => {
|
||||||
let threads = &account.collection.threads[&folder_hash];
|
let threads = &account.collection.threads[&folder_hash];
|
||||||
for env_hash in results {
|
for env_hash in results {
|
||||||
|
|
|
@ -553,3 +553,24 @@ impl Serialize for IndexStyle {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum IndexCache {
|
||||||
|
Nothing,
|
||||||
|
#[cfg(feature = "sqlite3")]
|
||||||
|
Sqlite3,
|
||||||
|
Backend,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for IndexCache {
|
||||||
|
fn default() -> Self {
|
||||||
|
#[cfg(feature = "sqlite3")]
|
||||||
|
{
|
||||||
|
IndexCache::Sqlite3
|
||||||
|
}
|
||||||
|
#[cfg(not(feature = "sqlite3"))]
|
||||||
|
{
|
||||||
|
IndexCache::Nothing
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ use melib::backends::{
|
||||||
};
|
};
|
||||||
use melib::error::{MeliError, Result};
|
use melib::error::{MeliError, Result};
|
||||||
use melib::mailbox::*;
|
use melib::mailbox::*;
|
||||||
use melib::thread::{ThreadHash, ThreadNode, Threads};
|
use melib::thread::{SortField, SortOrder, ThreadHash, ThreadNode, Threads};
|
||||||
use melib::AddressBook;
|
use melib::AddressBook;
|
||||||
use melib::StackVec;
|
use melib::StackVec;
|
||||||
|
|
||||||
|
@ -821,6 +821,43 @@ impl Account {
|
||||||
self.is_online = ret;
|
self.is_online = ret;
|
||||||
ret
|
ret
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn search(
|
||||||
|
&self,
|
||||||
|
search_term: &str,
|
||||||
|
sort: (SortField, SortOrder),
|
||||||
|
folder_hash: FolderHash,
|
||||||
|
) -> Result<StackVec<EnvelopeHash>> {
|
||||||
|
#[cfg(feature = "sqlite3")]
|
||||||
|
{
|
||||||
|
crate::sqlite3::search(search_term, sort)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(feature = "sqlite3"))]
|
||||||
|
{
|
||||||
|
let mut ret = StackVec::new();
|
||||||
|
|
||||||
|
for env_hash in self.folders[folder_hash].as_result()?.envelopes {
|
||||||
|
let envelope = &account.collection[&env_hash];
|
||||||
|
if envelope.subject().contains(&search_term) {
|
||||||
|
ret.push(env_hash);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if envelope.field_from_to_string().contains(&search_term) {
|
||||||
|
ret.push(env_hash);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let op = self.operation(env_hash);
|
||||||
|
let body = envelope.body(op)?;
|
||||||
|
let decoded = decode_rec(&body, None);
|
||||||
|
let body_text = String::from_utf8_lossy(&decoded);
|
||||||
|
if body_text.contains(&search_term) {
|
||||||
|
ret.push(env_hash);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ret
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Index<FolderHash> for Account {
|
impl Index<FolderHash> for Account {
|
||||||
|
|
|
@ -27,6 +27,7 @@ use nom::{digit, not_line_ending};
|
||||||
use std;
|
use std;
|
||||||
pub mod actions;
|
pub mod actions;
|
||||||
pub mod history;
|
pub mod history;
|
||||||
|
pub use crate::actions::AccountAction::{self, *};
|
||||||
pub use crate::actions::Action::{self, *};
|
pub use crate::actions::Action::{self, *};
|
||||||
pub use crate::actions::ComposeAction::{self, *};
|
pub use crate::actions::ComposeAction::{self, *};
|
||||||
pub use crate::actions::ListingAction::{self, *};
|
pub use crate::actions::ListingAction::{self, *};
|
||||||
|
@ -297,6 +298,18 @@ define_commands!([
|
||||||
);
|
);
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
{ tags: ["reindex "],
|
||||||
|
desc: "reindex ACCOUNT, rebuild account cache in the background",
|
||||||
|
parser:(
|
||||||
|
named!( reindex<Action>,
|
||||||
|
do_parse!(
|
||||||
|
ws!(tag!("reindex"))
|
||||||
|
>> account: map_res!(is_not!(" "), std::str::from_utf8)
|
||||||
|
>> (AccountAction(account.to_string(), ReIndex))
|
||||||
|
)
|
||||||
|
);
|
||||||
|
)
|
||||||
|
},
|
||||||
{ tags: ["open-in-tab"],
|
{ tags: ["open-in-tab"],
|
||||||
desc: "opens envelope view in new tab",
|
desc: "opens envelope view in new tab",
|
||||||
parser:(
|
parser:(
|
||||||
|
@ -364,6 +377,8 @@ named!(
|
||||||
alt_complete!(add_attachment | remove_attachment | toggle_sign)
|
alt_complete!(add_attachment | remove_attachment | toggle_sign)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
named!(account_action<Action>, alt_complete!(reindex));
|
||||||
|
|
||||||
named!(pub parse_command<Action>,
|
named!(pub parse_command<Action>,
|
||||||
alt_complete!( goto | listing_action | sort | subsort | close | mailinglist | setenv | printenv | pipe | compose_action | create_folder | sub_folder | unsub_folder | delete_folder | rename_folder)
|
alt_complete!( goto | listing_action | sort | subsort | close | mailinglist | setenv | printenv | pipe | compose_action | create_folder | sub_folder | unsub_folder | delete_folder | rename_folder | account_action )
|
||||||
);
|
);
|
||||||
|
|
|
@ -74,6 +74,11 @@ pub enum ComposeAction {
|
||||||
ToggleSign,
|
ToggleSign,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum AccountAction {
|
||||||
|
ReIndex,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub enum Action {
|
pub enum Action {
|
||||||
Listing(ListingAction),
|
Listing(ListingAction),
|
||||||
|
@ -88,6 +93,7 @@ pub enum Action {
|
||||||
PrintEnv(String),
|
PrintEnv(String),
|
||||||
Compose(ComposeAction),
|
Compose(ComposeAction),
|
||||||
Folder(AccountName, FolderPath, FolderOperation),
|
Folder(AccountName, FolderPath, FolderOperation),
|
||||||
|
AccountAction(AccountName, AccountAction),
|
||||||
}
|
}
|
||||||
|
|
||||||
type AccountName = String;
|
type AccountName = String;
|
||||||
|
|
|
@ -72,7 +72,7 @@ pub use crate::workers::*;
|
||||||
#[cfg(feature = "sqlite3")]
|
#[cfg(feature = "sqlite3")]
|
||||||
pub mod sqlite3;
|
pub mod sqlite3;
|
||||||
|
|
||||||
pub mod search;
|
pub mod cache;
|
||||||
|
|
||||||
pub use crate::username::*;
|
pub use crate::username::*;
|
||||||
pub mod username {
|
pub mod username {
|
||||||
|
|
|
@ -19,10 +19,7 @@
|
||||||
* along with meli. If not, see <http://www.gnu.org/licenses/>.
|
* along with meli. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use crate::search::Query;
|
|
||||||
use crate::state::Context;
|
|
||||||
use melib::{
|
use melib::{
|
||||||
backends::FolderHash,
|
|
||||||
email::EnvelopeHash,
|
email::EnvelopeHash,
|
||||||
thread::{SortField, SortOrder},
|
thread::{SortField, SortOrder},
|
||||||
MeliError, Result, StackVec,
|
MeliError, Result, StackVec,
|
||||||
|
@ -189,10 +186,7 @@ pub fn insert(context: &crate::state::Context) -> Result<()> {
|
||||||
|
|
||||||
pub fn search(
|
pub fn search(
|
||||||
term: &str,
|
term: &str,
|
||||||
_context: &Context,
|
|
||||||
_account_idx: usize,
|
|
||||||
(sort_field, sort_order): (SortField, SortOrder),
|
(sort_field, sort_order): (SortField, SortOrder),
|
||||||
_folder_hash: FolderHash,
|
|
||||||
) -> Result<StackVec<EnvelopeHash>> {
|
) -> Result<StackVec<EnvelopeHash>> {
|
||||||
let data_dir =
|
let data_dir =
|
||||||
xdg::BaseDirectories::with_prefix("meli").map_err(|e| MeliError::new(e.to_string()))?;
|
xdg::BaseDirectories::with_prefix("meli").map_err(|e| MeliError::new(e.to_string()))?;
|
||||||
|
|
Loading…
Reference in New Issue