new_file_in_astroport

2021-02-13 15:38:14 +01:00 · 2021-02-13 15:38:14 +01:00 · 7bbedbafad
parent ad66603a5c
commit 7bbedbafad
4 changed files with 17 additions and 102 deletions
--- a/cron_MINUTE.sh
+++ b/cron_MINUTE.sh
@ -12,7 +12,7 @@ ME="${0##*/}"
 source $HOME/.profile
 # CORRECT PATH
 [[ ! $(echo $PATH | grep "/usr/local/bin") ]] && export PATH="$PATH:/usr/local/bin"
-[[ ! $(echo $PATH | grep "HOME/.local/bin") ]] && export PATH="$PATH:$HOME/.local/bin"
+[[ ! $(echo $PATH | grep "$HOME/.local/bin") ]] && export PATH="$PATH:$HOME/.local/bin"
 [[ ! $(echo $PATH | grep "/usr/games") ]] && export PATH="$PATH:/usr/games"

 #### INIT STATION PARAMETERS
@ -92,7 +92,7 @@ fi
 if [[ "$USER" == "xbian" ]]; then
 	if [[ ! $isinotifywaitRunning ]]; then
 		mkdir -p /home/$YOU/astroport
-		/usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/mint_youtube.sh "$dir" "$file"; done &
+		/usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/new_file_in_astroport.sh "$dir" "$file"; done &
 	fi

 	# restart inotifywait (may be useless)
--- a/zen/new_file_in_astroport.sh
+++ b/zen/new_file_in_astroport.sh
@ -30,7 +30,7 @@ TITLE="${file%.*}"

 # GET XZUID
 [[ -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title ]] && XZUID=$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title) || XZUID=$(hostname)
-rm-f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid # CLEANING OLD FILE STRUCTURE (TO BE REMOVED AFTER SWARM CODE UPGRADE)
+rm -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid # CLEANING OLD FILE STRUCTURE (TO BE REMOVED AFTER SWARM CODE UPGRADE)
 rm -f ~/.zen/ipfs/xbian/_${XZUID}

 TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: /home/$YOU/astroport/... films, youtube, mp3
