diff --git a/.VSCodeCounter/2022-11-30_09-03-29/details.md b/.VSCodeCounter/2022-11-30_09-03-29/details.md index 8172205..8ea1900 100644 --- a/.VSCodeCounter/2022-11-30_09-03-29/details.md +++ b/.VSCodeCounter/2022-11-30_09-03-29/details.md @@ -15,14 +15,14 @@ Total : 39 files, 1860 codes, 393 comments, 612 blanks, all 2865 lines | [src/goof.py](/src/goof.py) | Python | 14 | 0 | 4 | 18 | | [src/music_kraken/__init__.py](/src/music_kraken/__init__.py) | Python | 114 | 30 | 48 | 192 | | [src/music_kraken/__main__.py](/src/music_kraken/__main__.py) | Python | 3 | 2 | 3 | 8 | -| [src/music_kraken/audio_source/__init__.py](/src/music_kraken/audio_source/__init__.py) | Python | 10 | 0 | 5 | 15 | -| [src/music_kraken/audio_source/fetch_audio.py](/src/music_kraken/audio_source/fetch_audio.py) | Python | 75 | 12 | 20 | 107 | -| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/audio_source/fetch_source.py) | Python | 54 | 1 | 17 | 72 | -| [src/music_kraken/audio_source/sources/__init__.py](/src/music_kraken/audio_source/sources/__init__.py) | Python | 0 | 0 | 1 | 1 | -| [src/music_kraken/audio_source/sources/local_files.py](/src/music_kraken/audio_source/sources/local_files.py) | Python | 40 | 0 | 18 | 58 | -| [src/music_kraken/audio_source/sources/musify.py](/src/music_kraken/audio_source/sources/musify.py) | Python | 136 | 9 | 37 | 182 | -| [src/music_kraken/audio_source/sources/source.py](/src/music_kraken/audio_source/sources/source.py) | Python | 11 | 5 | 8 | 24 | -| [src/music_kraken/audio_source/sources/youtube.py](/src/music_kraken/audio_source/sources/youtube.py) | Python | 71 | 4 | 24 | 99 | +| [src/music_kraken/audio_source/__init__.py](/src/music_kraken/not_used_anymore/__init__.py) | Python | 10 | 0 | 5 | 15 | +| [src/music_kraken/audio_source/fetch_audio.py](/src/music_kraken/not_used_anymore/fetch_audio.py) | Python | 75 | 12 | 20 | 107 | +| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/not_used_anymore/fetch_source.py) | Python | 54 | 1 | 17 | 72 | +| [src/music_kraken/audio_source/sources/__init__.py](/src/music_kraken/not_used_anymore/sources/__init__.py) | Python | 0 | 0 | 1 | 1 | +| [src/music_kraken/audio_source/sources/local_files.py](/src/music_kraken/not_used_anymore/sources/local_files.py) | Python | 40 | 0 | 18 | 58 | +| [src/music_kraken/audio_source/sources/musify.py](/src/music_kraken/not_used_anymore/sources/musify.py) | Python | 136 | 9 | 37 | 182 | +| [src/music_kraken/audio_source/sources/source.py](/src/music_kraken/not_used_anymore/sources/source.py) | Python | 11 | 5 | 8 | 24 | +| [src/music_kraken/audio_source/sources/youtube.py](/src/music_kraken/not_used_anymore/sources/youtube.py) | Python | 71 | 4 | 24 | 99 | | [src/music_kraken/database/__init__.py](/src/music_kraken/database/__init__.py) | Python | 15 | 0 | 3 | 18 | | [src/music_kraken/database/artist.py](/src/music_kraken/database/artist.py) | Python | 11 | 0 | 5 | 16 | | [src/music_kraken/database/database.py](/src/music_kraken/database/database.py) | Python | 166 | 80 | 41 | 287 | @@ -32,11 +32,11 @@ Total : 39 files, 1860 codes, 393 comments, 612 blanks, all 2865 lines | [src/music_kraken/database/target.py](/src/music_kraken/database/target.py) | Python | 22 | 0 | 9 | 31 | | [src/music_kraken/database/temp_database.py](/src/music_kraken/database/temp_database.py) | Python | 10 | 0 | 7 | 17 | | [src/music_kraken/lyrics/__init__.py](/src/music_kraken/lyrics/__init__.py) | Python | 0 | 0 | 1 | 1 | -| [src/music_kraken/lyrics/genius.py](/src/music_kraken/lyrics/genius.py) | Python | 115 | 16 | 42 | 173 | +| [src/music_kraken/lyrics/genius.py](/src/music_kraken/not_used_anymore/sources/genius.py) | Python | 115 | 16 | 42 | 173 | | [src/music_kraken/lyrics/lyrics.py](/src/music_kraken/lyrics/lyrics.py) | Python | 36 | 25 | 20 | 81 | -| [src/music_kraken/metadata/__init__.py](/src/music_kraken/metadata/__init__.py) | Python | 6 | 0 | 2 | 8 | -| [src/music_kraken/metadata/metadata_fetch.py](/src/music_kraken/metadata/metadata_fetch.py) | Python | 257 | 24 | 65 | 346 | -| [src/music_kraken/metadata/metadata_search.py](/src/music_kraken/metadata/metadata_search.py) | Python | 253 | 40 | 72 | 365 | +| [src/music_kraken/metadata/__init__.py](/src/music_kraken/not_used_anymore/metadata/__init__.py) | Python | 6 | 0 | 2 | 8 | +| [src/music_kraken/metadata/metadata_fetch.py](/src/music_kraken/not_used_anymore/metadata/metadata_fetch.py) | Python | 257 | 24 | 65 | 346 | +| [src/music_kraken/metadata/metadata_search.py](/src/music_kraken/not_used_anymore/metadata/metadata_search.py) | Python | 253 | 40 | 72 | 365 | | [src/music_kraken/static_files/temp_database_structure.sql](/src/music_kraken/static_files/temp_database_structure.sql) | SQLite | 61 | 0 | 7 | 68 | | [src/music_kraken/tagging/__init__.py](/src/music_kraken/tagging/__init__.py) | Python | 0 | 0 | 1 | 1 | | [src/music_kraken/tagging/song.py](/src/music_kraken/tagging/song.py) | Python | 3 | 0 | 1 | 4 | diff --git a/.VSCodeCounter/2022-11-30_09-03-29/diff-details.md b/.VSCodeCounter/2022-11-30_09-03-29/diff-details.md index 8701c2f..c7ce0a5 100644 --- a/.VSCodeCounter/2022-11-30_09-03-29/diff-details.md +++ b/.VSCodeCounter/2022-11-30_09-03-29/diff-details.md @@ -15,11 +15,11 @@ Total : 26 files, 206 codes, 79 comments, 81 blanks, all 366 lines | [src/goof.py](/src/goof.py) | Python | 14 | 0 | 4 | 18 | | [src/music_kraken/__init__.py](/src/music_kraken/__init__.py) | Python | 23 | 16 | 20 | 59 | | [src/music_kraken/__main__.py](/src/music_kraken/__main__.py) | Python | -1 | -1 | 0 | -2 | -| [src/music_kraken/audio_source/__init__.py](/src/music_kraken/audio_source/__init__.py) | Python | 10 | 0 | 4 | 14 | -| [src/music_kraken/audio_source/fetch_audio.py](/src/music_kraken/audio_source/fetch_audio.py) | Python | 11 | -9 | 0 | 2 | -| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/audio_source/fetch_source.py) | Python | 18 | -27 | 1 | -8 | -| [src/music_kraken/audio_source/sources/musify.py](/src/music_kraken/audio_source/sources/musify.py) | Python | 6 | 0 | 0 | 6 | -| [src/music_kraken/audio_source/sources/youtube.py](/src/music_kraken/audio_source/sources/youtube.py) | Python | 6 | -2 | 2 | 6 | +| [src/music_kraken/audio_source/__init__.py](/src/music_kraken/not_used_anymore/__init__.py) | Python | 10 | 0 | 4 | 14 | +| [src/music_kraken/audio_source/fetch_audio.py](/src/music_kraken/not_used_anymore/fetch_audio.py) | Python | 11 | -9 | 0 | 2 | +| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/not_used_anymore/fetch_source.py) | Python | 18 | -27 | 1 | -8 | +| [src/music_kraken/audio_source/sources/musify.py](/src/music_kraken/not_used_anymore/sources/musify.py) | Python | 6 | 0 | 0 | 6 | +| [src/music_kraken/audio_source/sources/youtube.py](/src/music_kraken/not_used_anymore/sources/youtube.py) | Python | 6 | -2 | 2 | 6 | | [src/music_kraken/database/__init__.py](/src/music_kraken/database/__init__.py) | Python | 15 | 0 | 3 | 18 | | [src/music_kraken/database/artist.py](/src/music_kraken/database/artist.py) | Python | 11 | 0 | 5 | 16 | | [src/music_kraken/database/database.py](/src/music_kraken/database/database.py) | Python | 3 | 0 | 0 | 3 | @@ -28,10 +28,10 @@ Total : 26 files, 206 codes, 79 comments, 81 blanks, all 366 lines | [src/music_kraken/database/source.py](/src/music_kraken/database/source.py) | Python | 5 | 0 | 2 | 7 | | [src/music_kraken/database/target.py](/src/music_kraken/database/target.py) | Python | 22 | 0 | 9 | 31 | | [src/music_kraken/database/temp_database.py](/src/music_kraken/database/temp_database.py) | Python | -1 | 0 | 2 | 1 | -| [src/music_kraken/lyrics/genius.py](/src/music_kraken/lyrics/genius.py) | Python | 16 | -22 | 7 | 1 | +| [src/music_kraken/lyrics/genius.py](/src/music_kraken/not_used_anymore/sources/genius.py) | Python | 16 | -22 | 7 | 1 | | [src/music_kraken/lyrics/lyrics.py](/src/music_kraken/lyrics/lyrics.py) | Python | -14 | 6 | -6 | -14 | -| [src/music_kraken/metadata/__init__.py](/src/music_kraken/metadata/__init__.py) | Python | 6 | 0 | 1 | 7 | -| [src/music_kraken/metadata/metadata_fetch.py](/src/music_kraken/metadata/metadata_fetch.py) | Python | 2 | 0 | 1 | 3 | +| [src/music_kraken/metadata/__init__.py](/src/music_kraken/not_used_anymore/metadata/__init__.py) | Python | 6 | 0 | 1 | 7 | +| [src/music_kraken/metadata/metadata_fetch.py](/src/music_kraken/not_used_anymore/metadata/metadata_fetch.py) | Python | 2 | 0 | 1 | 3 | | [src/music_kraken/static_files/temp_database_structure.sql](/src/music_kraken/static_files/temp_database_structure.sql) | SQLite | 61 | 0 | 7 | 68 | | [src/music_kraken/target/__init__.py](/src/music_kraken/target/__init__.py) | Python | 4 | 0 | 1 | 5 | | [src/music_kraken/utils/phonetic_compares.py](/src/music_kraken/utils/phonetic_compares.py) | Python | 5 | 2 | 2 | 9 | diff --git a/.VSCodeCounter/2022-12-07_13-25-59/details.md b/.VSCodeCounter/2022-12-07_13-25-59/details.md index 7952447..52333da 100644 --- a/.VSCodeCounter/2022-12-07_13-25-59/details.md +++ b/.VSCodeCounter/2022-12-07_13-25-59/details.md @@ -15,14 +15,14 @@ Total : 43 files, 2560 codes, 558 comments, 774 blanks, all 3892 lines | [src/goof.py](/src/goof.py) | Python | 44 | 5 | 12 | 61 | | [src/music_kraken/__init__.py](/src/music_kraken/__init__.py) | Python | 117 | 32 | 48 | 197 | | [src/music_kraken/__main__.py](/src/music_kraken/__main__.py) | Python | 3 | 2 | 3 | 8 | -| [src/music_kraken/audio_source/__init__.py](/src/music_kraken/audio_source/__init__.py) | Python | 10 | 0 | 5 | 15 | -| [src/music_kraken/audio_source/fetch_audio.py](/src/music_kraken/audio_source/fetch_audio.py) | Python | 75 | 12 | 20 | 107 | -| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/audio_source/fetch_source.py) | Python | 54 | 1 | 16 | 71 | -| [src/music_kraken/audio_source/sources/__init__.py](/src/music_kraken/audio_source/sources/__init__.py) | Python | 0 | 0 | 1 | 1 | -| [src/music_kraken/audio_source/sources/local_files.py](/src/music_kraken/audio_source/sources/local_files.py) | Python | 40 | 0 | 18 | 58 | -| [src/music_kraken/audio_source/sources/musify.py](/src/music_kraken/audio_source/sources/musify.py) | Python | 136 | 9 | 37 | 182 | -| [src/music_kraken/audio_source/sources/source.py](/src/music_kraken/audio_source/sources/source.py) | Python | 11 | 5 | 8 | 24 | -| [src/music_kraken/audio_source/sources/youtube.py](/src/music_kraken/audio_source/sources/youtube.py) | Python | 71 | 4 | 24 | 99 | +| [src/music_kraken/audio_source/__init__.py](/src/music_kraken/not_used_anymore/__init__.py) | Python | 10 | 0 | 5 | 15 | +| [src/music_kraken/audio_source/fetch_audio.py](/src/music_kraken/not_used_anymore/fetch_audio.py) | Python | 75 | 12 | 20 | 107 | +| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/not_used_anymore/fetch_source.py) | Python | 54 | 1 | 16 | 71 | +| [src/music_kraken/audio_source/sources/__init__.py](/src/music_kraken/not_used_anymore/sources/__init__.py) | Python | 0 | 0 | 1 | 1 | +| [src/music_kraken/audio_source/sources/local_files.py](/src/music_kraken/not_used_anymore/sources/local_files.py) | Python | 40 | 0 | 18 | 58 | +| [src/music_kraken/audio_source/sources/musify.py](/src/music_kraken/not_used_anymore/sources/musify.py) | Python | 136 | 9 | 37 | 182 | +| [src/music_kraken/audio_source/sources/source.py](/src/music_kraken/not_used_anymore/sources/source.py) | Python | 11 | 5 | 8 | 24 | +| [src/music_kraken/audio_source/sources/youtube.py](/src/music_kraken/not_used_anymore/sources/youtube.py) | Python | 71 | 4 | 24 | 99 | | [src/music_kraken/database/__init__.py](/src/music_kraken/database/__init__.py) | Python | 11 | 1 | 4 | 16 | | [src/music_kraken/database/database.py](/src/music_kraken/database/database.py) | Python | 191 | 102 | 45 | 338 | | [src/music_kraken/database/get_song.py](/src/music_kraken/database/get_song.py) | Python | 40 | 5 | 11 | 56 | @@ -34,11 +34,11 @@ Total : 43 files, 2560 codes, 558 comments, 774 blanks, all 3892 lines | [src/music_kraken/database/song.py](/src/music_kraken/database/song.py) | Python | 125 | 20 | 45 | 190 | | [src/music_kraken/database/temp_database.py](/src/music_kraken/database/temp_database.py) | Python | 10 | 0 | 7 | 17 | | [src/music_kraken/lyrics/__init__.py](/src/music_kraken/lyrics/__init__.py) | Python | 0 | 0 | 1 | 1 | -| [src/music_kraken/lyrics/genius.py](/src/music_kraken/lyrics/genius.py) | Python | 115 | 16 | 42 | 173 | +| [src/music_kraken/lyrics/genius.py](/src/music_kraken/not_used_anymore/sources/genius.py) | Python | 115 | 16 | 42 | 173 | | [src/music_kraken/lyrics/lyrics.py](/src/music_kraken/lyrics/lyrics.py) | Python | 36 | 25 | 20 | 81 | -| [src/music_kraken/metadata/__init__.py](/src/music_kraken/metadata/__init__.py) | Python | 6 | 0 | 2 | 8 | -| [src/music_kraken/metadata/metadata_fetch.py](/src/music_kraken/metadata/metadata_fetch.py) | Python | 257 | 24 | 65 | 346 | -| [src/music_kraken/metadata/metadata_search.py](/src/music_kraken/metadata/metadata_search.py) | Python | 253 | 40 | 72 | 365 | +| [src/music_kraken/metadata/__init__.py](/src/music_kraken/not_used_anymore/metadata/__init__.py) | Python | 6 | 0 | 2 | 8 | +| [src/music_kraken/metadata/metadata_fetch.py](/src/music_kraken/not_used_anymore/metadata/metadata_fetch.py) | Python | 257 | 24 | 65 | 346 | +| [src/music_kraken/metadata/metadata_search.py](/src/music_kraken/not_used_anymore/metadata/metadata_search.py) | Python | 253 | 40 | 72 | 365 | | [src/music_kraken/static_files/new_db.sql](/src/music_kraken/static_files/new_db.sql) | SQLite | 66 | 0 | 10 | 76 | | [src/music_kraken/static_files/temp_database_structure.sql](/src/music_kraken/static_files/temp_database_structure.sql) | SQLite | 135 | 0 | 10 | 145 | | [src/music_kraken/tagging/__init__.py](/src/music_kraken/tagging/__init__.py) | Python | 0 | 0 | 1 | 1 | diff --git a/.VSCodeCounter/2022-12-07_13-25-59/diff-details.md b/.VSCodeCounter/2022-12-07_13-25-59/diff-details.md index 3899e7a..c430920 100644 --- a/.VSCodeCounter/2022-12-07_13-25-59/diff-details.md +++ b/.VSCodeCounter/2022-12-07_13-25-59/diff-details.md @@ -13,7 +13,7 @@ Total : 20 files, 700 codes, 165 comments, 162 blanks, all 1027 lines | :--- | :--- | ---: | ---: | ---: | ---: | | [src/goof.py](/src/goof.py) | Python | 30 | 5 | 8 | 43 | | [src/music_kraken/__init__.py](/src/music_kraken/__init__.py) | Python | 3 | 2 | 0 | 5 | -| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/audio_source/fetch_source.py) | Python | 0 | 0 | -1 | -1 | +| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/not_used_anymore/fetch_source.py) | Python | 0 | 0 | -1 | -1 | | [src/music_kraken/database/__init__.py](/src/music_kraken/database/__init__.py) | Python | -4 | 1 | 1 | -2 | | [src/music_kraken/database/artist.py](/src/music_kraken/database/artist.py) | Python | -11 | 0 | -5 | -16 | | [src/music_kraken/database/database.py](/src/music_kraken/database/database.py) | Python | 25 | 22 | 4 | 51 | diff --git a/.VSCodeCounter/2022-12-13_13-57-09/details.md b/.VSCodeCounter/2022-12-13_13-57-09/details.md index 445f8ba..e093dc8 100644 --- a/.VSCodeCounter/2022-12-13_13-57-09/details.md +++ b/.VSCodeCounter/2022-12-13_13-57-09/details.md @@ -15,14 +15,14 @@ Total : 45 files, 2886 codes, 594 comments, 854 blanks, all 4334 lines | [src/goof.py](/src/goof.py) | Python | 74 | 4 | 19 | 97 | | [src/music_kraken/__init__.py](/src/music_kraken/__init__.py) | Python | 117 | 32 | 48 | 197 | | [src/music_kraken/__main__.py](/src/music_kraken/__main__.py) | Python | 3 | 2 | 3 | 8 | -| [src/music_kraken/audio_source/__init__.py](/src/music_kraken/audio_source/__init__.py) | Python | 10 | 0 | 5 | 15 | -| [src/music_kraken/audio_source/fetch_audio.py](/src/music_kraken/audio_source/fetch_audio.py) | Python | 75 | 12 | 20 | 107 | -| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/audio_source/fetch_source.py) | Python | 54 | 1 | 16 | 71 | -| [src/music_kraken/audio_source/sources/__init__.py](/src/music_kraken/audio_source/sources/__init__.py) | Python | 0 | 0 | 1 | 1 | -| [src/music_kraken/audio_source/sources/local_files.py](/src/music_kraken/audio_source/sources/local_files.py) | Python | 40 | 0 | 18 | 58 | -| [src/music_kraken/audio_source/sources/musify.py](/src/music_kraken/audio_source/sources/musify.py) | Python | 136 | 9 | 37 | 182 | -| [src/music_kraken/audio_source/sources/source.py](/src/music_kraken/audio_source/sources/source.py) | Python | 11 | 5 | 8 | 24 | -| [src/music_kraken/audio_source/sources/youtube.py](/src/music_kraken/audio_source/sources/youtube.py) | Python | 71 | 4 | 24 | 99 | +| [src/music_kraken/audio_source/__init__.py](/src/music_kraken/not_used_anymore/__init__.py) | Python | 10 | 0 | 5 | 15 | +| [src/music_kraken/audio_source/fetch_audio.py](/src/music_kraken/not_used_anymore/fetch_audio.py) | Python | 75 | 12 | 20 | 107 | +| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/not_used_anymore/fetch_source.py) | Python | 54 | 1 | 16 | 71 | +| [src/music_kraken/audio_source/sources/__init__.py](/src/music_kraken/not_used_anymore/sources/__init__.py) | Python | 0 | 0 | 1 | 1 | +| [src/music_kraken/audio_source/sources/local_files.py](/src/music_kraken/not_used_anymore/sources/local_files.py) | Python | 40 | 0 | 18 | 58 | +| [src/music_kraken/audio_source/sources/musify.py](/src/music_kraken/not_used_anymore/sources/musify.py) | Python | 136 | 9 | 37 | 182 | +| [src/music_kraken/audio_source/sources/source.py](/src/music_kraken/not_used_anymore/sources/source.py) | Python | 11 | 5 | 8 | 24 | +| [src/music_kraken/audio_source/sources/youtube.py](/src/music_kraken/not_used_anymore/sources/youtube.py) | Python | 71 | 4 | 24 | 99 | | [src/music_kraken/database/__init__.py](/src/music_kraken/database/__init__.py) | Python | 11 | 1 | 4 | 16 | | [src/music_kraken/database/database.py](/src/music_kraken/database/database.py) | Python | 191 | 102 | 45 | 338 | | [src/music_kraken/database/get_song.py](/src/music_kraken/database/get_song.py) | Python | 40 | 5 | 11 | 56 | @@ -34,13 +34,13 @@ Total : 45 files, 2886 codes, 594 comments, 854 blanks, all 4334 lines | [src/music_kraken/database/song.py](/src/music_kraken/database/song.py) | Python | 125 | 20 | 45 | 190 | | [src/music_kraken/database/temp_database.py](/src/music_kraken/database/temp_database.py) | Python | 12 | 0 | 8 | 20 | | [src/music_kraken/lyrics/__init__.py](/src/music_kraken/lyrics/__init__.py) | Python | 0 | 0 | 1 | 1 | -| [src/music_kraken/lyrics/genius.py](/src/music_kraken/lyrics/genius.py) | Python | 115 | 16 | 42 | 173 | +| [src/music_kraken/lyrics/genius.py](/src/music_kraken/not_used_anymore/sources/genius.py) | Python | 115 | 16 | 42 | 173 | | [src/music_kraken/lyrics/lyrics.py](/src/music_kraken/lyrics/lyrics.py) | Python | 36 | 25 | 20 | 81 | -| [src/music_kraken/metadata/__init__.py](/src/music_kraken/metadata/__init__.py) | Python | 6 | 0 | 2 | 8 | -| [src/music_kraken/metadata/metadata_fetch.py](/src/music_kraken/metadata/metadata_fetch.py) | Python | 257 | 24 | 65 | 346 | -| [src/music_kraken/metadata/metadata_search.py](/src/music_kraken/metadata/metadata_search.py) | Python | 253 | 40 | 72 | 365 | -| [src/music_kraken/metadata/sources/__init__.py](/src/music_kraken/metadata/sources/__init__.py) | Python | 3 | 0 | 2 | 5 | -| [src/music_kraken/metadata/sources/musicbrainz.py](/src/music_kraken/metadata/sources/musicbrainz.py) | Python | 42 | 6 | 9 | 57 | +| [src/music_kraken/metadata/__init__.py](/src/music_kraken/not_used_anymore/metadata/__init__.py) | Python | 6 | 0 | 2 | 8 | +| [src/music_kraken/metadata/metadata_fetch.py](/src/music_kraken/not_used_anymore/metadata/metadata_fetch.py) | Python | 257 | 24 | 65 | 346 | +| [src/music_kraken/metadata/metadata_search.py](/src/music_kraken/not_used_anymore/metadata/metadata_search.py) | Python | 253 | 40 | 72 | 365 | +| [src/music_kraken/metadata/sources/__init__.py](/src/music_kraken/not_used_anymore/metadata/sources/__init__.py) | Python | 3 | 0 | 2 | 5 | +| [src/music_kraken/metadata/sources/musicbrainz.py](/src/music_kraken/not_used_anymore/metadata/sources/musicbrainz.py) | Python | 42 | 6 | 9 | 57 | | [src/music_kraken/static_files/new_db.sql](/src/music_kraken/static_files/new_db.sql) | SQLite | 70 | 0 | 10 | 80 | | [src/music_kraken/static_files/temp_database_structure.sql](/src/music_kraken/static_files/temp_database_structure.sql) | SQLite | 135 | 0 | 10 | 145 | | [src/music_kraken/tagging/__init__.py](/src/music_kraken/tagging/__init__.py) | Python | 0 | 0 | 1 | 1 | diff --git a/.VSCodeCounter/2022-12-13_13-57-09/diff-details.md b/.VSCodeCounter/2022-12-13_13-57-09/diff-details.md index 7447366..acdb891 100644 --- a/.VSCodeCounter/2022-12-13_13-57-09/diff-details.md +++ b/.VSCodeCounter/2022-12-13_13-57-09/diff-details.md @@ -17,8 +17,8 @@ Total : 10 files, 326 codes, 36 comments, 80 blanks, all 442 lines | [src/music_kraken/database/objects/database_object.py](/src/music_kraken/database/objects/database_object.py) | Python | 7 | 2 | 2 | 11 | | [src/music_kraken/database/objects/song.py](/src/music_kraken/database/objects/song.py) | Python | 76 | 9 | 26 | 111 | | [src/music_kraken/database/temp_database.py](/src/music_kraken/database/temp_database.py) | Python | 2 | 0 | 1 | 3 | -| [src/music_kraken/metadata/sources/__init__.py](/src/music_kraken/metadata/sources/__init__.py) | Python | 3 | 0 | 2 | 5 | -| [src/music_kraken/metadata/sources/musicbrainz.py](/src/music_kraken/metadata/sources/musicbrainz.py) | Python | 42 | 6 | 9 | 57 | +| [src/music_kraken/metadata/sources/__init__.py](/src/music_kraken/not_used_anymore/metadata/sources/__init__.py) | Python | 3 | 0 | 2 | 5 | +| [src/music_kraken/metadata/sources/musicbrainz.py](/src/music_kraken/not_used_anymore/metadata/sources/musicbrainz.py) | Python | 42 | 6 | 9 | 57 | | [src/music_kraken/static_files/new_db.sql](/src/music_kraken/static_files/new_db.sql) | SQLite | 4 | 0 | 0 | 4 | | [src/test.db](/src/test.db) | Database | 8 | 0 | 0 | 8 | diff --git a/.VSCodeCounter/2023-01-17_16-43-06/details.md b/.VSCodeCounter/2023-01-17_16-43-06/details.md index 7858b7d..60972ec 100644 --- a/.VSCodeCounter/2023-01-17_16-43-06/details.md +++ b/.VSCodeCounter/2023-01-17_16-43-06/details.md @@ -15,14 +15,14 @@ Total : 49 files, 3402 codes, 663 comments, 973 blanks, all 5038 lines | [src/goof.py](/src/goof.py) | Python | 116 | 6 | 29 | 151 | | [src/music_kraken/__init__.py](/src/music_kraken/__init__.py) | Python | 118 | 32 | 48 | 198 | | [src/music_kraken/__main__.py](/src/music_kraken/__main__.py) | Python | 3 | 2 | 3 | 8 | -| [src/music_kraken/audio_source/__init__.py](/src/music_kraken/audio_source/__init__.py) | Python | 10 | 0 | 5 | 15 | -| [src/music_kraken/audio_source/fetch_audio.py](/src/music_kraken/audio_source/fetch_audio.py) | Python | 75 | 12 | 20 | 107 | -| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/audio_source/fetch_source.py) | Python | 54 | 1 | 16 | 71 | -| [src/music_kraken/audio_source/sources/__init__.py](/src/music_kraken/audio_source/sources/__init__.py) | Python | 0 | 0 | 1 | 1 | -| [src/music_kraken/audio_source/sources/local_files.py](/src/music_kraken/audio_source/sources/local_files.py) | Python | 40 | 0 | 18 | 58 | -| [src/music_kraken/audio_source/sources/musify.py](/src/music_kraken/audio_source/sources/musify.py) | Python | 136 | 9 | 37 | 182 | -| [src/music_kraken/audio_source/sources/source.py](/src/music_kraken/audio_source/sources/source.py) | Python | 11 | 5 | 8 | 24 | -| [src/music_kraken/audio_source/sources/youtube.py](/src/music_kraken/audio_source/sources/youtube.py) | Python | 71 | 4 | 24 | 99 | +| [src/music_kraken/audio_source/__init__.py](/src/music_kraken/not_used_anymore/__init__.py) | Python | 10 | 0 | 5 | 15 | +| [src/music_kraken/audio_source/fetch_audio.py](/src/music_kraken/not_used_anymore/fetch_audio.py) | Python | 75 | 12 | 20 | 107 | +| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/not_used_anymore/fetch_source.py) | Python | 54 | 1 | 16 | 71 | +| [src/music_kraken/audio_source/sources/__init__.py](/src/music_kraken/not_used_anymore/sources/__init__.py) | Python | 0 | 0 | 1 | 1 | +| [src/music_kraken/audio_source/sources/local_files.py](/src/music_kraken/not_used_anymore/sources/local_files.py) | Python | 40 | 0 | 18 | 58 | +| [src/music_kraken/audio_source/sources/musify.py](/src/music_kraken/not_used_anymore/sources/musify.py) | Python | 136 | 9 | 37 | 182 | +| [src/music_kraken/audio_source/sources/source.py](/src/music_kraken/not_used_anymore/sources/source.py) | Python | 11 | 5 | 8 | 24 | +| [src/music_kraken/audio_source/sources/youtube.py](/src/music_kraken/not_used_anymore/sources/youtube.py) | Python | 71 | 4 | 24 | 99 | | [src/music_kraken/database/__init__.py](/src/music_kraken/database/__init__.py) | Python | 12 | 1 | 4 | 17 | | [src/music_kraken/database/database.py](/src/music_kraken/database/database.py) | Python | 191 | 102 | 45 | 338 | | [src/music_kraken/database/get_song.py](/src/music_kraken/database/get_song.py) | Python | 40 | 5 | 11 | 56 | @@ -36,13 +36,13 @@ Total : 49 files, 3402 codes, 663 comments, 973 blanks, all 5038 lines | [src/music_kraken/database/song.py](/src/music_kraken/database/song.py) | Python | 125 | 20 | 45 | 190 | | [src/music_kraken/database/temp_database.py](/src/music_kraken/database/temp_database.py) | Python | 12 | 0 | 8 | 20 | | [src/music_kraken/lyrics/__init__.py](/src/music_kraken/lyrics/__init__.py) | Python | 0 | 0 | 1 | 1 | -| [src/music_kraken/lyrics/genius.py](/src/music_kraken/lyrics/genius.py) | Python | 115 | 16 | 42 | 173 | +| [src/music_kraken/lyrics/genius.py](/src/music_kraken/not_used_anymore/sources/genius.py) | Python | 115 | 16 | 42 | 173 | | [src/music_kraken/lyrics/lyrics.py](/src/music_kraken/lyrics/lyrics.py) | Python | 36 | 25 | 20 | 81 | -| [src/music_kraken/metadata/__init__.py](/src/music_kraken/metadata/__init__.py) | Python | 6 | 0 | 2 | 8 | -| [src/music_kraken/metadata/metadata_fetch.py](/src/music_kraken/metadata/metadata_fetch.py) | Python | 257 | 24 | 65 | 346 | -| [src/music_kraken/metadata/metadata_search.py](/src/music_kraken/metadata/metadata_search.py) | Python | 253 | 40 | 72 | 365 | -| [src/music_kraken/metadata/sources/__init__.py](/src/music_kraken/metadata/sources/__init__.py) | Python | 3 | 0 | 2 | 5 | -| [src/music_kraken/metadata/sources/musicbrainz.py](/src/music_kraken/metadata/sources/musicbrainz.py) | Python | 42 | 6 | 9 | 57 | +| [src/music_kraken/metadata/__init__.py](/src/music_kraken/not_used_anymore/metadata/__init__.py) | Python | 6 | 0 | 2 | 8 | +| [src/music_kraken/metadata/metadata_fetch.py](/src/music_kraken/not_used_anymore/metadata/metadata_fetch.py) | Python | 257 | 24 | 65 | 346 | +| [src/music_kraken/metadata/metadata_search.py](/src/music_kraken/not_used_anymore/metadata/metadata_search.py) | Python | 253 | 40 | 72 | 365 | +| [src/music_kraken/metadata/sources/__init__.py](/src/music_kraken/not_used_anymore/metadata/sources/__init__.py) | Python | 3 | 0 | 2 | 5 | +| [src/music_kraken/metadata/sources/musicbrainz.py](/src/music_kraken/not_used_anymore/metadata/sources/musicbrainz.py) | Python | 42 | 6 | 9 | 57 | | [src/music_kraken/static_files/new_db.sql](/src/music_kraken/static_files/new_db.sql) | SQLite | 71 | 0 | 10 | 81 | | [src/music_kraken/static_files/temp_database_structure.sql](/src/music_kraken/static_files/temp_database_structure.sql) | SQLite | 135 | 0 | 10 | 145 | | [src/music_kraken/tagging/__init__.py](/src/music_kraken/tagging/__init__.py) | Python | 8 | 0 | 2 | 10 | diff --git a/.VSCodeCounter/2023-01-19_15-23-38/details.md b/.VSCodeCounter/2023-01-19_15-23-38/details.md index 68d788b..2b0e98f 100644 --- a/.VSCodeCounter/2023-01-19_15-23-38/details.md +++ b/.VSCodeCounter/2023-01-19_15-23-38/details.md @@ -15,14 +15,14 @@ Total : 49 files, 3404 codes, 664 comments, 974 blanks, all 5042 lines | [src/goof.py](/src/goof.py) | Python | 116 | 6 | 29 | 151 | | [src/music_kraken/__init__.py](/src/music_kraken/__init__.py) | Python | 118 | 32 | 48 | 198 | | [src/music_kraken/__main__.py](/src/music_kraken/__main__.py) | Python | 3 | 2 | 3 | 8 | -| [src/music_kraken/audio_source/__init__.py](/src/music_kraken/audio_source/__init__.py) | Python | 10 | 0 | 5 | 15 | -| [src/music_kraken/audio_source/fetch_audio.py](/src/music_kraken/audio_source/fetch_audio.py) | Python | 75 | 12 | 20 | 107 | -| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/audio_source/fetch_source.py) | Python | 54 | 1 | 16 | 71 | -| [src/music_kraken/audio_source/sources/__init__.py](/src/music_kraken/audio_source/sources/__init__.py) | Python | 0 | 0 | 1 | 1 | -| [src/music_kraken/audio_source/sources/local_files.py](/src/music_kraken/audio_source/sources/local_files.py) | Python | 40 | 0 | 18 | 58 | -| [src/music_kraken/audio_source/sources/musify.py](/src/music_kraken/audio_source/sources/musify.py) | Python | 136 | 9 | 37 | 182 | -| [src/music_kraken/audio_source/sources/source.py](/src/music_kraken/audio_source/sources/source.py) | Python | 11 | 5 | 8 | 24 | -| [src/music_kraken/audio_source/sources/youtube.py](/src/music_kraken/audio_source/sources/youtube.py) | Python | 71 | 4 | 24 | 99 | +| [src/music_kraken/audio_source/__init__.py](/src/music_kraken/not_used_anymore/__init__.py) | Python | 10 | 0 | 5 | 15 | +| [src/music_kraken/audio_source/fetch_audio.py](/src/music_kraken/not_used_anymore/fetch_audio.py) | Python | 75 | 12 | 20 | 107 | +| [src/music_kraken/audio_source/fetch_source.py](/src/music_kraken/not_used_anymore/fetch_source.py) | Python | 54 | 1 | 16 | 71 | +| [src/music_kraken/audio_source/sources/__init__.py](/src/music_kraken/not_used_anymore/sources/__init__.py) | Python | 0 | 0 | 1 | 1 | +| [src/music_kraken/audio_source/sources/local_files.py](/src/music_kraken/not_used_anymore/sources/local_files.py) | Python | 40 | 0 | 18 | 58 | +| [src/music_kraken/audio_source/sources/musify.py](/src/music_kraken/not_used_anymore/sources/musify.py) | Python | 136 | 9 | 37 | 182 | +| [src/music_kraken/audio_source/sources/source.py](/src/music_kraken/not_used_anymore/sources/source.py) | Python | 11 | 5 | 8 | 24 | +| [src/music_kraken/audio_source/sources/youtube.py](/src/music_kraken/not_used_anymore/sources/youtube.py) | Python | 71 | 4 | 24 | 99 | | [src/music_kraken/database/__init__.py](/src/music_kraken/database/__init__.py) | Python | 12 | 1 | 4 | 17 | | [src/music_kraken/database/database.py](/src/music_kraken/database/database.py) | Python | 191 | 102 | 45 | 338 | | [src/music_kraken/database/get_song.py](/src/music_kraken/database/get_song.py) | Python | 40 | 5 | 11 | 56 | @@ -36,13 +36,13 @@ Total : 49 files, 3404 codes, 664 comments, 974 blanks, all 5042 lines | [src/music_kraken/database/song.py](/src/music_kraken/database/song.py) | Python | 125 | 20 | 45 | 190 | | [src/music_kraken/database/temp_database.py](/src/music_kraken/database/temp_database.py) | Python | 12 | 0 | 8 | 20 | | [src/music_kraken/lyrics/__init__.py](/src/music_kraken/lyrics/__init__.py) | Python | 0 | 0 | 1 | 1 | -| [src/music_kraken/lyrics/genius.py](/src/music_kraken/lyrics/genius.py) | Python | 115 | 16 | 42 | 173 | +| [src/music_kraken/lyrics/genius.py](/src/music_kraken/not_used_anymore/sources/genius.py) | Python | 115 | 16 | 42 | 173 | | [src/music_kraken/lyrics/lyrics.py](/src/music_kraken/lyrics/lyrics.py) | Python | 36 | 25 | 20 | 81 | -| [src/music_kraken/metadata/__init__.py](/src/music_kraken/metadata/__init__.py) | Python | 6 | 0 | 2 | 8 | -| [src/music_kraken/metadata/metadata_fetch.py](/src/music_kraken/metadata/metadata_fetch.py) | Python | 257 | 24 | 65 | 346 | -| [src/music_kraken/metadata/metadata_search.py](/src/music_kraken/metadata/metadata_search.py) | Python | 253 | 40 | 72 | 365 | -| [src/music_kraken/metadata/sources/__init__.py](/src/music_kraken/metadata/sources/__init__.py) | Python | 3 | 0 | 2 | 5 | -| [src/music_kraken/metadata/sources/musicbrainz.py](/src/music_kraken/metadata/sources/musicbrainz.py) | Python | 42 | 6 | 9 | 57 | +| [src/music_kraken/metadata/__init__.py](/src/music_kraken/not_used_anymore/metadata/__init__.py) | Python | 6 | 0 | 2 | 8 | +| [src/music_kraken/metadata/metadata_fetch.py](/src/music_kraken/not_used_anymore/metadata/metadata_fetch.py) | Python | 257 | 24 | 65 | 346 | +| [src/music_kraken/metadata/metadata_search.py](/src/music_kraken/not_used_anymore/metadata/metadata_search.py) | Python | 253 | 40 | 72 | 365 | +| [src/music_kraken/metadata/sources/__init__.py](/src/music_kraken/not_used_anymore/metadata/sources/__init__.py) | Python | 3 | 0 | 2 | 5 | +| [src/music_kraken/metadata/sources/musicbrainz.py](/src/music_kraken/not_used_anymore/metadata/sources/musicbrainz.py) | Python | 42 | 6 | 9 | 57 | | [src/music_kraken/static_files/new_db.sql](/src/music_kraken/static_files/new_db.sql) | SQLite | 71 | 0 | 10 | 81 | | [src/music_kraken/static_files/temp_database_structure.sql](/src/music_kraken/static_files/temp_database_structure.sql) | SQLite | 135 | 0 | 10 | 145 | | [src/music_kraken/tagging/__init__.py](/src/music_kraken/tagging/__init__.py) | Python | 8 | 0 | 2 | 10 | diff --git a/setup.py b/setup.py index 9300be3..1eebc18 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ except ImportError: # packages=['music_kraken'], #packages = find_packages(where="src") -packages = ['music_kraken', 'music_kraken.lyrics', 'music_kraken.audio_source', 'music_kraken.target', 'music_kraken.metadata', 'music_kraken.tagging', 'music_kraken.utils', 'music_kraken.audio_source.sources', 'music_kraken.database', 'music_kraken.static_files'] +packages = ['music_kraken', 'music_kraken.lyrics', 'music_kraken.not_used_anymore', 'music_kraken.target', 'music_kraken.metadata', 'music_kraken.tagging', 'music_kraken.utils', 'music_kraken.not_used_anymore.sources', 'music_kraken.database', 'music_kraken.static_files'] print("packages") print(packages) diff --git a/src/music_kraken/__init__.py b/src/music_kraken/__init__.py index c7130f7..bea8b30 100644 --- a/src/music_kraken/__init__.py +++ b/src/music_kraken/__init__.py @@ -7,10 +7,10 @@ import os from . import ( database, - audio_source, - target, - metadata + not_used_anymore, + target ) +from .not_used_anymore import metadata from .utils.shared import ( MUSIC_DIR, @@ -70,11 +70,11 @@ def set_targets(genre: str): def fetch_sources(songs: List[Song], skip_existing_files: bool = True): - audio_source.fetch_sources(songs=songs, skip_existing_files=skip_existing_files) + not_used_anymore.fetch_sources(songs=songs, skip_existing_files=skip_existing_files) def fetch_audios(songs: List[Song], override_existing: bool = False): - audio_source.fetch_audios(songs=songs, override_existing=override_existing) + not_used_anymore.fetch_audios(songs=songs, override_existing=override_existing) def clear_cache(): diff --git a/src/music_kraken/database/objects/song.py b/src/music_kraken/database/objects/song.py index 14668c9..91fe7ed 100644 --- a/src/music_kraken/database/objects/song.py +++ b/src/music_kraken/database/objects/song.py @@ -366,7 +366,7 @@ class Artist(DatabaseObject, SourceAttribute, MetadataAttribute): notes: str = None, lyrical_themes: List[str] = None, general_genre: str = "", - country: pycountry.Country = None, + country=None, formed_in: ID3Timestamp = None ): DatabaseObject.__init__(self, id_=id_) @@ -376,6 +376,7 @@ class Artist(DatabaseObject, SourceAttribute, MetadataAttribute): """ self.album_type = album_type self.country: pycountry.Country = country + self.formed_in: ID3Timestamp = formed_in """ notes, generall genre, lyrics themes are attributes which are meant to only use in outputs to describe the object diff --git a/src/music_kraken/lyrics/__init__.py b/src/music_kraken/lyrics/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/music_kraken/lyrics/lyrics.py b/src/music_kraken/lyrics/lyrics.py deleted file mode 100644 index bc2e453..0000000 --- a/src/music_kraken/lyrics/lyrics.py +++ /dev/null @@ -1,80 +0,0 @@ -from typing import List - -import mutagen -from mutagen.id3 import ID3, USLT - -from ..utils.shared import * -from . import genius -from ..database import ( - Song, - cache, - Lyrics, - Target -) - -logger = LYRICS_LOGGER - -""" -This whole Part is bodgy as hell and I need to rewrite this little file urgently. genius.py is really clean though :3 -Just wanted to get it to work. - - lyrics need to be put in the database and everything should continue from there then -""" - -""" -https://cweiske.de/tagebuch/rhythmbox-lyrics.htm -Rythmbox, my music player doesn't support ID3 lyrics (USLT) yet, so I have to find something else -Lyrics in MP3 ID3 tags (SYLT/USLT) is still missing, because GStreamer does not support that yet. - -One possible sollution would be to use ogg/vorbis files. Those lyrics are supported in rythmbox -'So, the next Rhythmbox release (3.5.0 or 3.4.2) will read lyrics directly from ogg/vorbis files, using the LYRICS and SYNCLYRICS tags.' -Another possible sollution (probaply the better one cuz I dont need to refactor whole metadata AGAIN) -would be to write a Rhythmbox plugin that fetches lyrics from ID3 USLT - -I have written that Rhythmbox plugin: https://github.com/HeIIow2/rythmbox-id3-lyrics-support -""" - - -# https://www.programcreek.com/python/example/63462/mutagen.mp3.EasyMP3 -# https://code.activestate.com/recipes/577138-embed-lyrics-into-mp3-files-using-mutagen-uslt-tag/ - - -def add_lyrics(target: Target, lyrics): - if not os.path.exists(target.file): - return - - try: - tags = ID3(target.file) - except mutagen.id3.ID3NoHeaderError: - return - - logger.info(f"adding lyrics to the file {target.file}") - - uslt_output = USLT(encoding=3, lang=lyrics.language, desc=u'desc', text=lyrics.text) - tags["USLT::'eng'"] = uslt_output - tags.save(target.file) - - -def fetch_single_lyrics(song: Song): - logger.info(f"try fetching lyrics for {song}") - - lyrics_list: List[Lyrics] = genius.fetch_lyrics(song) - """ - for artist in song.get_artist_names(): - lyrics.extend(genius.search(artist, song.title)) - """ - if len(lyrics_list) == 0: - return - - logger.info(f"found lyrics for {song}") - song.lyrics.extend(lyrics_list) - print(lyrics_list) - cache.add_lyrics(song=song, lyrics=lyrics_list[0]) - add_lyrics(song.target, lyrics_list[0]) - - # cache.add_lyrics(song.id, lyrics=lyrics[0]) - # add_lyrics(song.target.file, lyrics[0]) - - -def fetch_lyrics(songs: List[Song]): - for song in songs: - fetch_single_lyrics(song) diff --git a/src/music_kraken/audio_source/__init__.py b/src/music_kraken/not_used_anymore/__init__.py similarity index 100% rename from src/music_kraken/audio_source/__init__.py rename to src/music_kraken/not_used_anymore/__init__.py diff --git a/src/music_kraken/audio_source/fetch_audio.py b/src/music_kraken/not_used_anymore/fetch_audio.py similarity index 100% rename from src/music_kraken/audio_source/fetch_audio.py rename to src/music_kraken/not_used_anymore/fetch_audio.py diff --git a/src/music_kraken/audio_source/fetch_source.py b/src/music_kraken/not_used_anymore/fetch_source.py similarity index 100% rename from src/music_kraken/audio_source/fetch_source.py rename to src/music_kraken/not_used_anymore/fetch_source.py diff --git a/src/music_kraken/metadata/__init__.py b/src/music_kraken/not_used_anymore/metadata/__init__.py similarity index 100% rename from src/music_kraken/metadata/__init__.py rename to src/music_kraken/not_used_anymore/metadata/__init__.py diff --git a/src/music_kraken/metadata/metadata_fetch.py b/src/music_kraken/not_used_anymore/metadata/metadata_fetch.py similarity index 98% rename from src/music_kraken/metadata/metadata_fetch.py rename to src/music_kraken/not_used_anymore/metadata/metadata_fetch.py index 81cdc38..6ac2c90 100644 --- a/src/music_kraken/metadata/metadata_fetch.py +++ b/src/music_kraken/not_used_anymore/metadata/metadata_fetch.py @@ -1,7 +1,7 @@ -from ..utils.shared import * -from ..utils.object_handeling import get_elem_from_obj, parse_music_brainz_date +from src.music_kraken.utils.shared import * +from src.music_kraken.utils.object_handeling import get_elem_from_obj, parse_music_brainz_date -from ..database.temp_database import temp_database +from src.music_kraken.database.temp_database import temp_database from typing import List import musicbrainzngs diff --git a/src/music_kraken/metadata/metadata_search.py b/src/music_kraken/not_used_anymore/metadata/metadata_search.py similarity index 99% rename from src/music_kraken/metadata/metadata_search.py rename to src/music_kraken/not_used_anymore/metadata/metadata_search.py index 675f04d..bae25e4 100644 --- a/src/music_kraken/metadata/metadata_search.py +++ b/src/music_kraken/not_used_anymore/metadata/metadata_search.py @@ -1,8 +1,8 @@ from typing import List import musicbrainzngs -from ..utils.shared import * -from ..utils.object_handeling import get_elem_from_obj, parse_music_brainz_date +from src.music_kraken.utils.shared import * +from src.music_kraken.utils.object_handeling import get_elem_from_obj, parse_music_brainz_date logger = SEARCH_LOGGER diff --git a/src/music_kraken/metadata/sources/__init__.py b/src/music_kraken/not_used_anymore/metadata/sources/__init__.py similarity index 100% rename from src/music_kraken/metadata/sources/__init__.py rename to src/music_kraken/not_used_anymore/metadata/sources/__init__.py diff --git a/src/music_kraken/metadata/sources/musicbrainz.py b/src/music_kraken/not_used_anymore/metadata/sources/musicbrainz.py similarity index 83% rename from src/music_kraken/metadata/sources/musicbrainz.py rename to src/music_kraken/not_used_anymore/metadata/sources/musicbrainz.py index 8e9b689..b329bcc 100644 --- a/src/music_kraken/metadata/sources/musicbrainz.py +++ b/src/music_kraken/not_used_anymore/metadata/sources/musicbrainz.py @@ -1,15 +1,16 @@ from typing import List import musicbrainzngs -from ...database import ( +from src.music_kraken.database import ( Artist, Album, Song ) -from ...utils.object_handeling import ( +from src.music_kraken.utils.object_handeling import ( get_elem_from_obj ) + def get_artist(flat: bool = False) -> Artist: # getting the flat artist artist_object = Artist() @@ -18,6 +19,7 @@ def get_artist(flat: bool = False) -> Artist: # get additional stuff like discography return artist_object + def get_album(flat: bool = False) -> Album: # getting the flat album object album_object = Album() @@ -26,12 +28,13 @@ def get_album(flat: bool = False) -> Album: # get additional stuff like tracklist return album_object + def get_song(mb_id: str, flat: bool = False) -> Song: # getting the flat song object try: result = musicbrainzngs.get_recording_by_id(mb_id, - includes=["artists", "releases", "recording-rels", "isrcs", - "work-level-rels"]) + includes=["artists", "releases", "recording-rels", "isrcs", + "work-level-rels"]) except musicbrainzngs.musicbrainz.NetworkError: return diff --git a/src/music_kraken/audio_source/sources/__init__.py b/src/music_kraken/not_used_anymore/sources/__init__.py similarity index 100% rename from src/music_kraken/audio_source/sources/__init__.py rename to src/music_kraken/not_used_anymore/sources/__init__.py diff --git a/src/music_kraken/lyrics/genius.py b/src/music_kraken/not_used_anymore/sources/genius.py similarity index 96% rename from src/music_kraken/lyrics/genius.py rename to src/music_kraken/not_used_anymore/sources/genius.py index 0854076..798b30c 100644 --- a/src/music_kraken/lyrics/genius.py +++ b/src/music_kraken/not_used_anymore/sources/genius.py @@ -3,14 +3,14 @@ from typing import List from bs4 import BeautifulSoup import pycountry -from ..database import ( +from src.music_kraken.database import ( Lyrics, Song, Artist ) -from ..utils.shared import * -from ..utils import phonetic_compares -from ..utils.object_handeling import get_elem_from_obj +from src.music_kraken.utils.shared import * +from src.music_kraken.utils import phonetic_compares +from src.music_kraken.utils.object_handeling import get_elem_from_obj TIMEOUT = 10 diff --git a/src/music_kraken/audio_source/sources/local_files.py b/src/music_kraken/not_used_anymore/sources/local_files.py similarity index 100% rename from src/music_kraken/audio_source/sources/local_files.py rename to src/music_kraken/not_used_anymore/sources/local_files.py diff --git a/src/music_kraken/audio_source/sources/musify.py b/src/music_kraken/not_used_anymore/sources/musify.py similarity index 100% rename from src/music_kraken/audio_source/sources/musify.py rename to src/music_kraken/not_used_anymore/sources/musify.py diff --git a/src/music_kraken/audio_source/sources/source.py b/src/music_kraken/not_used_anymore/sources/source.py similarity index 100% rename from src/music_kraken/audio_source/sources/source.py rename to src/music_kraken/not_used_anymore/sources/source.py diff --git a/src/music_kraken/audio_source/sources/youtube.py b/src/music_kraken/not_used_anymore/sources/youtube.py similarity index 100% rename from src/music_kraken/audio_source/sources/youtube.py rename to src/music_kraken/not_used_anymore/sources/youtube.py diff --git a/src/music_kraken/pages/encyclopaedia_metallum.py b/src/music_kraken/pages/encyclopaedia_metallum.py index 3881573..9cfc07f 100644 --- a/src/music_kraken/pages/encyclopaedia_metallum.py +++ b/src/music_kraken/pages/encyclopaedia_metallum.py @@ -208,7 +208,7 @@ class EncyclopaediaMetallum(Page): in form of performance and clean code """ discography_url = "https://www.metal-archives.com/band/discography/id/{}/tab/all" - + # prepare tracklist album_by_url = dict() album_by_name = dict() @@ -242,7 +242,7 @@ class EncyclopaediaMetallum(Page): album_id = album_url.split('/')[-1] album_type = td_list[1].text album_year = td_list[2].text - + unified_name = string_processing.unify(album_name) album_obj: Album = Album(id_=album_id) @@ -264,7 +264,7 @@ class EncyclopaediaMetallum(Page): album_obj.date = ID3Timestamp(year=int(album_year)) except ValueError(): pass - + new_discography.append(album_obj) # add the albums back, which weren't on this page @@ -336,7 +336,7 @@ class EncyclopaediaMetallum(Page): country = pycountry.countries.get(alpha_2=href.split("/")[-1]) artist.country = country continue - + # not needed: Location: Minot, North Dakota """ @@ -347,6 +347,7 @@ class EncyclopaediaMetallum(Page): if "Formed in:" == title_text: formed_in_year = int(data.text) + artist.formed_in = ID3Timestamp(year=formed_in_year) continue if "Genre:" == title_text: genre = data.text @@ -373,15 +374,13 @@ class EncyclopaediaMetallum(Page): # print(title_text, data.text) # print(data) # print(band_stat_soup) - + print("country", country) print("formed in", formed_in_year) print("genre", genre) print("lyrical themes", lyrical_themes) print("label", label_name, label_url) - - return artist @classmethod diff --git a/src/music_kraken/tagging/song.py b/src/music_kraken/tagging/song.py deleted file mode 100644 index 984f928..0000000 --- a/src/music_kraken/tagging/song.py +++ /dev/null @@ -1,3 +0,0 @@ -class Song: - def __init__(self, path: str): - pass diff --git a/src/music_kraken_cli.py b/src/music_kraken_cli.py index fc3ae84..30bb06d 100644 --- a/src/music_kraken_cli.py +++ b/src/music_kraken_cli.py @@ -6,12 +6,9 @@ from music_kraken.utils.shared import ( MUSIC_DIR, NOT_A_GENRE ) -from music_kraken.metadata import ( - metadata_search, - metadata_fetch -) +from src.music_kraken.not_used_anymore.metadata import metadata_search, metadata_fetch from music_kraken.target import set_target -from music_kraken.audio_source import ( +from music_kraken.not_used_anymore import ( fetch_source, fetch_audio ) diff --git a/src/try-programming-interface.py b/src/try-programming-interface.py index c14c68f..6b09d91 100644 --- a/src/try-programming-interface.py +++ b/src/try-programming-interface.py @@ -15,7 +15,7 @@ musicbrainz id and the type the id corresponds to (artist/release group/release/ To get this you first have to initialize a search object (music_kraken.metadata.metadata_search.Search). """ -search_object = mk.metadata.metadata_search.Search() +search_object = src.music_kraken.audio_source_not_used_anymore.metadata.metadata_search.Search() """ Then you need an initial "text search" to get some options you can choose from. For @@ -101,7 +101,7 @@ forward so I just show the code. """ # I am aware of abstrackt classes -metadata_downloader = mk.metadata.metadata_fetch.MetadataDownloader() +metadata_downloader = src.music_kraken.audio_source_not_used_anymore.metadata.metadata_fetch.MetadataDownloader() metadata_downloader.download({'type': option_to_download.type, 'id': option_to_download.id}) """