From 34981b50e626482f0ad0e769b1cbe6af1a930163 Mon Sep 17 00:00:00 2001 From: Lars Noack Date: Tue, 9 Apr 2024 11:48:32 +0200 Subject: [PATCH] feat: build script --- build | 48 ++++ build.sh | 71 ------ requirements-dev.txt | 3 + version | 1 - website/assets/logo_cropped.jpg | Bin 31191 -> 0 bytes website/index.html | 373 -------------------------------- website/readme.html | 43 ---- 7 files changed, 51 insertions(+), 488 deletions(-) create mode 100755 build delete mode 100755 build.sh create mode 100644 requirements-dev.txt delete mode 100644 version delete mode 100644 website/assets/logo_cropped.jpg delete mode 100644 website/index.html delete mode 100644 website/readme.html diff --git a/build b/build new file mode 100755 index 0000000..73c817a --- /dev/null +++ b/build @@ -0,0 +1,48 @@ +#!/bin/bash + +test=false +version_bump="minor" + +while getopts ":b:t" opt; do + case ${opt} in + b ) + version_bump=$OPTARG + ;; + t ) + test=true + ;; + \? ) + echo "Invalid option: $OPTARG" 1>&2 + exit 1 + ;; + : ) + echo "Invalid option: $OPTARG requires an argument" 1>&2 + exit 1 + ;; + esac +done +shift $((OPTIND -1)) + +# install dev dependencies +echo "installing dev dependencies..." +sudo python3 -m pip install -r requirements-dev.txt + +hatch version ${version_bump} +git add "music_kraken/__init__.py" +git commit -m "bump: ${version_bump}" + +# build the wheels +python3 -m build + +# install the newest version +python3 -m pip install . + +if [ "$test" = true ]; +then + echo "just a test" + twine upload --repository testpypi dist/music_kraken* + python3 -m pip install -i https://test.pypi.org/simple/ music-kraken -U + exit +fi + +twine upload dist/music_kraken* diff --git a/build.sh b/build.sh deleted file mode 100755 index 506457e..0000000 --- a/build.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash -test=true - -rm /tmp/music-downloader/*.db -rm /tmp/music-downloader/*.sql - -version=$(cut -d@ -f1 version) -echo version: $version - -git add . -git commit -am "ready for build $version" -git push - -sudo python3 -m pip install -U twine wheel setuptools - -python3 setup.py sdist bdist_wheel -sudo python3 -m pip uninstall music-kraken -y - -python3 -m pip install dist/music-kraken-$version.tar.gz --user -music-kraken - -if [ "$test" = true ]; -then - echo "just a test" - twine upload --repository testpypi dist/music_kraken* - python3 -m pip install -i https://test.pypi.org/simple/ music-kraken -U - exit -fi - -twine upload dist/music_kraken* - -echo "compiling............" -mkdir -p dist/build_files -mkdir -p dist/compiled - -pyinstaller --onefile src/music_kraken_cli.py --specpath dist/build_files --workpath dist/build_files --distpath dist/compiled -exit - -# https://packaging.python.org/en/latest/tutorials/packaging-projects/ -#echo "building............" -#echo "python3 -m pip install --upgrade build" -# python3 -m pip install --upgrade pip -# python3 -m pip install --upgrade build -#echo "python3 -m build" -# python3 -m build -# python3 setup.py sdist bdist_wheel -# python3 setup.py install --user - -# echo "python3 -m pip install dist/music_kraken-1.2.2-py3-none-any.whl --user --force-reinstall" -# python3 -m pip install dist/music_kraken-1.2.2.tar.gz --user --force-reinstall - -# music-kraken - -# open /home/lars/.local/lib/python3.10/site-packages/music_kraken -# echo "uploading............" -#python3 -m pip install --upgrade twine -#twine upload dist/music_kraken* - -# twine upload --repository testpypi dist/music_kraken* -exit - -echo "pushing............" -git add . -git commit -am "new build and upload" -git push - -echo "compiling............" -mkdir -p dist/build_files -mkdir -p dist/compiled - -pyinstaller --onefile src/music_kraken_cli.py --specpath dist/build_files --workpath dist/build_files --distpath dist/compiled diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000..7ce1d72 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,3 @@ +build +twine +hatch diff --git a/version b/version deleted file mode 100644 index 23aa839..0000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -1.2.2 diff --git a/website/assets/logo_cropped.jpg b/website/assets/logo_cropped.jpg deleted file mode 100644 index a4f0a9439f67c97575db40b3b883f44cdb68c930..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31191 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 LH<8#;NJszKUW{^g diff --git a/website/index.html b/website/index.html deleted file mode 100644 index eac1a40..0000000 --- a/website/index.html +++ /dev/null @@ -1,373 +0,0 @@ - - - - - - Music Kraken - - - - - - - - -
- Hellow2 - - - -
- - -
-
- - -

