PAGE is now recorded in Astroport as pdf + tiddler.json ready to load

This commit is contained in:
fred 2022-04-22 17:15:18 +02:00
parent 22b006ea9f
commit 50583fc411
2 changed files with 37 additions and 23 deletions

View File

@ -234,7 +234,7 @@ rm -Rf ${YTEMP}
# CASE ## PAGE
page)
zenity --warning --width 600 --text 'DEVELOPPEMENT . ZONE . Please Participate https://git.p2p.legal'
zenity --warning --width 600 --text 'DEV . ZONE . Please Participate https://git.p2p.legal'
## record one page to PDF
[[ ! $(which chromium) ]] && zenity --warning --width ${large} --text "Utilitaire de copie de page web absent.. Lancez la commande 'sudo apt install chromium'" && exit 1
@ -549,35 +549,27 @@ echo "new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_N
timestamp=$(date -u +%s%N | cut -b1-13)
## Creation json tiddler
echo '[
{
"text": "",
"title": "'${TITLE}'",
"type": "video/mp4",
"tags": "$:/isAttachment $:/isIpfs",
"_canonical_uri": "/ipfs/_IPFS_"
}
]
' > ~/astroport/Add_${MEDIAKEY}_tittler.json
[[ $CHOICE == "TMDB" ]] && echo "MEDIAKEY=${MEDIAKEY}
echo \"Encoder ${FILE_NAME} en h265 avant import ? Tapez sur ENTER pour continuer sans...\"
echo "MEDIAKEY=${MEDIAKEY}" > ~/astroport/Add_${MEDIAKEY}_script.sh
[[ $CHOICE == "TMDB" ]] && echo "\"Encoder ${FILE_NAME} en h265 avant import ? Tapez sur ENTER pour continuer sans...\"
read reponse
if [[ \$reponse ]]; then
ffmpeg -i \"$HOME/astroport/${CAT}/${MEDIAID}/${FILE_NAME}\" -vcodec libx265 -crf 28 $HOME/astroport/${MEDIAID}.mp4
mv \"$HOME/astroport/${CAT}/${MEDIAID}/${FILE_NAME}\" \"$HOME/astroport/${CAT}/${MEDIAID}/${FILE_NAME}.old\"
mv $HOME/astroport/${MEDIAID}.mp4 \"$HOME/astroport/${CAT}/${MEDIAID}/${FILE_NAME}.mp4\"
~/.zen/astrXbian/zen/new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}.mp4\"
else
~/.zen/astrXbian/zen/new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\"
fi
rm -f /tmp/\${MEDIAKEY}.pass
else" >> ~/astroport/Add_${MEDIAKEY}_script.sh
echo " ~/.zen/astrXbian/zen/new_file_in_astroport.sh \"$HOME/astroport/${CAT}/${MEDIAID}/\" \"${FILE_NAME}\" " >> ~/astroport/Add_${MEDIAKEY}_script.sh
[[ $CHOICE == "TMDB" ]] && echo "fi" >> ~/astroport/Add_${MEDIAKEY}_script.sh
echo "rm -f /tmp/\${MEDIAKEY}.pass
rm -f /tmp/\${MEDIAKEY}.dunikey ## REMOVE KEYS
echo 'Si tout est OK, appuyez dur ENTER, sinon ESC'
read finish
rm ~/astroport/Add_${MEDIAKEY}_script.sh
" > ~/astroport/Add_${MEDIAKEY}_script.sh
" >> ~/astroport/Add_${MEDIAKEY}_script.sh

View File

@ -51,9 +51,11 @@ TITLE="${file%.*}"
# GET XZUID
[[ -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title ]] && XZUID=$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title) || XZUID=$(cat /etc/hostname)
[[ ! $(echo "$path" | cut -d '/' -f 4 | grep 'astroport') ]] && er="Les fichiers sont à placer dans ~/astroport/ MERCI" && echo "$er" && exit 1
TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: /home/$YOU/astroport/... TYPE(film, youtube, mp3, video)/ REFERENCE /
TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: /home/$YOU/astroport/... TYPE(film, youtube, mp3, video, page)/ REFERENCE /
CAT=$(echo "$TYPE" | awk '{ print tolower($0) }')
echo $CAT
PREFIX=$(echo "$TYPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: F, Y, M ou Y
# File is placed in ROOT ~/astroport ?
if [[ $PREFIX == "" ]]
@ -78,6 +80,12 @@ case ${CAT} in
REFERENCE=$(echo "$path" | cut -d '/' -f 6 )
TITLE="${file%.*}"
;;
page)
## DIFFERENT TREATMENT
INDEXPREFIX="PAGE_"
REFERENCE=$(echo "$path" | cut -d '/' -f 6 )
TITLE="${file%.*}"
;;
mp3)
## DIFFERENT TREATMENT
INDEXPREFIX="MP3_"
@ -361,10 +369,10 @@ IPNS=$(ipfs name publish --quieter --key="${MEDIAKEY}" $NEWIPFS)
########################################################################
# film/serie PUBLISH "ajouter_video.txt" for KODI
########################################################################
if [[ "${CAT}" =~ ^(film|serie|youtube)$ ]]
if [[ "${CAT}" =~ ^(film|serie|youtube|page)$ ]]
then
## CREATE GCHANGE AD
if [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad && "${CAT}" != "youtube" ]]
if [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad && "${CAT}" != "youtube" && "${CAT}" != "page" ]]
then
GOFFER=$(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" setoffer -t "${TITLE} #astroport #${MEDIAKEY}" -d "${TITLE} https://tube.copylaradio.com/ipns/$IPNS/ Faites un don à son portefeuille pour le conserver dans le Mediacenter des Amis - https://CopyLaRadio.com - https://astroport.com" -p $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/QR.png)
@ -397,12 +405,26 @@ then
echo "$line" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/ajouter_video.txt
## UPDATE SOURCE ajouter_video.txt FILE
cp -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/ajouter_video.txt ~/astroport/${TYPE}/${REFERENCE}/ajouter_video.txt
########################################################################
## TODO: ACTIVATE SUB DEFCON 4 MODE = encrypt/decrypt file in $G1DEST subdirectory
########################################################################
echo "----------------- REFRESH LOCAL KODI INDEX ----------------------"
cat ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN ~/.zen/ipfs_swarm/.12D*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
MIME=$(file --mime-type ${path}${file} | cut -d ' ' -f 2)
echo "## Creation json tiddler"
echo '[
{
"text": "",
"title": "'${TITLE}'",
"type": "'$MIME'",
"tags": "$:/isAttachment $:/isIpfs",
"_canonical_uri": "/ipfs/'$IPFSREPFILEID'/'$URLENCODE_FILE_NAME'"
}
]
' > ~/astroport/${TYPE}/${REFERENCE}/${MEDIAKEY}.tiddler.json
fi
########################################################################