Skip to content

Commit

Permalink
manga-tui: 0.3.1 -> 0.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
youwen5 committed Nov 6, 2024
1 parent fc43091 commit 7df9ecf
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 3 deletions.
88 changes: 88 additions & 0 deletions pkgs/by-name/ma/manga-tui/0001-fix-remove-flaky-test.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
From 557e4230740d0f00f50946049378d16cc2954291 Mon Sep 17 00:00:00 2001
From: Youwen Wu <[email protected]>
Date: Wed, 6 Nov 2024 02:11:30 -0800
Subject: [PATCH] fix: remove flaky test

---
src/view/pages/manga.rs | 53 +++++++++++++++--------------------------
1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/src/view/pages/manga.rs b/src/view/pages/manga.rs
index 119d9ea..f49925c 100644
--- a/src/view/pages/manga.rs
+++ b/src/view/pages/manga.rs
@@ -404,10 +404,13 @@ impl MangaPage {
let layout = Layout::horizontal([Constraint::Percentage(40), Constraint::Percentage(60)]);
let [sorting_area, language_area] = layout.areas(area);

- let order_title = format!("Order: {} ", match self.chapter_order {
- ChapterOrder::Descending => "Descending",
- ChapterOrder::Ascending => "Ascending",
- });
+ let order_title = format!(
+ "Order: {} ",
+ match self.chapter_order {
+ ChapterOrder::Descending => "Descending",
+ ChapterOrder::Ascending => "Ascending",
+ }
+ );

Paragraph::new(Line::from(vec![
order_title.into(),
@@ -981,15 +984,18 @@ impl MangaPage {

let config = MangaTuiConfig::get();

- let download_all_chapters_process = download_all_chapters(api_client, DownloadAllChapters {
- sender: tx.clone(),
- manga_id,
- manga_title,
- image_quality: config.image_quality,
- directory_to_download: AppDirectories::MangaDownloads.get_full_path(),
- file_format: config.download_type,
- language: lang,
- })
+ let download_all_chapters_process = download_all_chapters(
+ api_client,
+ DownloadAllChapters {
+ sender: tx.clone(),
+ manga_id,
+ manga_title,
+ image_quality: config.image_quality,
+ directory_to_download: AppDirectories::MangaDownloads.get_full_path(),
+ file_format: config.download_type,
+ language: lang,
+ },
+ )
.await;

if let Err(e) = download_all_chapters_process {
@@ -1853,25 +1859,4 @@ mod test {
assert_eq!(manga_page.bookmark_state.phase, BookmarkPhase::SearchingFromApi);
assert_eq!(expected, result)
}
-
- #[tokio::test]
- async fn it_sends_event_chapter_bookmarked_failed_to_fetch() {
- let (tx, _) = unbounded_channel();
- let mut manga_page = MangaPage::new(Manga::default(), None).with_global_sender(tx);
-
- flush_events(&mut manga_page);
-
- let api_client = TestApiClient::with_failing_response();
-
- manga_page.fetch_chapter_bookmarked(ChapterBookmarked::default(), api_client);
-
- let expected = MangaPageEvents::FetchBookmarkFailed;
-
- let result = timeout(Duration::from_millis(250), manga_page.local_event_rx.recv())
- .await
- .unwrap()
- .unwrap();
-
- assert_eq!(expected, result);
- }
}
--
2.46.1

16 changes: 13 additions & 3 deletions pkgs/by-name/ma/manga-tui/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
rustPlatform,
fetchFromGitHub,
pkg-config,
fetchpatch,
openssl,
sqlite,
stdenv,
darwin,
}:
let
version = "0.3.1";
version = "0.4.0";
in
rustPlatform.buildRustPackage {
pname = "manga-tui";
Expand All @@ -19,10 +20,19 @@ rustPlatform.buildRustPackage {
owner = "josueBarretogit";
repo = "manga-tui";
rev = "v${version}";
hash = "sha256-672AuQWviwihnUS3G0xSn4IAMHy0fPE1VLDfu8wrPGg=";
hash = "sha256-Se0f5jfYBmvemrYRKduDr1yT3fB2wfQP1fDpa/qrYlI=";
};

cargoHash = "sha256-yf0hISz/jHtrO1clTSIKfxFiwI+W0Mu3mY+XW6+ynJU=";
patches = [
# apply patches to fix failing tests <https://github.com/josueBarretogit/manga-tui/pull/56>
(fetchpatch {
url = "https://github.com/josueBarretogit/manga-tui/commit/131a5208e6a3d74a9ad852baab75334e4a1ebf34.patch";
hash = "sha256-RIliZcaRVUOb33Cl+uBkMH4b34S1JpvnPGv+QCFQZ58=";
})
./0001-fix-remove-flaky-test.patch
];

cargoHash = "sha256-IufJPCvUEWR5p4PrFlaiQPW9wyIFj/Pd/JHki69L6Es=";

nativeBuildInputs = [ pkg-config ];

Expand Down

0 comments on commit 7df9ecf

Please sign in to comment.