--- a/zen/refresh_ASTRXBIAN_index.sh
+++ b/zen/refresh_ASTRXBIAN_index.sh
@ -0,0 +1,14 @@
+#!/bin/bash
+########################################################################
+# Author: Fred (support@qo-op.com)
+# Version: 2020.12.15
+# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
+########################################################################
+# REFRESH ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+########################################################################
+
+[[ -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title ]] && XZUID=$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title) || XZUID=$(hostname)
+
+mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/
+cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
+echo "INDEX UPDATED : http://127.0.0.1:10021/${PREFIX}ASTRXBIAN"
--- a/zen/xbian_vstream.sh
+++ b/zen/xbian_vstream.sh
@ -1,99 +0,0 @@
-#!/bin/bash
-########################################################################
-# Author: Fred (support@qo-op.com)
-# Version: 2020.12.15
-# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
-########################################################################
-# Transfert ~/astroport/files to IPFS
-# Create Astroport(pastebin) index for Xbian/Vstream
-######## #### ### ## #
-#inotifywait -e close_write -m ~/astroport/films | while read dir flags file; do
-#   ~/.zen/astrXbian/zen/xbian_vstream.sh $path $file
-#done
-# ipfs add new file 
-# create ASTRXBIAN indexes in ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
-# unify swarm indexes in /var/www/astrxbian/${PREFIX}ASTRXBIAN
-# Vstream/Astroport reads ${PREFIX}ASTRXBIAN through http://127.0.0.1:10021/
-# Using Vstream/Pastebin file format
-# https://github.com/Kodi-vStream/venom-xbmc-addons/wiki/Voir-et-partager-sa-biblioth%C3%A8que-priv%C3%A9e#d%C3%A9clarer-des-films
-########################################################################
-## ACTUAL inotifywait ~/astroport/ FILESYSTEM STRUCTURE
-mkdir -p ~/astroport/films
-mkdir -p ~/astroport/animes
-########################################################################
-path="$1"
-file="$2"
-[[ "$file" == "" || "$path" == "" ]] && echo "ERROR. Parameters missing. xbian_vstream.sh file=$file? path=$path?"
-extension="${file##*.}"
-TITLE="${file%.*}"
-
-# GET XZUID
-[[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && echo "ERROR no _xbian.zuid" && exit 1
-XZUID=$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid)
-
-### EXTRACT first letter index file prefix
-# path=/home/xbian/astroport/films/($YEAR)/($RES) TODO !! :: )
-# path=/home/xbian/astroport/series/($YEAR)/$SAISON/$RES) optional
-# Separte in multiple inotifywait?
-
-TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: films / series / ...
-PREFIX=$(echo "$TYPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: F
-YEAR=$(echo "$path" | cut -d '/' -f 6 )
-RES=$(echo "$path" | cut -d '/' -f 7 )
-
-# file is placed in ROOT ~/astroport
-[[ $PREFIX == "" ]] && echo "WARNING. File is in ~/astroport/$file" && PREFIX="_"; TYPE="files"
-
-
-echo "ADDING ${path}${file} IPFS INDEX to ~/.zen/ipfs/xbian/${PREFIX}${XZUID}"
-echo "-----------------------------------------------------------------"
-
-NEWSHARE=$(ipfs add -wq "${path}${file}" | tail -n 1)
-[[ $NEWSHARE == "" ]] && echo "ipfs add ERROR" && exit 1
-echo "CHECK IPFS $file : ipfs ls /ipfs/$NEWSHARE"
-
-echo "UPDATE $TYPE INDEX in ~/.zen/ipfs/xbian/${PREFIX}${XZUID} "
-echo "-----------------------------------------------------------------"
-mkdir -p ~/.zen/ipfs/xbian
-
-# Init ${PREFIX}${XZUID} header
-#[[ ! -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && echo "CAT;TITLE;URLS" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
-[[ ! -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
-
-## CHECK IF $NEWSHARE is NEW, or an already existing file to upgrade?
-isFILEinINDEX=$(grep "$file" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
-isLINKinINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs/xbian/${PREFIX}${XZUID})
-
-# Is it a new file? Add it to INDEX
-if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
-	echo "$TYPE;$TMDB;$YEAR;$TITLE;$SAISON;$GENRES;${XZUID};$RES;http://127.0.0.1:10021/ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
-else
-	if [[ $isFILEinINDEX ]]; then
-		echo "$file already in index" ## File was updated => Change OLDLINK
-		OLDLINK=$(echo $isFILEinINDEX | cut -d "/" -f 5 | tail -n 1)
-		sed -i "s/$OLDLINK/$NEWSHARE/g" ~/.zen/ipfs/xbian/${PREFIX}${XZUID}
-	fi
-	[[ $isLINKinINDEX ]] && echo "$NEWSHARE already in index. DO NOTHING" ## should not happen
-fi
-
-
-########################################################################
-echo "PUBLISH ~/.zen/ipfs to IPNS self for SWARM SHARING"
-echo "-----------------------------------------------------------------"
-MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
-NODEIPNS=$(ipfs name publish --quieter /ipfs/$MIPFS)
-
-echo "NOW SYNCing ALL SWARM..."
-echo "-----------------------------------------------------------------"
-~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh
-
-echo "CREATE my local ${PREFIX}ASTRXBIAN ($TYPE) from ipfs_swarm foudn indexes"
-echo "-----------------------------------------------------------------"
-mkdir -p /tmp/xbian/
-echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS" > /tmp/xbian/${PREFIX}ASTRXBIAN # CREATE INDEX HEADER
-cat ~/.zen/ipfs_swarm/xbian/${PREFIX}* | grep -v -E 'CAT;TMDB' >> /tmp/xbian/${PREFIX}ASTRXBIAN # GET SWARM INDEXES
-cat /tmp/xbian/${PREFIX}ASTRXBIAN | sort | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq # REMOVE DUPLICATE INDEX
-mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq /var/www/astrxbian/${PREFIX}ASTRXBIAN
-
-echo "NEW $TYPE ($file) ADDED."
-echo "INDEX UPDATED : http://127.0.0.1:10021/${PREFIX}ASTRXBIAN"