Music-Kraken

- -

Installation

- -
-# Install it with
-pip install music-kraken
-
-# and simply run it like this:
-music-kraken
-
- -

Quick-Guide

- -

- Genre: First, the cli asks you to input a genre you want to download to. The options it gives you (if it gives you any) are all the folders you have in the music directory. You can also just input a new one. -

-

- What to download: After that it prompts you for a search. Here are a couple examples how you can search: -

- -
-> #a <any artist>
-searches for the artist <any artist>
-
-> #a <any artist> #r <any releas>
-searches for the release <album> <any release> by the artist <any artist>
-
-> #r <any release> Me #t <any track>
-searches for the track <any track> from the release <any relaese>
-
- -

- After searching with this syntax, it prompts you with multiple results. You can either choose one of those by inputing its id `int`, or you can search for a new query. -

-

- After you chose either an artist, a release group, a release, or a track by its id, download it by inputting the string `ok`. My downloader will download it automatically for you. -

-
-
- -
-
-# Programming Interface / Use as Library - -If you want to use this project, or parts from it in your own projects from it, -make sure to be familiar with [Python Modules](https://docs.python.org/3/tutorial/modules.html). -Further and better documentation including code examples are yet to come, so here is the rough -module structure for now. (Should be up-to-date, but no guarantees) - -If you simply want to run the builtin minimal cli just do this: -
-from music_kraken import cli
-
-cli()
-
- -## Search for Metadata - -The whole program takes the data it processes further from the cache, a sqlite database. -So before you can do anything, you will need to fill it with the songs you want to download (*or create song objects manually, but more on that later*). - -For now the base of everything is [musicbrainz][mb], so you need to get the musicbrainz `id` and `type`. The `id` corresponds to either - - an artist - - a release group - - a release - - a recording/track). - -To get this info, you first have to initialize a search object (`music_kraken.MetadataSearch`). - -
-search_object = music_kraken.MetadataSearch()
-
- -Then you need an initial "text search" to get some options you can choose from. For -this you can either specify artists releases and whatever directly with one of the following functions: - -
-# you can directly specify artist, release group, release or recording/track
-multiple_options = search_object.search_from_text(artist=input("input the name of the artist: "))
-# you can specify a query see the simple integrated cli on how to use the query
-multiple_options = search_object.search_from_query(query=input("input the query: "))
-
- -Both methods return an instance of `MultipleOptions`, which can be directly converted to a string. - -
-print(multiple_options)
-
- -After the first "*text search*" you can either again search the same way as before, -or you can further explore one of the options from the previous search. -To explore and select one options from `MultipleOptions`, simply call `MetadataSearch.choose(self, index: int)`. -The index represents the number in the previously returned instance of MultipleOptions. -The selected Option will be selected and can be downloaded in the next step. - -*Thus, this has to be done **after either search_from_text or search_from_query*** - -
-# choosing the best matching band
-multiple_options = search_object.choose(0)
-# choosing the first ever release group of this band
-multiple_options = search_object.choose(1)
-# printing out the current options
-print(multiple_options)
-
- -This process can be repeated indefinitely (until you run out of memory). -A search history is kept in the Search instance. You could go back to -the previous search (without any loading time) like this: - -
-multiple_options = search_object.get_previous_options()
-
- -## Downloading Metadata / Filling up the Cache - -You can download following metadata: - - an artist (the whole discography) - - a release group - - a release - - a track/recording - -If you got an instance of `MetadataSearch`, like I elaborated [previously](#search-for-metadata), downloading every piece of metadata from the currently selected Option is really quite easy. - -
-from music_kraken import fetch_metadata_from_search
-
-# this is it :)
-music_kraken.fetch_metadata_from_search(search_object)
-
- -If you already know what you want to download you can skip the search instance and simply do the following. - -
-from music_kraken import fetch_metadata
-
-# might change and break after I add multiple metadata sources which I will
-
-fetch_metadata(id_=musicbrainz_id, type=metadata_type)
-
- -The option type is a string (*I'm sorry for not making it an enum I know its a bad pratice*), which can -have following values: - - 'artist' - - 'release_group' - - 'release' - - 'recording' - -**PAY ATTENTION TO TYPOS, IT'S CASE SENSITIVE** - -The musicbrainz id is just the id of the object from musicbrainz. - -After following those steps, it might take a couple seconds/minutes to execute, but then the Cache will be filled. - - -## Cache / Temporary Database - -All the data, the functions that download stuff use, can be gotten from the temporary database / cache. -The cache can be simply used like this: - -
-music_kraken.cache
-
- -When fetching any song data from the cache, you will get it as Song -object (music_kraken.Song). There are multiple methods -to get different sets of Songs. The names explain the methods pretty -well: - -
-from music_kraken import cache
-
-# gets a single track specified by the id
-cache.get_track_metadata(id: str)
-
-# gets a list of tracks.
-cache.get_tracks_to_download()
-cache.get_tracks_without_src()
-cache.get_tracks_without_isrc()
-cache.get_tracks_without_filepath()
-
- -The id always is a musicbrainz id and distinct for every track. - -## Setting the Target - -By default the music downloader doesn't know where to save the music file, if downloaded. To set those variables (the directory to save the file in and the filepath), it is enough to run one single command: - -
-from music_kraken import set_target
-
-# adds file path, file directory and the genre to the database 
-set_target(genre="some test genre")
-
- -The concept of genres is too loose, to definitely say, this band exclusively plays this genre, or this song is this genre. This doesn't work manually, this will never work automatically. Thus, I've decided to just use the genre as category, to sort the artists and songs by. Most Music players support that. - -As a result of this decision you will have to pass the genre in this function. - -## Get Audio - -This is most likely the most useful and unique feature of this Project. If the cache is filled, you can get audio sources for the songs you only have the metadata, and download them. This works for most songs. I'd guess for about 97% (?) - -First of you will need a List of song objects `music_kraken.Song`. As [mentioned above](#cache--temporary-database), you could get a list like that from the cache. - -
-# Here is an Example
-from music_kraken import (
-    cache,
-    fetch_sources,
-    fetch_audios
-)
-
-# scanning pages, searching for a download and storing results
-fetch_sources(cache.get_tracks_without_src())
-
-# downloading all previously fetched sources to previously defined targets
-fetch_audios(cache.get_tracks_to_download())
-
-
- -*Note:* -To download audio two cases have to be met: - 1. [The target](#setting-the-target) has to be set beforehand - 2. The sources have to be fetched beforehand - ---- -
-
- -
-
-# Metadata - -First the metadata has to be downloaded. The best api to do so is undeniably [Musicbrainz][mb]. This is a result of them being a website with a large Database spanning over all Genres. - -## Musicbrainz - -![Musicbrainz Data Scheme](https://wiki.musicbrainz.org/-/images/9/9e/pymb3-model-core.png) - -To fetch from [Musicbrainz][mb] we first have to know what to fetch. A good start is to get an input query, which can be just put into the MB-Api. It then returns a list of possible artists, releases and recordings. - -If the following chosen element is an artist, its discography + a couple tracks are printed, if a release is chosen, the artists + tracklist + release is outputted, If a track is chosen its artists and releases are shown. - -For now, it doesn't if the discography or tracklist is chosen. - -## Metadata to fetch - -I orient on which metadata to download on the keys in `mutagen.EasyID3`. The following I fetch and tag the MP3 with: -- title -- artist -- albumartist -- tracknumber -- albumsort can sort albums cronological -- titlesort is just set to the tracknumber to sort by track order to sort correctly -- isrc -- musicbrainz_artistid -- musicbrainz_albumid -- musicbrainz_albumartistid -- musicbrainz_albumstatus -- language -- musicbrainz_albumtype -- releasecountry -- barcode - -### albumsort/titlesort - -Those Tags are for the musicplayer to not sort for Example the albums of a band alphabetically, but in another way. I set it just to chronological order - -### isrc - -This is the **international standart release code**. With this a track can be identified 99% of the time, if it is known and the website has a search api for that. Obviously this will get important later. - -
-
- -
-
- -# Download - -Now that the metadata is downloaded and cached, download sources need to be sound, because one can't listen to metadata. Granted it would be amazing if that would be possible. - -## Musify - -The quickest source to get download links from is to my knowledge [musify](https://musify.club/). It's a Russian music downloading page, where many many songs are available to stream and to download. Due to me not wanting to stress the server to much, I abuse a handy feature nearly every page where you can search suff has. The autocomplete api for the search input. Those always are quite limited in the number of results it returns, but it is optimized to be quick. Thus with the http header `Connection` set to `keep-alive` the bottleneck definitely is not at the speed of those requests. - -For musify the endpoint is following: [https://musify.club/search/suggestions?term={title}](https://musify.club/search/suggestions?term=LornaShore) If the http headers are set correctly, then searching for example for "Lorna Shore" yields following result: - -
-[
-    {
-        "id":"Lorna Shore",
-        "label":"Lorna Shore",
-        "value":"Lorna Shore",
-        "category":"Исполнители",
-        "image":"https://39s.musify.club/img/68/9561484/25159224.jpg",
-        "url":"/artist/lorna-shore-59611"       
-    },
-    {"id":"Immortal","label":"Lorna Shore - Immortal (2020)","value":"Immortal","category":"Релизы","image":"https://39s-a.musify.club/img/70/20335517/52174338.jpg","url":"/release/lorna-shore-immortal-2020-1241300"},
-    {"id":"Immortal","label":"Lorna Shore - Immortal","value":"Immortal","category":"Треки","image":"","url":"/track/lorna-shore-immortal-12475071"}
-]
-
- -This is a shortened example for the response the api gives. The results are very Limited, but it is also very efficient to parse. The steps I take are: - -- call the api with the query being the track name -- parse the json response to an object -- look at how different the title and artist are on every element from the category `Треки`, translated roughly to track or release. -- If they match get the download links and cache them. - -## Youtube - -Herte the **isrc** plays a huge role. You probably know it, when you search on youtube for a song, and the music videos has a long intro or the first result is a live version. I don't want those in my music collection, only if the tracks are like this in the official release. Well how can you get around that? - -Turns out if you search for the **isrc** on youtube the results contain the music, like it is on the official release and some japanese meme videos. The tracks I wan't just have the title of the released track, so one can just compare those two. - -For searching, as well as for downloading I use the programm `youtube-dl`, which also has a programming interface for python. - -There are two bottlenecks with this approach though: -1. `youtube-dl` is just slow. Actually it has to be, to not get blocked by youtube. -2. Ofthen musicbrainz just doesn't give the isrc for some songs. -
-
- -
-
-# Lyrics - -To get the Lyrics, I scrape them, and put those in the USLT ID3 Tags of for example mp3 files. Unfortunately some players, like the one I use, Rhythmbox don't support USLT Lyrics. So I created an Plugin for Rhythmbox. You can find it here: [https://github.com/HeIIow2/rythmbox-id3-lyrics-support](https://github.com/HeIIow2/rythmbox-id3-lyrics-support). - -## Genius - -For the lyrics source the page [https://genius.com/](https://genius.com/) is easily sufficient. It has most songs. Some songs are not present though, but that is fine, because the lyrics are optional anyways. -
-
- - - - - - diff --git a/website/readme.html b/website/readme.html deleted file mode 100644 index bccdc59..0000000 --- a/website/readme.html +++ /dev/null @@ -1,43 +0,0 @@ - - -

- GitHub - PyPI -

- -

Installation

- -
-# Install it with
-pip install music-kraken
-
-# and simply run it like this:
-music-kraken
-
- -

Quick-Guide

- -

- Genre: First, the cli asks you to input a genre you want to download to. The options it gives you (if it gives you any) are all the folders you have in the music directory. You can also just input a new one. -

-

- What to download: After that it prompts you for a search. Here are a couple examples how you can search: -

- -
-> #a <any artist>
-searches for the artist <any artist>
-
-> #a <any artist> #r <any releas>
-searches for the release <album> <any release> by the artist <any artist>
-
-> #r <any release> Me #t <any track>
-searches for the track <any track> from the release <any relaese>
-
- -

- After searching with this syntax, it prompts you with multiple results. You can either choose one of those by inputing its id `int`, or you can search for a new query. -

-

- After you chose either an artist, a release group, a release, or a track by its id, download it by inputting the string `ok`. My downloader will download it automatically for you. -

\ No newline at end of file