From 9078f39f81fe388b0152e56c5cebaa7ff858e5d6 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Sat, 14 Jan 2023 16:08:27 -0800 Subject: [PATCH] bandcamp e2e test --- .github/workflows/ci.yaml | 35 ++- tests/e2e/bandcamp/test_bandcamp.py | 5 +- .../bandcamp/test_artist_url.json | 41 ++-- .../bandcamp/test_artist_url.txt | 228 +++++------------- 4 files changed, 108 insertions(+), 201 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2125228f..00d2db55 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -102,11 +102,33 @@ jobs: source /opt/env/bin/activate coverage run -m pytest tests/e2e/soundcloud && coverage xml -o /opt/coverage/soundcloud/coverage.xml + test-bandcamp: + runs-on: ubuntu-22.04 + needs: test-build + permissions: + contents: read + + steps: + - uses: actions/checkout@v3 + + - name: Restore Python build cache + uses: actions/cache@v3 + with: + path: /opt/env + key: ${{github.sha}}-env + + - name: Run e2e soundcloud tests with coverage + run: | + sudo apt-get update + sudo apt-get install -y ffmpeg + source /opt/env/bin/activate + coverage run -m pytest tests/e2e/bandcamp && coverage xml -o /opt/coverage/bandcamp/coverage.xml + - name: Save coverage uses: actions/cache@v3 with: - path: /opt/coverage/soundcloud - key: ${{github.sha}}-coverage-soundcloud + path: /opt/coverage/bandcamp + key: ${{github.sha}}-coverage-bandcamp test-youtube: runs-on: ubuntu-22.04 @@ -169,6 +191,7 @@ jobs: needs: [ test-unit, test-soundcloud, + test-bandcamp, test-youtube, test-plugins ] @@ -188,6 +211,12 @@ jobs: path: /opt/coverage/soundcloud key: ${{github.sha}}-coverage-soundcloud + - name: Restore bandcamp test coverage + uses: actions/cache@v3 + with: + path: /opt/coverage/bandcamp + key: ${{github.sha}}-coverage-bandcamp + - name: Restore youtube test coverage uses: actions/cache@v3 with: @@ -204,4 +233,4 @@ jobs: uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} - files: /opt/coverage/unit/coverage.xml,/opt/coverage/soundcloud/coverage.xml,/opt/coverage/youtube/coverage.xml,/opt/coverage/plugins/coverage.xml \ No newline at end of file + files: /opt/coverage/unit/coverage.xml,/opt/coverage/soundcloud/coverage.xml,/opt/coverage/bandcamp/coverage.xml,/opt/coverage/youtube/coverage.xml,/opt/coverage/plugins/coverage.xml \ No newline at end of file diff --git a/tests/e2e/bandcamp/test_bandcamp.py b/tests/e2e/bandcamp/test_bandcamp.py index 32f96511..efb069e1 100644 --- a/tests/e2e/bandcamp/test_bandcamp.py +++ b/tests/e2e/bandcamp/test_bandcamp.py @@ -9,9 +9,6 @@ from ytdl_sub.subscriptions.subscription import Subscription def subscription_dict(output_directory): return { "preset": "albums_from_playlists", - "ytdl_options": { - "max_downloads": 20, - }, "regex": { "skip_if_match_fails": False, # Error if regex match fails "from": { @@ -25,7 +22,7 @@ def subscription_dict(output_directory): }, }, "overrides": { - "url": "https://funkypselicave.bandcamp.com/", + "url": "https://funkypselicave.bandcamp.com/album/perspectives", "track_title": "{captured_track_title}", "track_artist": "{captured_track_artist}", "music_directory": output_directory, diff --git a/tests/resources/expected_downloads_summaries/bandcamp/test_artist_url.json b/tests/resources/expected_downloads_summaries/bandcamp/test_artist_url.json index b4dcbc9b..f13f1486 100644 --- a/tests/resources/expected_downloads_summaries/bandcamp/test_artist_url.json +++ b/tests/resources/expected_downloads_summaries/bandcamp/test_artist_url.json @@ -1,29 +1,16 @@ { - ".ytdl-sub-jb-download-archive.json": "bf8e8d45a64b100a02bb6b7a3589ae5a", - "El Jazzy Chavo/[2022] S950 Funk/01 - Spark it.mp3": "6f21b6f977609382fa9b9fa9817b28cc", - "El Jazzy Chavo/[2022] S950 Funk/02 - Astronomikal Funk.mp3": "870199f5e75ea170051122f7220e2f42", - "El Jazzy Chavo/[2022] S950 Funk/03 - Impulse.mp3": "3a14e5e034016ad131186caf94be00da", - "El Jazzy Chavo/[2022] S950 Funk/04 - September.mp3": "c58520ef3f7f8944151ee0fb95fb0ac5", - "El Jazzy Chavo/[2022] S950 Funk/05 - Interlune.mp3": "5a7365a253ac4a5af54e550508a40b66", - "El Jazzy Chavo/[2022] S950 Funk/06 - Ninjutsu Techniques.mp3": "07b3f74ef78cb0c869c86dded054b1e9", - "El Jazzy Chavo/[2022] S950 Funk/07 - Space Funk Flow.mp3": "fef74e222258c4845e8b51e05acd240f", - "El Jazzy Chavo/[2022] S950 Funk/08 - Cellar Groove.mp3": "743927c47df60e811d367f5ef969faaf", - "El Jazzy Chavo/[2022] S950 Funk/09 - Solar Wind.mp3": "dd97643e3dc5decefb543da3a6e31356", - "El Jazzy Chavo/[2022] S950 Funk/10 - Interlune II.mp3": "37717cbd8f837657047616743937595b", - "El Jazzy Chavo/[2022] S950 Funk/11 - Ghetto Anthem.mp3": "54089f39836d469f391f6850926a392d", - "El Jazzy Chavo/[2022] S950 Funk/12 - Street Degree.mp3": "ddd3dc74d9bc07b988e4e4da363624dd", - "El Jazzy Chavo/[2022] S950 Funk/13 - Trouble World.mp3": "90dacf561b52852312f9e3f06084bfca", - "El Jazzy Chavo/[2022] S950 Funk/14 - Relaxation.mp3": "12dc503e0f758ae0b962e941727f272b", - "El Jazzy Chavo/[2022] S950 Funk/15 - Journey From Within.mp3": "c593e610ac6853b3795781b6650fc59e", - "El Jazzy Chavo/[2022] S950 Funk/folder.jpg": "62e51365dd309e76a6323f927f6fcc94", - "Various Artists - Dooku/[2021] Jingles From The Slums/05 - Paradise Nebula.mp3": "c3fa57885d90a7de974f310f2bcf8e9d", - "Various Artists - Dooku/[2021] Jingles From The Slums/folder.jpg": "82dace520cccdbca4bc52b9ebfef918c", - "Various Artists - El Jazzy Chavo/[2021] Jingles From The Slums/03 - Map of your Hands.mp3": "912fc0a9465f4080e7d021a2badec07a", - "Various Artists - El Jazzy Chavo/[2021] Jingles From The Slums/folder.jpg": "cd5f8ba637098122c9ef5fe3852acd05", - "Various Artists - Flux The Cynic/[2021] Jingles From The Slums/04 - Seasons Change.mp3": "bb2e7f44a2b5295a4609b2d060ef0a5f", - "Various Artists - Flux The Cynic/[2021] Jingles From The Slums/folder.jpg": "c815d21326fe31c79494c2cafb1ec611", - "Various Artists - Junk33/[2021] Jingles From The Slums/01 - Brown Sugar.mp3": "bdd0be92dd3cfe5b7aae96943b19c3a8", - "Various Artists - Junk33/[2021] Jingles From The Slums/folder.jpg": "d8c7f323c415b134c183b8f8b1def9f1", - "Various Artists - Nigma/[2021] Jingles From The Slums/02 - Shine.mp3": "d7a9bf6436326ca658909319c4d62fb7", - "Various Artists - Nigma/[2021] Jingles From The Slums/folder.jpg": "303b7b90ade53a00f11f89b442b3207a" + ".ytdl-sub-jb-download-archive.json": "c066f1060f789b37dea031b883966ecd", + "El Jazzy Chavo/[2020] Perspectives/01 - Drizzling rain.mp3": "7efb83a640333ad3e6265d7f1efac3c6", + "El Jazzy Chavo/[2020] Perspectives/02 - Hallucinations.mp3": "032fb91c31b2f29d2f49d6bd08043cc6", + "El Jazzy Chavo/[2020] Perspectives/03 - Lungs.mp3": "430d400e5a018a431039eabe406b68d6", + "El Jazzy Chavo/[2020] Perspectives/04 - Insects.mp3": "1a9c336832f8888a2797588ddce2c486", + "El Jazzy Chavo/[2020] Perspectives/05 - Midas touch.mp3": "0f03f09a7a1aa7dfb5b857bf94dceefb", + "El Jazzy Chavo/[2020] Perspectives/06 - Underwater sunbeams.mp3": "dde63d82a5e1d5df0e51be07a6a82e33", + "El Jazzy Chavo/[2020] Perspectives/07 - Omniverse.mp3": "6ccd6fe339cfc001f4851afe40ddfb17", + "El Jazzy Chavo/[2020] Perspectives/08 - Side effect.mp3": "28dda2e532511c5adbb0a91741fddab9", + "El Jazzy Chavo/[2020] Perspectives/09 - Seagulls of Dystopia.mp3": "942aad6fe44461c1a9ad4b221cdead1d", + "El Jazzy Chavo/[2020] Perspectives/10 - Dream book.mp3": "521b5b5a73b9b1aa69805af61a6014c1", + "El Jazzy Chavo/[2020] Perspectives/11 - Triopetra.mp3": "f3712d04e488f237fb9724935da49a13", + "El Jazzy Chavo/[2020] Perspectives/12 - One moment before afterlife.mp3": "48a85a575247272df0990197ecf6c77b", + "El Jazzy Chavo/[2020] Perspectives/folder.jpg": "9f2ea414bb18b90d895e334b9aa21f0e" } \ No newline at end of file diff --git a/tests/resources/transaction_log_summaries/bandcamp/test_artist_url.txt b/tests/resources/transaction_log_summaries/bandcamp/test_artist_url.txt index d9276a02..ba4266d2 100644 --- a/tests/resources/transaction_log_summaries/bandcamp/test_artist_url.txt +++ b/tests/resources/transaction_log_summaries/bandcamp/test_artist_url.txt @@ -2,255 +2,149 @@ Files created: ---------------------------------------- {output_directory} .ytdl-sub-jb-download-archive.json -{output_directory}/El Jazzy Chavo/[2022] S950 Funk - 01 - Spark it.mp3 +{output_directory}/El Jazzy Chavo/[2020] Perspectives + 01 - Drizzling rain.mp3 Music Tags: - album: S950 Funk + album: Perspectives albumartist: El Jazzy Chavo albumartists: El Jazzy Chavo artist: El Jazzy Chavo artists: El Jazzy Chavo genre: Unset - title: Spark it + title: Drizzling rain track: 1 - tracktotal: 15 - year: 2022 - 02 - Astronomikal Funk.mp3 + tracktotal: 12 + year: 2020 + 02 - Hallucinations.mp3 Music Tags: - album: S950 Funk + album: Perspectives albumartist: El Jazzy Chavo albumartists: El Jazzy Chavo artist: El Jazzy Chavo artists: El Jazzy Chavo genre: Unset - title: Astronomikal Funk + title: Hallucinations track: 2 - tracktotal: 15 - year: 2022 - 03 - Impulse.mp3 + tracktotal: 12 + year: 2020 + 03 - Lungs.mp3 Music Tags: - album: S950 Funk + album: Perspectives albumartist: El Jazzy Chavo albumartists: El Jazzy Chavo artist: El Jazzy Chavo artists: El Jazzy Chavo genre: Unset - title: Impulse + title: Lungs track: 3 - tracktotal: 15 - year: 2022 - 04 - September.mp3 + tracktotal: 12 + year: 2020 + 04 - Insects.mp3 Music Tags: - album: S950 Funk + album: Perspectives albumartist: El Jazzy Chavo albumartists: El Jazzy Chavo artist: El Jazzy Chavo artists: El Jazzy Chavo genre: Unset - title: September + title: Insects track: 4 - tracktotal: 15 - year: 2022 - 05 - Interlune.mp3 + tracktotal: 12 + year: 2020 + 05 - Midas touch.mp3 Music Tags: - album: S950 Funk + album: Perspectives albumartist: El Jazzy Chavo albumartists: El Jazzy Chavo artist: El Jazzy Chavo artists: El Jazzy Chavo genre: Unset - title: Interlune + title: Midas touch track: 5 - tracktotal: 15 - year: 2022 - 06 - Ninjutsu Techniques.mp3 + tracktotal: 12 + year: 2020 + 06 - Underwater sunbeams.mp3 Music Tags: - album: S950 Funk + album: Perspectives albumartist: El Jazzy Chavo albumartists: El Jazzy Chavo artist: El Jazzy Chavo artists: El Jazzy Chavo genre: Unset - title: Ninjutsu Techniques + title: Underwater sunbeams track: 6 - tracktotal: 15 - year: 2022 - 07 - Space Funk Flow.mp3 + tracktotal: 12 + year: 2020 + 07 - Omniverse.mp3 Music Tags: - album: S950 Funk + album: Perspectives albumartist: El Jazzy Chavo albumartists: El Jazzy Chavo artist: El Jazzy Chavo artists: El Jazzy Chavo genre: Unset - title: Space Funk Flow + title: Omniverse track: 7 - tracktotal: 15 - year: 2022 - 08 - Cellar Groove.mp3 + tracktotal: 12 + year: 2020 + 08 - Side effect.mp3 Music Tags: - album: S950 Funk + album: Perspectives albumartist: El Jazzy Chavo albumartists: El Jazzy Chavo artist: El Jazzy Chavo artists: El Jazzy Chavo genre: Unset - title: Cellar Groove + title: Side effect track: 8 - tracktotal: 15 - year: 2022 - 09 - Solar Wind.mp3 + tracktotal: 12 + year: 2020 + 09 - Seagulls of Dystopia.mp3 Music Tags: - album: S950 Funk + album: Perspectives albumartist: El Jazzy Chavo albumartists: El Jazzy Chavo artist: El Jazzy Chavo artists: El Jazzy Chavo genre: Unset - title: Solar Wind + title: Seagulls of Dystopia track: 9 - tracktotal: 15 - year: 2022 - 10 - Interlune II.mp3 + tracktotal: 12 + year: 2020 + 10 - Dream book.mp3 Music Tags: - album: S950 Funk + album: Perspectives albumartist: El Jazzy Chavo albumartists: El Jazzy Chavo artist: El Jazzy Chavo artists: El Jazzy Chavo genre: Unset - title: Interlune II + title: Dream book track: 10 - tracktotal: 15 - year: 2022 - 11 - Ghetto Anthem.mp3 + tracktotal: 12 + year: 2020 + 11 - Triopetra.mp3 Music Tags: - album: S950 Funk + album: Perspectives albumartist: El Jazzy Chavo albumartists: El Jazzy Chavo artist: El Jazzy Chavo artists: El Jazzy Chavo genre: Unset - title: Ghetto Anthem + title: Triopetra track: 11 - tracktotal: 15 - year: 2022 - 12 - Street Degree.mp3 + tracktotal: 12 + year: 2020 + 12 - One moment before afterlife.mp3 Music Tags: - album: S950 Funk + album: Perspectives albumartist: El Jazzy Chavo albumartists: El Jazzy Chavo artist: El Jazzy Chavo artists: El Jazzy Chavo genre: Unset - title: Street Degree + title: One moment before afterlife track: 12 - tracktotal: 15 - year: 2022 - 13 - Trouble World.mp3 - Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Trouble World - track: 13 - tracktotal: 15 - year: 2022 - 14 - Relaxation.mp3 - Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Relaxation - track: 14 - tracktotal: 15 - year: 2022 - 15 - Journey From Within.mp3 - Music Tags: - album: S950 Funk - albumartist: El Jazzy Chavo - albumartists: El Jazzy Chavo - artist: El Jazzy Chavo - artists: El Jazzy Chavo - genre: Unset - title: Journey From Within - track: 15 - tracktotal: 15 - year: 2022 - folder.jpg -{output_directory}/Various Artists - Dooku/[2021] Jingles From The Slums - 05 - Paradise Nebula.mp3 - Music Tags: - album: Jingles From The Slums - albumartist: Various Artists - Dooku - albumartists: Various Artists - Dooku - artist: Various Artists - Dooku - artists: Various Artists - Dooku - genre: Unset - title: Paradise Nebula - track: 5 - tracktotal: 14 - year: 2021 - folder.jpg -{output_directory}/Various Artists - El Jazzy Chavo/[2021] Jingles From The Slums - 03 - Map of your Hands.mp3 - Music Tags: - album: Jingles From The Slums - albumartist: Various Artists - El Jazzy Chavo - albumartists: Various Artists - El Jazzy Chavo - artist: Various Artists - El Jazzy Chavo - artists: Various Artists - El Jazzy Chavo - genre: Unset - title: Map of your Hands - track: 3 - tracktotal: 14 - year: 2021 - folder.jpg -{output_directory}/Various Artists - Flux The Cynic/[2021] Jingles From The Slums - 04 - Seasons Change.mp3 - Music Tags: - album: Jingles From The Slums - albumartist: Various Artists - Flux The Cynic - albumartists: Various Artists - Flux The Cynic - artist: Various Artists - Flux The Cynic - artists: Various Artists - Flux The Cynic - genre: Unset - title: Seasons Change - track: 4 - tracktotal: 14 - year: 2021 - folder.jpg -{output_directory}/Various Artists - Junk33/[2021] Jingles From The Slums - 01 - Brown Sugar.mp3 - Music Tags: - album: Jingles From The Slums - albumartist: Various Artists - Junk33 - albumartists: Various Artists - Junk33 - artist: Various Artists - Junk33 - artists: Various Artists - Junk33 - genre: Unset - title: Brown Sugar - track: 1 - tracktotal: 14 - year: 2021 - folder.jpg -{output_directory}/Various Artists - Nigma/[2021] Jingles From The Slums - 02 - Shine.mp3 - Music Tags: - album: Jingles From The Slums - albumartist: Various Artists - Nigma - albumartists: Various Artists - Nigma - artist: Various Artists - Nigma - artists: Various Artists - Nigma - genre: Unset - title: Shine - track: 2 - tracktotal: 14 - year: 2021 + tracktotal: 12 + year: 2020 folder.jpg \ No newline at end of file