From defc22ccf1d993380a7fb8513e2bfdc8df3ca30e Mon Sep 17 00:00:00 2001 From: qo-op Date: Sun, 28 Mar 2021 21:04:55 +0200 Subject: [PATCH] debug youtube & cut problem --- cron_MINUTE.sh | 2 +- zen/new_file_in_astroport.sh | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index 703fdec..856169a 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -82,7 +82,7 @@ if [[ $(($minute % 15)) == 0 ]]; then # git reset --hard git pull -# if [[ $(diff ~/.zen/astrXbian/.install/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml ~/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml) ]]; then +# if [[ $(diff ~/.zen/astrXbian/.install/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml ~/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml) ]]; then # cp ~/.zen/astrXbian/.install/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml ~/.kodi/userdata/addon_data/plugin.video.vstream/settings.xml # echo "MAJ Vstream settings" # fi diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index ec1fc9d..0ba3b0f 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -59,13 +59,14 @@ fi case ${CAT} in youtube) INDEXPREFIX="YOUTUBE_" - REFERENCE=$(echo "$file" | cut -d "_" -f 1) # Youtube filename starts with ID_ - TITLE=$(echo "$TITLE" | cut -d "_" -f 2-) + REFERENCE=$(echo "$file" | cut -d "&" -f 1) # Youtube filename starts with ID_ + TITLE=$(echo "$file" | cut -d "&" -f 2-) ;; mp3) ## DIFFERENT TREATMENT INDEXPREFIX="MP3_" - REFERENCE=$(echo "$file" | cut -d "_" -f 1) # Youtube filename starts with ID_ + REFERENCE=$(echo "$file" | cut -d "&" -f 1) # Youtube filename starts with ID_ + TITLE=$(echo "$file" | cut -d "&" -f 2-) er="$er | Please use new_mp3_in_astroport.sh ... EXIT" echo "$er" exit 1 @@ -133,7 +134,7 @@ URLENCODE_FILE_NAME=$(echo ${file} | jq -Rr @uri) ## CREATE NEW ipns KEY : ${INDEXPREFIX}${REFERENCE} ######################################################################## ######################################################################## -[[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB} ]] && mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB} && KEY=$(ipfs key gen "${INDEXPREFIX}${REFERENCE}") && KEYFILE=$(ls -t ~/.ipfs/keystore/ | head -n 1) +[[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB} ]] && mkdir -p "~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}" && KEY=$(ipfs key gen "${INDEXPREFIX}${REFERENCE}") && KEYFILE=$(ls -t ~/.ipfs/keystore/ | head -n 1) ## INIT ipns if [[ $KEY ]]; then # memorize IPNS key filename for easiest exchange