Skip to content

Commit cc237ec

Browse files
josueBarretogitjosueBarretogit
committed
ci(app): update edition to 2024
1 parent d65e17e commit cc237ec

10 files changed

Lines changed: 119 additions & 129 deletions

File tree

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "manga-tui"
33
version = "0.10.0"
4-
edition = "2021"
4+
edition = "2024"
55
authors = ["Josue <josuebarretogit@gmail.com>"]
66
readme = "README.md"
77
homepage = "https://github.com/josueBarretogit/manga-tui"

‎src/backend/manga_provider/filters.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl FiltersCache {
106106
pub fn get_cached_filters<I: DeserializeOwned>(&self) -> Option<I> {
107107
let file_path = self.get_cache_file_path();
108108

109-
let maybe_filters = File::open(file_path)
109+
File::open(file_path)
110110
.inspect_err(|e| match e.kind() {
111111
std::io::ErrorKind::NotFound => {},
112112
_ => {
@@ -119,9 +119,7 @@ impl FiltersCache {
119119
},
120120
})
121121
.and_then(|mut file| self.parse_cache(&mut file).map_err(|e| std::io::Error::other(e.to_string())))
122-
.ok();
123-
124-
maybe_filters
122+
.ok()
125123
}
126124

127125
/// Writes the "Filters" to the cache file which is created if it

‎src/backend/manga_provider/mangadex.rs‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ pub static COVER_IMG_URL_BASE: &str = "https://uploads.mangadex.org/covers";
3838
pub static MANGADEX_CACHE_FILENAME: &str = "filters.toml";
3939

4040
pub static MANGADEX_CACHE_BASE_DIRECTORY: LazyLock<PathBuf> = LazyLock::new(|| {
41-
let cache_path = directories::ProjectDirs::from("", "", "manga-tui")
41+
directories::ProjectDirs::from("", "", "manga-tui")
4242
.map(|project_dirs| project_dirs.cache_dir().join("mangadex").to_path_buf())
43-
.unwrap_or_default();
44-
cache_path
43+
.unwrap_or_default()
4544
});
4645

4746
/// Mangadex: `https://mangadex.org`
@@ -166,11 +165,11 @@ impl MangadexClient {
166165
let mut cover_img_url = String::new();
167166

168167
for rel in &manga.relationships {
169-
if let Some(attributes) = &rel.attributes {
170-
if rel.type_field.as_str() == "cover_art" {
171-
let file_name = attributes.file_name.as_ref().unwrap().to_string();
172-
cover_img_url = self.make_cover_img_url(&manga.id, &file_name);
173-
}
168+
if let Some(attributes) = &rel.attributes
169+
&& rel.type_field.as_str() == "cover_art"
170+
{
171+
let file_name = attributes.file_name.as_ref().unwrap().to_string();
172+
cover_img_url = self.make_cover_img_url(&manga.id, &file_name);
174173
}
175174
}
176175

@@ -464,11 +463,11 @@ impl HomePageMangaProvider for MangadexClient {
464463
let mut cover_img_url = String::new();
465464

466465
for rel in &manga.relationships {
467-
if let Some(attributes) = &rel.attributes {
468-
if rel.type_field.as_str() == "cover_art" {
469-
let file_name = attributes.file_name.as_ref().unwrap().to_string();
470-
cover_img_url = self.make_cover_img_url_lower_quality(&manga.id, &file_name);
471-
}
466+
if let Some(attributes) = &rel.attributes
467+
&& rel.type_field.as_str() == "cover_art"
468+
{
469+
let file_name = attributes.file_name.as_ref().unwrap().to_string();
470+
cover_img_url = self.make_cover_img_url_lower_quality(&manga.id, &file_name);
472471
}
473472
}
474473
RecentlyAddedManga {

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

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ impl<T> FilterList<T> {
122122
}
123123

124124
pub fn toggle(&mut self) {
125-
if let Some(index) = self.state.selected() {
126-
if let Some(content_rating) = self.items.get_mut(index) {
127-
content_rating.toggle();
128-
}
125+
if let Some(index) = self.state.selected()
126+
&& let Some(content_rating) = self.items.get_mut(index)
127+
{
128+
content_rating.toggle();
129129
}
130130
}
131131

@@ -272,10 +272,10 @@ impl FilterList<SortByState> {
272272
item.is_selected = false;
273273
}
274274

275-
if let Some(index) = self.state.selected() {
276-
if let Some(sort_by) = self.items.get_mut(index) {
277-
sort_by.toggle();
278-
}
275+
if let Some(index) = self.state.selected()
276+
&& let Some(sort_by) = self.items.get_mut(index)
277+
{
278+
sort_by.toggle();
279279
}
280280
}
281281
}
@@ -431,12 +431,11 @@ impl<T: SendEventOnSuccess> FilterListDynamic<T> {
431431
}
432432

433433
fn toggle(&mut self) {
434-
if let Some(items) = self.items.as_mut() {
435-
if let Some(index) = self.state.selected() {
436-
if let Some(user_selected) = items.get_mut(index) {
437-
user_selected.is_selected = !user_selected.is_selected;
438-
}
439-
}
434+
if let Some(items) = self.items.as_mut()
435+
&& let Some(index) = self.state.selected()
436+
&& let Some(user_selected) = items.get_mut(index)
437+
{
438+
user_selected.is_selected = !user_selected.is_selected;
440439
}
441440
}
442441

@@ -600,12 +599,11 @@ impl TagsState {
600599
if let Some(tag) = self.get_selected_tag() {
601600
tag.toggle_include();
602601
}
603-
} else if self.tags.is_some() {
604-
if let Some(index) = self.state.selected() {
605-
if let Some(tag) = self.get_filtered_tags().get_mut(index) {
606-
tag.toggle_include();
607-
}
608-
}
602+
} else if self.tags.is_some()
603+
&& let Some(index) = self.state.selected()
604+
&& let Some(tag) = self.get_filtered_tags().get_mut(index)
605+
{
606+
tag.toggle_include();
609607
}
610608
}
611609

@@ -614,12 +612,11 @@ impl TagsState {
614612
if let Some(tag) = self.get_selected_tag() {
615613
tag.toggle_exclude();
616614
}
617-
} else if self.tags.is_some() {
618-
if let Some(index) = self.state.selected() {
619-
if let Some(tag) = self.get_filtered_tags().get_mut(index) {
620-
tag.toggle_exclude();
621-
}
622-
}
615+
} else if self.tags.is_some()
616+
&& let Some(index) = self.state.selected()
617+
&& let Some(tag) = self.get_filtered_tags().get_mut(index)
618+
{
619+
tag.toggle_exclude();
623620
}
624621
}
625622
}
@@ -748,10 +745,10 @@ impl MangadexFilterProvider {
748745
let client = self.api_client.clone();
749746
tokio::spawn(async move {
750747
let response = client.get_tags().await;
751-
if let Ok(res) = response {
752-
if let Ok(tags) = res.json().await {
753-
tx.send(FilterEvents::LoadTags(tags)).ok();
754-
}
748+
if let Ok(res) = response
749+
&& let Ok(tags) = res.json().await
750+
{
751+
tx.send(FilterEvents::LoadTags(tags)).ok();
755752
}
756753
});
757754
}

‎src/backend/manga_provider/mangapill/response.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,15 +450,13 @@ impl<T: HtmlParser> ChapterPagesScraper<T> {
450450
.get_matching_elements(pages_selector)
451451
.iter()
452452
.filter_map(|img| {
453-
let url = self
454-
.scraper
453+
self.scraper
455454
.get_element_attr(img, "data-src")
456455
.and_then(|url| Url::parse(&url).ok())
457456
.and_then(|url| {
458457
let extension = Path::new(url.path()).extension().and_then(|ex| ex.to_str()).map(|ex| ex.to_string())?;
459458
Some(ChapterPageUrl { extension, url })
460-
});
461-
url
459+
})
462460
})
463461
.collect();
464462

‎src/view/app.rs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ where
252252
/// This method ensures a chapter is bookmarked on quit as well
253253
/// only if auto_bookmark = true
254254
fn auto_bookmark_on_quit(&mut self) {
255-
if let Some(reader_page) = self.manga_reader_page.as_mut() {
256-
if reader_page.auto_bookmark {
257-
reader_page.bookmark_current_chapter();
258-
}
255+
if let Some(reader_page) = self.manga_reader_page.as_mut()
256+
&& reader_page.auto_bookmark
257+
{
258+
reader_page.bookmark_current_chapter();
259259
}
260260
}
261261

@@ -387,11 +387,11 @@ where
387387

388388
// If the app is displaying an error message then the user can only close the app or
389389
// the error message popup
390-
if self.is_displaying_error_message() {
391-
if let Events::Key(key_event) = event {
392-
self.key_events_error_message(key_event);
393-
return;
394-
}
390+
if self.is_displaying_error_message()
391+
&& let Events::Key(key_event) = event
392+
{
393+
self.key_events_error_message(key_event);
394+
return;
395395
}
396396

397397
match self.current_tab {
@@ -426,17 +426,17 @@ where
426426
}
427427
},
428428
SelectedPage::MangaTab => {
429-
if let Some(manga_page) = self.manga_page.as_mut() {
430-
if let Ok(action) = manga_page.local_action_rx.try_recv() {
431-
manga_page.update(action);
432-
}
429+
if let Some(manga_page) = self.manga_page.as_mut()
430+
&& let Ok(action) = manga_page.local_action_rx.try_recv()
431+
{
432+
manga_page.update(action);
433433
}
434434
},
435435
SelectedPage::ReaderTab => {
436-
if let Some(reader_page) = self.manga_reader_page.as_mut() {
437-
if let Ok(reader_action) = reader_page.local_action_rx.try_recv() {
438-
reader_page.update(reader_action);
439-
}
436+
if let Some(reader_page) = self.manga_reader_page.as_mut()
437+
&& let Ok(reader_action) = reader_page.local_action_rx.try_recv()
438+
{
439+
reader_page.update(reader_action);
440440
}
441441
},
442442
SelectedPage::Home => {

‎src/view/pages/feed.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -565,10 +565,10 @@ where
565565
}
566566

567567
fn load_recent_chapters(&mut self, manga_id: String, maybe_history: Option<Vec<LatestChapter>>) {
568-
if let Some(chapters_response) = maybe_history {
569-
if let Some(history) = self.history.as_mut() {
570-
history.set_chapter(manga_id, chapters_response);
571-
}
568+
if let Some(chapters_response) = maybe_history
569+
&& let Some(history) = self.history.as_mut()
570+
{
571+
history.set_chapter(manga_id, chapters_response);
572572
}
573573
}
574574

@@ -663,11 +663,11 @@ where
663663
/// Checks if there are more pages available and, if so, increments the page
664664
/// number and triggers a new search to load the next page of manga.
665665
fn search_next_page(&mut self) {
666-
if let Some(history) = self.history.as_mut() {
667-
if history.can_search_next_page(self.items_per_page as f64) {
668-
history.next_page();
669-
self.search_history();
670-
}
666+
if let Some(history) = self.history.as_mut()
667+
&& history.can_search_next_page(self.items_per_page as f64)
668+
{
669+
history.next_page();
670+
self.search_history();
671671
}
672672
}
673673

@@ -676,11 +676,11 @@ where
676676
/// Checks if there's a previous page and, if so, decrements the page number
677677
/// and triggers a new search to load the previous page of manga.
678678
fn search_previous_page(&mut self) {
679-
if let Some(history) = self.history.as_mut() {
680-
if history.can_search_previous_page() {
681-
history.previous_page();
682-
self.search_history();
683-
}
679+
if let Some(history) = self.history.as_mut()
680+
&& history.can_search_previous_page()
681+
{
682+
history.previous_page();
683+
self.search_history();
684684
}
685685
}
686686

‎src/view/pages/home.rs‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,12 @@ where
275275
}
276276

277277
fn load_popular_manga_cover(&mut self, maybe_cover: Option<DynamicImage>, id: String) {
278-
if let Some(cover) = maybe_cover {
279-
if let Some(picker) = self.picker.as_mut() {
280-
let fixed_protocol =
281-
picker.new_protocol(cover, self.popular_manga_carrousel_state.get_img_area(), Resize::Fit(None));
282-
if let Ok(protocol) = fixed_protocol {
283-
self.popular_manga_carrousel_state.insert_manga(protocol, id);
284-
}
278+
if let Some(cover) = maybe_cover
279+
&& let Some(picker) = self.picker.as_mut()
280+
{
281+
let fixed_protocol = picker.new_protocol(cover, self.popular_manga_carrousel_state.get_img_area(), Resize::Fit(None));
282+
if let Ok(protocol) = fixed_protocol {
283+
self.popular_manga_carrousel_state.insert_manga(protocol, id);
285284
}
286285
}
287286
}
@@ -373,13 +372,13 @@ where
373372
}
374373

375374
fn load_recently_added_mangas_cover(&mut self, maybe_cover: Option<DynamicImage>, id: String) {
376-
if let Some(cover) = maybe_cover {
377-
if let Some(picker) = self.picker.as_mut() {
378-
let fixed_protocol = picker.new_protocol(cover, self.recently_added_manga_state.get_img_area(), Resize::Fit(None));
375+
if let Some(cover) = maybe_cover
376+
&& let Some(picker) = self.picker.as_mut()
377+
{
378+
let fixed_protocol = picker.new_protocol(cover, self.recently_added_manga_state.get_img_area(), Resize::Fit(None));
379379

380-
if let Ok(protocol) = fixed_protocol {
381-
self.recently_added_manga_state.insert_manga(protocol, id);
382-
}
380+
if let Ok(protocol) = fixed_protocol {
381+
self.recently_added_manga_state.insert_manga(protocol, id);
383382
}
384383
}
385384
}

0 commit comments

Comments
 (0)