fix(Database): fix deleteing history from the corresponding sections

Author: josueBarretogit

src/backend/database.rs

@@ -911,9 +911,13 @@ impl<'a> Database<'a> {
     /// // Remove manga from user's history lists
     /// db.remove_from_history("manga_123")?;
     /// ```
-    pub fn remove_from_history(&self, manga_id: &str) -> rusqlite::Result<()> {
-        self.connection
-            .execute("DELETE FROM manga_history_union WHERE manga_history_union.manga_id = ?1", params![manga_id])?;
+    pub fn remove_from_history(&self, manga_id: &str, hist_type: MangaHistoryType) -> rusqlite::Result<()> {
+        let hist_type_id = self.get_history_type(hist_type)?;
+
+        self.connection.execute(
+            "DELETE FROM manga_history_union WHERE manga_history_union.manga_id = ?1 AND manga_history_union.type_id = ?2",
+            params![manga_id, hist_type_id],
+        )?;
 
         Ok(())
     }
@@ -938,16 +942,17 @@ impl<'a> Database<'a> {
     pub fn remove_all_from_history(&self, hist_type: MangaHistoryType, provider: MangaProviders) -> rusqlite::Result<()> {
         let history_type_id = self.get_history_type(hist_type)?;
 
-        let get_ids_manga_to_delete_statement = r#"SELECT  mangas.id from mangas 
+        let get_ids_manga_to_delete_statement = r#"SELECT mangas.id from mangas 
                      INNER JOIN manga_history_union ON mangas.id = manga_history_union.manga_id 
                      WHERE manga_history_union.type_id = ?1 AND mangas.manga_provider = ?2
             "#;
 
-        let delete_statement =
-            format!("DELETE FROM manga_history_union WHERE manga_history_union.manga_id IN ({get_ids_manga_to_delete_statement})");
+        let delete_statement = format!(
+            "DELETE FROM manga_history_union WHERE manga_history_union.manga_id IN ({get_ids_manga_to_delete_statement}) AND manga_history_union.type_id = ?3"
+        );
 
         self.connection
-            .execute(&delete_statement, params![history_type_id, provider.to_string()])?;
+            .execute(&delete_statement, params![history_type_id, provider.to_string(), history_type_id])?;
 
         Ok(())
     }
@@ -2179,7 +2184,7 @@ mod test {
         /* at this point 2 mangas must be stored in reading history */
         assert_eq!(expected.mangas.len(), 2);
 
-        database.remove_from_history(&manga_id_mangadex)?;
+        database.remove_from_history(&manga_id_mangadex, MangaHistoryType::ReadingHistory)?;
 
         let expected = database.get_history(GetHistoryArgs {
             hist_type: MangaHistoryType::ReadingHistory,
@@ -2233,7 +2238,7 @@ mod test {
         /* at this point 2 mangas must be stored in reading history */
         assert_eq!(expected.mangas.len(), 2);
 
-        database.remove_from_history(&manga_id_mangadex)?;
+        database.remove_from_history(&manga_id_mangadex, MangaHistoryType::PlanToRead)?;
 
         let expected = database.get_history(GetHistoryArgs {
             hist_type: MangaHistoryType::PlanToRead,
@@ -2246,6 +2251,17 @@ mod test {
         /* now only one should exist */
         assert_eq!(expected.mangas.len(), 1);
 
+        let expected = database.get_history(GetHistoryArgs {
+            hist_type: MangaHistoryType::ReadingHistory,
+            page: 1,
+            search: None,
+            items_per_page: 10,
+            provider: MangaProviders::Mangadex,
+        })?;
+
+        /* the reading history should be ketp the same */
+        assert_eq!(expected.mangas.len(), 2);
+
         Ok(())
     }
 
@@ -2265,7 +2281,7 @@ mod test {
         let manga_id_weeb_central = Uuid::new_v4().to_string();
         let manga_id_weeb_centra2 = Uuid::new_v4().to_string();
 
-        database.create_manga_if_not_exists(MangaInsert {
+        database.save_plan_to_read(MangaPlanToReadSave {
             id: &manga_id_mangadex,
             title: "of mangadex 1",
             img_url: None,
@@ -2274,7 +2290,7 @@ mod test {
 
         database.insert_manga_in_reading_history(&manga_id_mangadex)?;
 
-        database.create_manga_if_not_exists(MangaInsert {
+        database.save_plan_to_read(MangaPlanToReadSave {
             id: &manga_id_mangadex2,
             title: "of mangadex 2",
             img_url: None,
@@ -2357,8 +2373,8 @@ mod test {
             provider: MangaProviders::Mangadex,
         })?;
 
-        /* at this point 2 mangas in plant to read should exist */
-        assert_eq!(expected.mangas.len(), 2);
+        /* at this point 4 mangas in plant to read should exist */
+        assert_eq!(expected.mangas.len(), 4);
 
         database.remove_all_from_history(MangaHistoryType::ReadingHistory, MangaProviders::Mangadex)?;
 
@@ -2393,7 +2409,7 @@ mod test {
         })?;
 
         /* the plan to read history should remain untouched */
-        assert_eq!(expected.mangas.len(), 2);
+        assert_eq!(expected.mangas.len(), 4);
 
         Ok(())
     }

src/backend/manga_provider/mangadex.rs

@@ -382,6 +382,22 @@ impl MangadexClient {
             }
         }
     }
+
+    fn save_filters_on_close(&self, filters: Filters) {
+        let filters_cache_writer = FiltersCache::new(&*MANGADEX_CACHE_BASE_DIRECTORY, MANGADEX_CACHE_FILENAME);
+
+        filters_cache_writer
+            .write_to_cache(&filters)
+            .inspect_err(|e| {
+                #[cfg(not(test))]
+                {
+                    use crate::backend::error_log::{ErrorType, write_to_error_log};
+
+                    write_to_error_log(ErrorType::String(&e.to_string()));
+                }
+            })
+            .ok();
+    }
 }
 
 impl GetRawImage for MangadexClient {
@@ -891,6 +907,7 @@ impl SearchPageProvider for MangadexClient {
             None => "".to_string(),
         };
 
+        let filters_to_save = filters.clone();
         let filters = filters.into_param();
         let items_per_page = pagination.items_per_page;
 
@@ -982,6 +999,8 @@ impl SearchPageProvider for MangadexClient {
             })
             .collect();
 
+        self.save_filters_on_close(filters_to_save);
+
         Ok(GetMangasResponse {
             mangas,
             total_mangas,

src/backend/manga_provider/mangadex/filters/filter_provider.rs

@@ -13,11 +13,10 @@ use tui_input::backend::crossterm::EventHandler;
 
 use super::super::{API_URL_BASE, COVER_IMG_URL_BASE};
 use crate::backend::cache::in_memory::InMemoryCache;
-use crate::backend::manga_provider::filters::FiltersCache;
+use crate::backend::manga_provider::mangadex::MangadexClient;
 use crate::backend::manga_provider::mangadex::api_responses::authors::AuthorsResponse;
 use crate::backend::manga_provider::mangadex::api_responses::tags::TagsResponse;
 use crate::backend::manga_provider::mangadex::filters::api_parameter::*;
-use crate::backend::manga_provider::mangadex::{MANGADEX_CACHE_BASE_DIRECTORY, MANGADEX_CACHE_FILENAME, MangadexClient};
 use crate::backend::manga_provider::{EventHandler as FiltersEventHandler, FiltersHandler, Languages};
 use crate::backend::tui::Events;
 
@@ -689,11 +688,8 @@ impl FiltersEventHandler for MangadexFilterProvider {
 impl FiltersHandler for MangadexFilterProvider {
     type InnerState = Filters;
 
+    #[inline]
     fn toggle(&mut self) {
-        if self.is_open {
-            self.save_filters_on_close();
-        }
-
         self.is_open = !self.is_open;
     }
 
@@ -714,22 +710,6 @@ impl FiltersHandler for MangadexFilterProvider {
 }
 
 impl MangadexFilterProvider {
-    fn save_filters_on_close(&self) {
-        let filters_cache_writer = FiltersCache::new(&*MANGADEX_CACHE_BASE_DIRECTORY, MANGADEX_CACHE_FILENAME);
-
-        filters_cache_writer
-            .write_to_cache(&self.filters)
-            .inspect_err(|e| {
-                #[cfg(not(test))]
-                {
-                    use crate::backend::error_log::{ErrorType, write_to_error_log};
-
-                    write_to_error_log(ErrorType::String(&e.to_string()));
-                }
-            })
-            .ok();
-    }
-
     pub fn reset(&mut self) {
         if self.tags_state.tags.is_some() {
             self.tags_state
@@ -1012,7 +992,7 @@ impl MangadexFilterProvider {
                     .already_existings_tags
                     .as_ref()
                     .and_then(|tags| {
-                        let found_tag = tags.iter().find(|tag| tag.id == data.id);
+                        let found_tag = tags.iter().find(|tag| !tag.id.is_empty() && tag.id == data.id);
 
                         found_tag.map(|existing_tag| TagListItemState::from(existing_tag.state))
                     })

src/view/app.rs

@@ -4,11 +4,8 @@ use ::crossterm::event::KeyCode;
 use crossterm::event::{KeyEvent, KeyModifiers};
 use ratatui::Frame;
 use ratatui::buffer::Buffer;
-use ratatui::layout::{Constraint, Layout, Margin, Rect};
-use ratatui::style::Styled;
-use ratatui::text::Line;
-use ratatui::widgets::block::Title;
-use ratatui::widgets::{Block, Borders, Clear, Paragraph, Tabs, Widget, Wrap};
+use ratatui::layout::{Constraint, Layout, Rect};
+use ratatui::widgets::{Block, Borders, Tabs, Widget};
 use ratatui_image::picker::Picker;
 use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender, unbounded_channel};
 
@@ -23,7 +20,6 @@ use crate::backend::tracker::MangaTracker;
 use crate::backend::tui::{Action, Events};
 use crate::config::MangaTuiConfig;
 use crate::global::INSTRUCTIONS_STYLE;
-use crate::utils::centered_rect;
 use crate::view::pages::*;
 use crate::view::widgets::ErrorModal;
 

src/view/pages/feed.rs

@@ -399,9 +399,7 @@ where
 
     fn render_ask_modal_confirmation_delete_all_mangas(&mut self, area: Rect, buf: &mut Buffer) {
         if self.state == FeedState::AskingDeleteAllConfirmation {
-            AskConfirmationDeleteAllModal::new()
-                .with_manga_provider(self.manga_provider.as_ref().unwrap().name())
-                .render(area, buf);
+            AskConfirmationDeleteAllModal::new(self.tabs, self.manga_provider.as_ref().unwrap().name()).render(area, buf);
         }
     }
 
@@ -445,8 +443,8 @@ where
             let connection = Database::get_connection().unwrap();
             let database = Database::new(&connection);
 
-            if let Err(err) = database.remove_from_history(&manga.id) {
-                self.global_event_tx.as_ref().unwrap().send(Events::Error(err.to_string()));
+            if let Err(err) = database.remove_from_history(&manga.id, self.tabs.into()) {
+                self.global_event_tx.as_ref().unwrap().send(Events::Error(err.to_string())).ok();
             } else {
                 self.search_history();
             }
@@ -496,7 +494,7 @@ where
         } else if self.state == FeedState::AskingDeleteAllConfirmation {
             match key_event.code {
                 KeyCode::Char('w') => self.remove_all_mangas(),
-                KeyCode::Char('q') => self.state = FeedState::DisplayingHistory,
+                KeyCode::Char('q') | KeyCode::Esc => self.state = FeedState::DisplayingHistory,
                 _ => {},
             }
         } else {

src/view/widgets/feed.rs

@@ -1,16 +1,16 @@
+use std::fmt::Display;
+
 use chrono::NaiveDate;
-use crossterm::event::{KeyCode, KeyEvent};
 use ratatui::buffer::Buffer;
 use ratatui::layout::{Constraint, Layout, Margin, Rect};
-use ratatui::style::{Color, Style, Styled, Stylize};
+use ratatui::style::{Color, Style, Stylize};
 use ratatui::text::Line;
-use ratatui::widgets::block::Title;
 use ratatui::widgets::{Block, Borders, List, ListItem, Paragraph, StatefulWidget, Widget, WidgetRef, Wrap};
 use tui_widget_list::PreRender;
 
 use crate::backend::database::MangaHistoryResponse;
-use crate::backend::manga_provider::{Languages, LatestChapter, MangaProvider, MangaProviders};
-use crate::global::{CURRENT_LIST_ITEM_STYLE, INSTRUCTIONS_STYLE};
+use crate::backend::manga_provider::{Languages, LatestChapter, MangaProviders};
+use crate::global::CURRENT_LIST_ITEM_STYLE;
 use crate::utils::display_dates_since_publication;
 use crate::view::widgets::ModalBuilder;
 
@@ -20,6 +20,15 @@ pub enum FeedTabs {
     PlantToRead,
 }
 
+impl Display for FeedTabs {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::History => write!(f, "Reading history"),
+            Self::PlantToRead => write!(f, "Plan to Read"),
+        }
+    }
+}
+
 impl FeedTabs {
     pub fn cycle(self) -> Self {
         match self {
@@ -220,29 +229,27 @@ impl StatefulWidget for HistoryWidget {
 #[derive(Debug)]
 struct AskConfirmationDeleteAllModalBody {
     manga_provider: MangaProviders,
+    tab: FeedTabs,
 }
 
 impl WidgetRef for AskConfirmationDeleteAllModalBody {
     fn render_ref(&self, area: Rect, buf: &mut Buffer) {
-        Block::bordered()
-            //.title(Title::from(Line::from(vec![
-            //    "Some error ocurred, press ".into(),
-            //    "<q>".set_style(*INSTRUCTIONS_STYLE),
-            //    " to close this popup".into(),
-            //])))
-            .render(area, buf);
+        Block::bordered().render(area, buf);
 
         let inner = area.inner(Margin {
             horizontal: 2,
             vertical: 2,
         });
 
-        let warning = format!("Are you sure you want to delete ALL mangas from the manga provider: {}?", self.manga_provider);
+        let warning = format!(
+            "Are you sure you want to delete ALL mangas from the manga provider: {} in the section {}?",
+            self.manga_provider, self.tab
+        );
 
         let as_list = List::new(Line::from(vec![
             warning.into(),
             "".into(),
-            "Your reading history will still be kept but not from this `Feed` page".into(),
+            "Your reading history and download status will still be kept but not from this `Feed` page".into(),
             "Yes: <w>".bold().fg(Color::Red),
             "No: <q>".bold().fg(Color::Green),
         ]));
@@ -254,19 +261,16 @@ impl WidgetRef for AskConfirmationDeleteAllModalBody {
 #[derive(Debug)]
 pub struct AskConfirmationDeleteAllModal {
     manga_provider: MangaProviders,
+    tab: FeedTabs,
 }
 
 impl AskConfirmationDeleteAllModal {
-    pub fn new() -> Self {
+    pub fn new(tab: FeedTabs, provider: MangaProviders) -> Self {
         Self {
-            manga_provider: MangaProviders::default(),
+            manga_provider: provider,
+            tab,
         }
     }
-
-    pub fn with_manga_provider(mut self, manga_prov: MangaProviders) -> Self {
-        self.manga_provider = manga_prov;
-        self
-    }
 }
 
 impl Widget for AskConfirmationDeleteAllModal {
@@ -276,6 +280,7 @@ impl Widget for AskConfirmationDeleteAllModal {
     {
         let modal = ModalBuilder::new(AskConfirmationDeleteAllModalBody {
             manga_provider: self.manga_provider,
+            tab: self.tab,
         })
         .with_dimensions(super::ModalDimensions {
             width: 70,