accounts: add force: bool arg to load()

epilys · epilys · commit f3d59ebf64db · 2024-07-31T08:21:08.000+03:00
Sometimes watch futures from backends send refresh events for mailboxes
that have not been fetched yet. That'd trigger fetching them in the
background, which is bad when the mailboxes are big and not wanted by
the user in the first place.

This commit adds a force parameter that specifies whether the loading
must be forced (e.g. when wanting to display the mailbox) or not.

Signed-off-by: Manos Pitsidianakis &lt;manos@pitsidianak.is&gt;
diff --git a/meli/src/accounts.rs b/meli/src/accounts.rs
@@ -896,7 +896,7 @@ impl Account {
         self.hash
     }
 
-    pub fn load(&mut self, mailbox_hash: MailboxHash) -> result::Result<(), usize> {
+    pub fn load(&mut self, mailbox_hash: MailboxHash, force: bool) -> result::Result<(), usize> {
         if mailbox_hash.is_null() {
             return Err(0);
         }
@@ -912,7 +912,7 @@ impl Account {
                 Ok(())
             }
             MailboxStatus::None => {
-                if !self.active_jobs.values().any(|j| j.is_fetch(mailbox_hash)) {
+                if force && !self.active_jobs.values().any(|j| j.is_fetch(mailbox_hash)) {
                     let mailbox_job = self.backend.write().unwrap().fetch(mailbox_hash);
                     match mailbox_job {
                         Ok(mailbox_job) => {
diff --git a/meli/src/mail/listing/compact.rs b/meli/src/mail/listing/compact.rs
@@ -227,7 +227,7 @@ impl MailListingTrait for CompactListing {
 
         // Get mailbox as a reference.
         //
-        match context.accounts[&self.cursor_pos.0].load(self.cursor_pos.1) {
+        match context.accounts[&self.cursor_pos.0].load(self.cursor_pos.1, true) {
             Ok(()) => {}
             Err(_) => {
                 self.length = 0;
diff --git a/meli/src/mail/listing/conversations.rs b/meli/src/mail/listing/conversations.rs
@@ -198,7 +198,7 @@ impl MailListingTrait for ConversationsListing {
 
         // Get mailbox as a reference.
         //
-        match context.accounts[&self.cursor_pos.0].load(self.cursor_pos.1) {
+        match context.accounts[&self.cursor_pos.0].load(self.cursor_pos.1, true) {
             Ok(()) => {}
             Err(_) => {
                 let message: String =
diff --git a/meli/src/mail/listing/plain.rs b/meli/src/mail/listing/plain.rs
@@ -211,7 +211,7 @@ impl MailListingTrait for PlainListing {
 
         // Get mailbox as a reference.
         //
-        match context.accounts[&self.cursor_pos.0].load(self.cursor_pos.1) {
+        match context.accounts[&self.cursor_pos.0].load(self.cursor_pos.1, true) {
             Ok(()) => {}
             Err(_) => {
                 self.length = 0;
diff --git a/meli/src/mail/listing/thread.rs b/meli/src/mail/listing/thread.rs
@@ -212,7 +212,7 @@ impl MailListingTrait for ThreadListing {
 
         // Get mailbox as a reference.
         //
-        match context.accounts[&self.cursor_pos.0].load(self.cursor_pos.1) {
+        match context.accounts[&self.cursor_pos.0].load(self.cursor_pos.1, true) {
             Ok(_) => {}
             Err(_) => {
                 self.length = 0;
diff --git a/meli/src/state.rs b/meli/src/state.rs
@@ -510,7 +510,7 @@ impl State {
             .contains_key(&mailbox_hash)
         {
             if self.context.accounts[&account_hash]
-                .load(mailbox_hash)
+                .load(mailbox_hash, false)
                 .is_err()
             {
                 self.context.replies.push_back(UIEvent::from(event));

Original file line number	Diff line number	Diff line change
`@@ -896,7 +896,7 @@ impl Account {`
`896`	`896`	`self.hash`
`897`	`897`	`}`
`898`	`898`
`899`		`- pub fn load(&mut self, mailbox_hash: MailboxHash) -> result::Result<(), usize> {`
	`899`	`+ pub fn load(&mut self, mailbox_hash: MailboxHash, force: bool) -> result::Result<(), usize> {`
`900`	`900`	`if mailbox_hash.is_null() {`
`901`	`901`	`return Err(0);`
`902`	`902`	`}`
`@@ -912,7 +912,7 @@ impl Account {`
`912`	`912`	`Ok(())`
`913`	`913`	`}`
`914`	`914`	`MailboxStatus::None => {`
`915`		`- if !self.active_jobs.values().any(\|j\| j.is_fetch(mailbox_hash)) {`
	`915`	`+ if force && !self.active_jobs.values().any(\|j\| j.is_fetch(mailbox_hash)) {`
`916`	`916`	`let mailbox_job = self.backend.write().unwrap().fetch(mailbox_hash);`
`917`	`917`	`match mailbox_job {`
`918`	`918`	`Ok(mailbox_job) => {`
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ impl State {`
`510`	`510`	`.contains_key(&mailbox_hash)`
`511`	`511`	`{`
`512`	`512`	`if self.context.accounts[&account_hash]`
`513`		`- .load(mailbox_hash)`
	`513`	`+ .load(mailbox_hash, false)`
`514`	`514`	`.is_err()`
`515`	`515`	`{`
`516`	`516`	`self.context.replies.push_back(UIEvent::from(event));`