Updated some important things
This commit is contained in:
parent
b3fb36bafe
commit
a0b04529f7
2 changed files with 35 additions and 19 deletions
43
src/tidler
43
src/tidler
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
. tidler.conf
|
. tidler.conf # Load ENVs from config file
|
||||||
|
|
||||||
downloadTrack() {
|
downloadTrack() {
|
||||||
if [ "$#" -ge 1 ]; then
|
if [ "$#" -ge 1 ]; then
|
||||||
|
@ -11,16 +11,23 @@ downloadTrack() {
|
||||||
read -r id
|
read -r id
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$#" -ge 2 ]; then
|
||||||
|
album_dir="$2"
|
||||||
|
else
|
||||||
|
album_dir=""
|
||||||
|
fi
|
||||||
|
|
||||||
json_data=$(curl -s "https://tidal.401658.xyz/track/?id=$id&quality=LOSSLESS")
|
json_data=$(curl -s "https://tidal.401658.xyz/track/?id=$id&quality=LOSSLESS")
|
||||||
track_name=$(echo "$json_data" | jq -r '.[0].title')
|
track_name=$(echo "$json_data" | jq -r '.[0].title')
|
||||||
artist_name=$(echo "$json_data" | jq -r '.[0].artist.name')
|
artist_name=$(echo "$json_data" | jq -r '.[0].artist.name')
|
||||||
album_name=$(echo "$json_data" | jq -r '.[0].album.title')
|
album_name=$(echo "$json_data" | jq -r '.[0].album.title')
|
||||||
url=$(echo "$json_data" | jq -r '.[-1].OriginalTrackUrl')
|
url=$(echo "$json_data" | jq -r '.[-1].OriginalTrackUrl')
|
||||||
cover_data=$(curl -s "https://tidal.401658.xyz/cover/?id=$id")
|
cover_data=$(curl -s "https://tidal.401658.xyz/cover/?id=$id")
|
||||||
cover_url=$(echo "$cover_data" | jq -r '.[0]["1280"]')
|
cover_url=$(echo "$cover_data" | jq -r '.[]["1280"]')
|
||||||
# lyrics_data=$(curl -s "https://tidal.401658.xyz/lyrics/?id=$id")
|
|
||||||
# lyrics=$(echo "$lyrics_data" | jq -r '.[0].lyrics')
|
track_number=$(echo "$json_data" | jq -r '.[0].trackNumber')
|
||||||
filename="$track_name.flac"
|
filename="$track_name.flac"
|
||||||
|
cover_name="cover.png"
|
||||||
|
|
||||||
if [ -n "$DOWNLOADS_DIR" ]; then
|
if [ -n "$DOWNLOADS_DIR" ]; then
|
||||||
download_dir="$DOWNLOADS_DIR"
|
download_dir="$DOWNLOADS_DIR"
|
||||||
|
@ -28,19 +35,28 @@ downloadTrack() {
|
||||||
download_dir="$(pwd)"
|
download_dir="$(pwd)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "$download_dir"
|
final_path="$download_dir/$album_dir"
|
||||||
curl "$url" -o "$download_dir/$filename"
|
|
||||||
curl "$cover_url" -o "$download_dir/cover.png"
|
mkdir -p "$final_path"
|
||||||
|
|
||||||
|
curl "$url" -o "$final_path/$filename"
|
||||||
|
curl "$cover_url" -o "$final_path/$cover_name"
|
||||||
|
|
||||||
# Metadata
|
# Metadata
|
||||||
metaflac \
|
metaflac \
|
||||||
--set-tag="NAME=$track_name" \
|
--set-tag="NAME=$track_name" \
|
||||||
--set-tag="ARTIST=$artist_name" \
|
--set-tag="ARTIST=$artist_name" \
|
||||||
--set-tag="ALBUM=$album_name" \
|
--set-tag="ALBUM=$album_name" \
|
||||||
--import-picture-from="$download_dir/cover.png" \
|
--set-tag="TRACKNUMBER=$track_number" \
|
||||||
"$download_dir/$filename"
|
--import-picture-from="$final_path/$cover_name" \
|
||||||
rm "$download_dir/cover.png"
|
"$final_path/$filename"
|
||||||
|
|
||||||
|
# Ověř zda metadata byla úspěšně nastavena před smazáním cover.png
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
rm "$final_path/$cover_name"
|
||||||
|
else
|
||||||
|
echo "Chyba při nastavování metadat. Zachovávám cover.png pro další pokus."
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -85,12 +101,11 @@ downloadAlbum() {
|
||||||
else
|
else
|
||||||
base_dir="$(pwd)"
|
base_dir="$(pwd)"
|
||||||
fi
|
fi
|
||||||
json_data=$(curl -s "https://tidal.401658.xyz/track/?id=$id&quality=LOSSLESS")
|
json_data=$(curl -s "https://tidal.401658.xyz/album/?id=$id&quality=LOSSLESS")
|
||||||
album_name=$(echo "$json_data" | jq -r '.[0].album.title')
|
album_name=$(echo "$json_data" | jq -r '.[0].title')
|
||||||
artist_name=$(echo "$json_data" | jq -r '.[0].artist.name')
|
artist_name=$(echo "$json_data" | jq -r '.[0].artist.name')
|
||||||
album_title="$artist_name - $album_name"
|
album_title="$artist_name - $album_name"
|
||||||
album_dir="$base_dir/$album_title"
|
album_dir="$album_title"
|
||||||
mkdir -p "$album_dir"
|
|
||||||
album_tracks_ids=$(curl -s "https://tidal.401658.xyz/album/?id=$id" | jq -r '.[1].items[] | .item.id')
|
album_tracks_ids=$(curl -s "https://tidal.401658.xyz/album/?id=$id" | jq -r '.[1].items[] | .item.id')
|
||||||
tracks_ids_list=()
|
tracks_ids_list=()
|
||||||
while IFS= read -r list; do
|
while IFS= read -r list; do
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
# DOWNLOADS_DIR=path
|
DOWNLOADS_DIR="/srv/music"
|
||||||
|
PROXY_URL="hifi-04ed2aaea09a.herokuapp.com" # Server without cache
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue