parent
ddc012ba11
commit
14fa832eae
1 changed files with 8 additions and 8 deletions
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/with-contenv bash
|
#!/usr/bin/with-contenv bash
|
||||||
scriptVersion="2.14"
|
scriptVersion="2.15"
|
||||||
scriptName="Audio"
|
scriptName="Audio"
|
||||||
|
|
||||||
### Import Settings
|
### Import Settings
|
||||||
|
@ -151,7 +151,7 @@ Configuration () {
|
||||||
}
|
}
|
||||||
|
|
||||||
DownloadClientFreyr () {
|
DownloadClientFreyr () {
|
||||||
freyr --no-bar -d $audioPath/incomplete deezer:album:$1 2>&1 | tee -a /config/logs/$scriptName.txt
|
freyr --no-bar -d $audioPath/incomplete deezer:album:$1 2>&1 | tee -a /config/logs/$scriptName-$(date +"%Y_%m_%d_%I_%M_%p").txt
|
||||||
}
|
}
|
||||||
|
|
||||||
DownloadFormat () {
|
DownloadFormat () {
|
||||||
|
@ -262,7 +262,7 @@ TidalClientSetup () {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
TidaldlStatusCheck
|
TidaldlStatusCheck
|
||||||
tidal-dl -o "$audioPath"/incomplete 2>&1 | tee -a /config/logs/$scriptName.txt
|
tidal-dl -o "$audioPath"/incomplete 2>&1 | tee -a /config/logs/$scriptName-$(date +"%Y_%m_%d_%I_%M_%p").txt
|
||||||
DownloadFormat
|
DownloadFormat
|
||||||
|
|
||||||
if [ ! -f /config/xdg/.tidal-dl.token.json ]; then
|
if [ ! -f /config/xdg/.tidal-dl.token.json ]; then
|
||||||
|
@ -318,7 +318,7 @@ TidalClientTest () {
|
||||||
while [ $i -lt 3 ]; do
|
while [ $i -lt 3 ]; do
|
||||||
i=$(( $i + 1 ))
|
i=$(( $i + 1 ))
|
||||||
TidaldlStatusCheck
|
TidaldlStatusCheck
|
||||||
tidal-dl -q Normal -o "$audioPath"/incomplete -l "$tidalClientTestDownloadId" 2>&1 | tee -a /config/logs/$scriptName.txt
|
tidal-dl -q Normal -o "$audioPath"/incomplete -l "$tidalClientTestDownloadId" 2>&1 | tee -a /config/logs/$scriptName-$(date +"%Y_%m_%d_%I_%M_%p").txt
|
||||||
downloadCount=$(find "$audioPath"/incomplete -type f -regex ".*/.*\.\(flac\|opus\|m4a\|mp3\)" | wc -l)
|
downloadCount=$(find "$audioPath"/incomplete -type f -regex ".*/.*\.\(flac\|opus\|m4a\|mp3\)" | wc -l)
|
||||||
if [ $downloadCount -le 0 ]; then
|
if [ $downloadCount -le 0 ]; then
|
||||||
continue
|
continue
|
||||||
|
@ -450,7 +450,7 @@ DownloadProcess () {
|
||||||
if [ -z $arlToken ]; then
|
if [ -z $arlToken ]; then
|
||||||
DownloadClientFreyr $1
|
DownloadClientFreyr $1
|
||||||
else
|
else
|
||||||
deemix -b $deemixQuality -p "$audioPath"/incomplete "https://www.deezer.com/album/$1" 2>&1 | tee -a /config/logs/$scriptName.txt
|
deemix -b $deemixQuality -p "$audioPath"/incomplete "https://www.deezer.com/album/$1" 2>&1 | tee -a /config/logs/$scriptName-$(date +"%Y_%m_%d_%I_%M_%p").txt
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d "/tmp/deemix-imgs" ]; then
|
if [ -d "/tmp/deemix-imgs" ]; then
|
||||||
|
@ -487,7 +487,7 @@ DownloadProcess () {
|
||||||
if [ -z $arlToken ]; then
|
if [ -z $arlToken ]; then
|
||||||
DownloadClientFreyr $1
|
DownloadClientFreyr $1
|
||||||
else
|
else
|
||||||
deemix -b $deemixQuality -p "$audioPath"/incomplete "https://www.deezer.com/album/$1" 2>&1 | tee -a /config/logs/$scriptName.txt
|
deemix -b $deemixQuality -p "$audioPath"/incomplete "https://www.deezer.com/album/$1" 2>&1 | tee -a /config/logs/$scriptName-$(date +"%Y_%m_%d_%I_%M_%p").txt
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -495,7 +495,7 @@ DownloadProcess () {
|
||||||
if [ "$2" == "TIDAL" ]; then
|
if [ "$2" == "TIDAL" ]; then
|
||||||
TidaldlStatusCheck
|
TidaldlStatusCheck
|
||||||
|
|
||||||
tidal-dl -q $tidalQuality -o "$audioPath/incomplete" -l "$1" 2>&1 | tee -a /config/logs/$scriptName.txt
|
tidal-dl -q $tidalQuality -o "$audioPath/incomplete" -l "$1" 2>&1 | tee -a /config/logs/$scriptName-$(date +"%Y_%m_%d_%I_%M_%p").txt
|
||||||
|
|
||||||
# Verify Client Works...
|
# Verify Client Works...
|
||||||
clientTestDlCount=$(find "$audioPath"/incomplete/ -type f -regex ".*/.*\.\(flac\|opus\|m4a\|mp3\)" | wc -l)
|
clientTestDlCount=$(find "$audioPath"/incomplete/ -type f -regex ".*/.*\.\(flac\|opus\|m4a\|mp3\)" | wc -l)
|
||||||
|
@ -956,7 +956,7 @@ DeemixClientSetup () {
|
||||||
DeezerClientTest () {
|
DeezerClientTest () {
|
||||||
log "DEEZER :: deemix client setup verification..."
|
log "DEEZER :: deemix client setup verification..."
|
||||||
|
|
||||||
deemix -b 128 -p $audioPath/incomplete "https://www.deezer.com/album/$deezerClientTestDownloadId" 2>&1 | tee -a /config/logs/$scriptName.txt
|
deemix -b 128 -p $audioPath/incomplete "https://www.deezer.com/album/$deezerClientTestDownloadId" 2>&1 | tee -a /config/logs/$scriptName-$(date +"%Y_%m_%d_%I_%M_%p").txt
|
||||||
if [ -d "/tmp/deemix-imgs" ]; then
|
if [ -d "/tmp/deemix-imgs" ]; then
|
||||||
rm -rf /tmp/deemix-imgs
|
rm -rf /tmp/deemix-imgs
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue