Merge branch 'master' of https://git.p2p.legal/axiom-team/astrXbian
This commit is contained in:
commit
b5f543220f
|
|
@ -14,7 +14,7 @@
|
|||
# 6. SAISON: Pour les séries, c'est le numéro de saison.
|
||||
# Pour un film, le champ SAISON est utilisé pour renseigner la Saga
|
||||
# 7. GENRES: Action, Aventure, Fantastique, Animation, etc (choix multiple).
|
||||
# 8. GROUPES: Permet de regrouper des films. (choix multiple)
|
||||
# 8. GROUPES: Stocker la clef IPNS du MEDIAKEY.
|
||||
#
|
||||
# https://github.com/Kodi-vStream/venom-xbmc-addons/wiki/Voir-et-partager-sa-biblioth%C3%A8que-priv%C3%A9e#d%C3%A9clarer-des-films
|
||||
########################################################################
|
||||
|
|
@ -35,7 +35,7 @@ URL="$1"
|
|||
|
||||
|
||||
|
||||
[[ $CHOICE == "Web" ]] && CHOICE=$(zenity --entry --width 640 --title="$URL => Astroport" --text="Cette source WEB est à encrigistrer comme " --entry-text="Page" WebSite)
|
||||
[[ $CHOICE == "Web" ]] && CHOICE=$(zenity --entry --width 640 --title="$URL => Astroport" --text="Cette source WEB est à enregistrer comme " --entry-text="Page" WebSite)
|
||||
|
||||
# REMOVE GtkDialog errors for zenity
|
||||
shopt -s expand_aliases
|
||||
|
|
@ -169,14 +169,12 @@ mv "${FILE_PATH}/${FILE_NAME}" "${FILE_PATH}/${YNAME}" && FILE_NAME="${YNAME}"
|
|||
jsonfile=$(ls ${FILE_PATH}/*.json)
|
||||
mv "${jsonfile}" "${FILE_PATH}/video.json"
|
||||
|
||||
GROUPES="_IPNSKEY_" # USE GROUPS TO RECORD IPNS MEDIAKEY
|
||||
|
||||
FILE_RES=$(ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=s=x:p=0 "${FILE_PATH}/${FILE_NAME}" | cut -d "x" -f 2)
|
||||
RES=${FILE_RES%?}0p
|
||||
|
||||
## CREATE "~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt" and video.json
|
||||
URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri)
|
||||
echo "youtube;${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt
|
||||
echo "youtube;${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt
|
||||
|
||||
# _IPFSREPFILEID_ is replaced later
|
||||
|
||||
|
|
@ -193,6 +191,7 @@ rm -Rf ${YTEMP}
|
|||
## httrack all web site
|
||||
[[ ! $(which httrack) ]] && zenity --warning --width ${large} --text "Utilitaire de copie de site web absent.. Lancez la commande 'sudo apt install httrack'" && exit 1
|
||||
echo "httrack --mirror $URL"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
|
||||
|
|
@ -206,7 +205,7 @@ rm -Rf ${YTEMP}
|
|||
[[ ! $(which chromium) ]] && zenity --warning --width ${large} --text "Utilitaire de copie de page web absent.. Lancez la commande 'sudo apt install chromium'" && exit 1
|
||||
cd /tmp/ && rm output.pdf && chromium --headless --no-sandbox --print-to-pdf $URL
|
||||
|
||||
TITLE=$(zenity --entry --width 480 --title "Titre" --text "Indiquez le titre de la vidéo" --entry-text="${URL}")
|
||||
TITLE=$(zenity --entry --width 480 --title "Titre" --text "Indiquez le titre de cette page " --entry-text="${URL}")
|
||||
[[ $TITLE == "" ]] && exit 1
|
||||
FILE_NAME="$(echo "${TITLE}" | detox --inline).pdf" ## TODO make it better
|
||||
|
||||
|
|
@ -218,7 +217,6 @@ rm -Rf ${YTEMP}
|
|||
|
||||
echo "page;${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$FILE_NAME" > ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt
|
||||
|
||||
|
||||
;;
|
||||
|
||||
########################################################################
|
||||
|
|
@ -393,10 +391,6 @@ FILM_GENRES=$(zenity --list --checklist --title="GENRE" --height=${haut}\
|
|||
# FORMAT GENRES ["genre1","genre2"]
|
||||
GENRES="[\"$(echo ${FILM_GENRES} | sed s/\|/\",\"/g)\"]"
|
||||
|
||||
# VIDEO GROUP
|
||||
# GROUPES=$(zenity --entry --width 300 --title "Groupe" --text "Associez la vidéo à un groupe (optionnel). Exemple: PIXAR" --entry-text="${AXID}")
|
||||
GROUPES="_IPNSKEY_" # USE GROUPES TO RECORD MEDIAKEY
|
||||
|
||||
# DEBUG VERIFICATION
|
||||
# zenity --question --width ${large} --title "EMBARQUEMENT ASTROPORT! OK?"\
|
||||
# --text "${FILE_NAME} (${CAT};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES})"
|
||||
|
|
@ -417,7 +411,7 @@ FILE_NAME="${TITLE}.${FILE_EXT}"
|
|||
|
||||
## CREATE "~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt"
|
||||
URLENCODE_FILE_NAME=$(echo ${FILE_NAME} | jq -Rr @uri)
|
||||
echo "${CAT};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};${GROUPES};${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt
|
||||
echo "${CAT};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME" > ~/astroport/${CAT}/${MEDIAID}/ajouter_video.txt
|
||||
# _IPFSREPFILEID_ is replaced later
|
||||
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
########################################################################
|
||||
# Author:
|
||||
# Author:
|
||||
# Version: 0.1
|
||||
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
|
||||
########################################################################
|
||||
|
|
@ -20,50 +20,50 @@ read
|
|||
########################################################################
|
||||
|
||||
for FRIEND in $(ls ~/.zen/ipfs/.$IPFSNODEID/FRIENDS); do
|
||||
[[ "$FRIEND" == "index.html" ]] && continue
|
||||
echo "$FRIEND ?"
|
||||
[[ "$FRIEND" == "index.html" ]] && continue
|
||||
echo "$FRIEND ?"
|
||||
|
||||
for MEDIAKEY in $(ls ~/.zen/ipfs/.$IPFSNODEID/KEY); do
|
||||
echo "MEDIAKEY=$MEDIAKEY"
|
||||
## Do I have this IPNS key?
|
||||
ISKEY=$(ipfs key list -l | grep "$MEDIAKEY.4FRIENDS" | cut -d ' ' -f 2)
|
||||
echo "ISKEY=$ISKEY"
|
||||
## Is there any key already from swarm for that MEDIAKEY
|
||||
PREVKEY=$(ls ~/.zen/ipfs_swarm/.12D*/KEY/$MEDIAKEY/*/$G1PUB/ 2>/dev/null)
|
||||
echo "PREVKEY=$ISKEY"
|
||||
## A key is found in my swam
|
||||
if [[ $PREVKEY ]]; then
|
||||
echo "I found a MEDIAKEY for $MEDIAKEY : $PREVKEY"
|
||||
## Do I have it localy available?
|
||||
if [[ ! $ISKEY ]]; then
|
||||
echo "don't have it local..."
|
||||
# decrypting PREVKEY to my ipfs keystore
|
||||
$MY_PATH/tools/natools.py decrypt -f pubsec -k "$HOME/.zen/secret.dunikey" -i "~/.zen/ipfs_swarm/.12D*/KEY/$MEDIAKEY/*/$G1PUB/$PREVKEY" -o "$HOME/.ipfs/keystore/${PREVKEY%.*}"
|
||||
## Checking if ipfs deamon have it
|
||||
ISKEY=$(ipfs key list -l | grep "$MEDIAKEY.4FRIENDS" | cut -d ' ' -f 2)
|
||||
echo ".ipfs/keystore/${PREVKEY%.*} added..."
|
||||
[[ ! $ISKEY ]] && echo "Restarting ipfs..." && sudo service ipfs restart
|
||||
fi
|
||||
## Station is Not spreading swarm key... just getting it back.
|
||||
continue
|
||||
fi
|
||||
for MEDIAKEY in $(ls ~/.zen/ipfs/.$IPFSNODEID/KEY); do
|
||||
echo "MEDIAKEY=$MEDIAKEY"
|
||||
## Do I have this IPNS key?
|
||||
ISKEY=$(ipfs key list -l | grep "$MEDIAKEY.4FRIENDS" | cut -d ' ' -f 2)
|
||||
echo "ISKEY=$ISKEY"
|
||||
## Is there any key already from swarm for that MEDIAKEY
|
||||
PREVKEY=$(ls ~/.zen/ipfs_swarm/.12D*/KEY/$MEDIAKEY/*/$G1PUB/ 2>/dev/null)
|
||||
echo "PREVKEY=$ISKEY"
|
||||
## A key is found in my swam
|
||||
if [[ $PREVKEY ]]; then
|
||||
echo "I found a MEDIAKEY for $MEDIAKEY : $PREVKEY"
|
||||
## Do I have it localy available?
|
||||
if [[ ! $ISKEY ]]; then
|
||||
echo "don't have it local..."
|
||||
# decrypting PREVKEY to my ipfs keystore
|
||||
$MY_PATH/tools/natools.py decrypt -f pubsec -k "$HOME/.zen/secret.dunikey" -i "~/.zen/ipfs_swarm/.12D*/KEY/$MEDIAKEY/*/$G1PUB/$PREVKEY" -o "$HOME/.ipfs/keystore/${PREVKEY%.*}"
|
||||
## Checking if ipfs deamon have it
|
||||
ISKEY=$(ipfs key list -l | grep "$MEDIAKEY.4FRIENDS" | cut -d ' ' -f 2)
|
||||
echo ".ipfs/keystore/${PREVKEY%.*} added..."
|
||||
[[ ! $ISKEY ]] && echo "Restarting ipfs..." && sudo service ipfs restart
|
||||
fi
|
||||
## Station is Not spreading swarm key... just getting it back.
|
||||
continue
|
||||
fi
|
||||
|
||||
echo "~/.zen/ipfs/.$IPFSNODEID/KEY/$MEDIAKEY/$G1PUB/$FRIEND/"
|
||||
## No swarm or local MEDIAKEY, we are the first $MEDIAKEY creator in the swarm
|
||||
[[ ! $ISKEY ]] && echo "Creating $MEDIAKEY.4FRIENDS IPNS key" && IPNSKEY=$(ipfs key gen "$MEDIAKEY.4FRIENDS") && IPNSKEYFILE=$(ls -t ~/.ipfs/keystore/ | head -n 1)
|
||||
echo "~/.zen/ipfs/.$IPFSNODEID/KEY/$MEDIAKEY/$G1PUB/$FRIEND/"
|
||||
## No swarm or local MEDIAKEY, we are the first $MEDIAKEY creator in the swarm
|
||||
[[ ! $ISKEY ]] && echo "Creating $MEDIAKEY.4FRIENDS IPNS key" && IPNSKEY=$(ipfs key gen "$MEDIAKEY.4FRIENDS") && IPNSKEYFILE=$(~/.zen/astrXbian/zen/tools/give_me_keystore_filename.py "$MEDIAKEY.4FRIENDS")
|
||||
|
||||
## Sending encrypted MEDIAKEY to my swarm (sign if you want more security, but code ipfs signature verification is enough and better)
|
||||
if [[ ! -d ~/.zen/ipfs/.$IPFSNODEID/KEY/$MEDIAKEY/$G1PUB/$FRIEND/ ]]; then
|
||||
echo "MEDIAKEY $MEDIAKEY is missing to my $FRIEND"
|
||||
mkdir -p "~/.zen/ipfs/.$IPFSNODEID/KEY/$MEDIAKEY/$G1PUB/$FRIEND/"
|
||||
$MY_PATH/tools/natools.py encrypt -p $FRIEND -i "~/.ipfs/keystore/$IPNSKEYFILE" -o "~/.zen/ipfs/.$IPFSNODEID/KEY/$MEDIAKEY/$G1PUB/$FRIEND/$IPNSKEYFILE.encrypt"
|
||||
echo "Spreading ~/.zen/ipfs/.$IPFSNODEID/KEY/$MEDIAKEY/$G1PUB/$FRIEND/$IPNSKEYFILE.encrypt"
|
||||
fi
|
||||
|
||||
## TODO : CHECK FOR DISAPEARED FRIENDS.
|
||||
read
|
||||
|
||||
done
|
||||
read
|
||||
## Sending encrypted MEDIAKEY to my swarm (sign if you want more security, but code ipfs signature verification is enough and better)
|
||||
if [[ ! -d ~/.zen/ipfs/.$IPFSNODEID/KEY/$MEDIAKEY/$G1PUB/$FRIEND/ ]]; then
|
||||
echo "MEDIAKEY $MEDIAKEY is missing to my $FRIEND"
|
||||
mkdir -p "~/.zen/ipfs/.$IPFSNODEID/KEY/$MEDIAKEY/$G1PUB/$FRIEND/"
|
||||
$MY_PATH/tools/natools.py encrypt -p $FRIEND -i "~/.ipfs/keystore/$IPNSKEYFILE" -o "~/.zen/ipfs/.$IPFSNODEID/KEY/$MEDIAKEY/$G1PUB/$FRIEND/$IPNSKEYFILE.encrypt"
|
||||
echo "Spreading ~/.zen/ipfs/.$IPFSNODEID/KEY/$MEDIAKEY/$G1PUB/$FRIEND/$IPNSKEYFILE.encrypt"
|
||||
fi
|
||||
|
||||
## TODO : CHECK FOR DISAPEARED FRIENDS.
|
||||
read
|
||||
|
||||
done
|
||||
read
|
||||
|
||||
done
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ done
|
|||
########################################################################
|
||||
## FIND LOCAL IPFS NODE - SERACH FOR FOAF stargate replications
|
||||
########################################################################
|
||||
# SUBNET=$(ip route | tail -n 3 | cut -d ' ' -f 1)
|
||||
# SUBNET=$(ip route | head -n 3 | tail -n 1 | cut -d ' ' -f 1)
|
||||
# [[ ! $(which nmap) ]] && sudo apt-get install nmap -y && nmap --open -p 4001 $SUBNET
|
||||
########################################################################
|
||||
########################################################################
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
########################################################################
|
||||
# Author:
|
||||
# Author:
|
||||
# Version: 0.1
|
||||
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
|
||||
########################################################################
|
||||
|
|
@ -25,16 +25,17 @@ IPFSNODEID=$(ipfs id -f='<id>\n')
|
|||
## ipns key generation procedure
|
||||
########################################################################
|
||||
if [[ ! $(ipfs key list -l | grep "star_") ]]; then
|
||||
[[ ! -d ~/.zen/key/ ]] && mkdir -p ~/.zen/key/1 ~/.zen/key/2 ~/.zen/key/3 ~/.zen/key/4 ~/.zen/key/5
|
||||
stargate_1=$(ipfs key gen star_1) && key_1=$(ls -t ~/.ipfs/keystore/ | head -n 1) && cp ~/.ipfs/keystore/$key_1 ~/.zen/key/1/ && echo "$stargate_1" > ~/.zen/key/1/stargate
|
||||
stargate_2=$(ipfs key gen star_2) && key_2=$(ls -t ~/.ipfs/keystore/ | head -n 1) && cp ~/.ipfs/keystore/$key_2 ~/.zen/key/2/ && echo "$stargate_2" > ~/.zen/key/2/stargate
|
||||
stargate_3=$(ipfs key gen star_3) && key_3=$(ls -t ~/.ipfs/keystore/ | head -n 1) && cp ~/.ipfs/keystore/$key_3 ~/.zen/key/3/ && echo "$stargate_3" > ~/.zen/key/3/stargate
|
||||
stargate_4=$(ipfs key gen star_4) && key_4=$(ls -t ~/.ipfs/keystore/ | head -n 1) && cp ~/.ipfs/keystore/$key_4 ~/.zen/key/4/ && echo "$stargate_4" > ~/.zen/key/4/stargate
|
||||
stargate_5=$(ipfs key gen star_5) && key_5=$(ls -t ~/.ipfs/keystore/ | head -n 1) && cp ~/.ipfs/keystore/$key_5 ~/.zen/key/5/ && echo "$stargate_5" > ~/.zen/key/5/stargate
|
||||
[[ ! -d ~/.zen/key/ ]] && mkdir -p ~/.zen/key/1 ~/.zen/key/2 ~/.zen/key/3 ~/.zen/key/4 ~/.zen/key/5
|
||||
# TODO key name are always the same... =$(~/.zen/astrXbian/zen/tools/give_me_keystore_filename.py "star_1")
|
||||
stargate_1=$(ipfs key gen star_1) && key_1=$(ls -t ~/.ipfs/keystore/ | head -n 1) && cp ~/.ipfs/keystore/$key_1 ~/.zen/key/1/ && echo "$stargate_1" > ~/.zen/key/1/stargate
|
||||
stargate_2=$(ipfs key gen star_2) && key_2=$(ls -t ~/.ipfs/keystore/ | head -n 1) && cp ~/.ipfs/keystore/$key_2 ~/.zen/key/2/ && echo "$stargate_2" > ~/.zen/key/2/stargate
|
||||
stargate_3=$(ipfs key gen star_3) && key_3=$(ls -t ~/.ipfs/keystore/ | head -n 1) && cp ~/.ipfs/keystore/$key_3 ~/.zen/key/3/ && echo "$stargate_3" > ~/.zen/key/3/stargate
|
||||
stargate_4=$(ipfs key gen star_4) && key_4=$(ls -t ~/.ipfs/keystore/ | head -n 1) && cp ~/.ipfs/keystore/$key_4 ~/.zen/key/4/ && echo "$stargate_4" > ~/.zen/key/4/stargate
|
||||
stargate_5=$(ipfs key gen star_5) && key_5=$(ls -t ~/.ipfs/keystore/ | head -n 1) && cp ~/.ipfs/keystore/$key_5 ~/.zen/key/5/ && echo "$stargate_5" > ~/.zen/key/5/stargate
|
||||
else
|
||||
ipfs key list -l | grep "star_"
|
||||
echo "IPNS star keys already existing... Please remove all 'star_*' ipns keys before running"
|
||||
exit 1
|
||||
ipfs key list -l | grep "star_"
|
||||
echo "IPNS star keys already existing... Please remove all 'star_*' ipns keys before running"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "******************************************************************"
|
||||
|
|
@ -49,49 +50,49 @@ echo "******************************************************************"
|
|||
## ipns 5 stargates keys distribution to friends
|
||||
########################################################################
|
||||
for friendgate in $(ls -d ~/.zen/ipfs/.$IPFSNODEID/FRIENDS/*/); do
|
||||
echo "*************************************************************"
|
||||
fg1pub=$(echo $friendgate | cut -d '/' -f 8 )
|
||||
stars=$(cat ${friendgate}stars.level)
|
||||
echo "OPENING $stars STARGATES"
|
||||
echo "FRIEND : $fg1pub"
|
||||
echo "$friendgate"
|
||||
echo "*************************************************************"
|
||||
fg1pub=$(echo $friendgate | cut -d '/' -f 8 )
|
||||
stars=$(cat ${friendgate}stars.level)
|
||||
echo "OPENING $stars STARGATES"
|
||||
echo "FRIEND : $fg1pub"
|
||||
echo "$friendgate"
|
||||
|
||||
[[ "$stars" == "" && "$fg1pub" != "" ]] && echo "NO STAR NO FRIEND" && rm -Rf ~/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub && continue
|
||||
[[ "$stars" == "" && "$fg1pub" != "" ]] && echo "NO STAR NO FRIEND" && rm -Rf ~/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub && continue
|
||||
|
||||
# DELETE OLD TRANSMITED STARGATES IPNS LINKS
|
||||
rm -f ~/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate*
|
||||
|
||||
# DISTRIBUTE ENCRYPT AND PUBLISH NEW STARGATES KEY
|
||||
case $stars in
|
||||
1)
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/1/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate1.encrypt"
|
||||
;;
|
||||
2)
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/1/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate1.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/2/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate2.encrypt"
|
||||
;;
|
||||
3)
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/1/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate1.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/2/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate2.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/3/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate3.encrypt"
|
||||
;;
|
||||
4)
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/1/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate1.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/2/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate2.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/3/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate3.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/4/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate4.encrypt"
|
||||
;;
|
||||
5)
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/1/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate1.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/2/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate2.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/3/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate3.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/4/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate4.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/5/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate5.encrypt"
|
||||
;;
|
||||
esac
|
||||
ls ~/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/
|
||||
echo "http://127.0.0.1:8181/ipns/$IPFSNODEID/.$IPFSNODEID/FRIENDS/$fg1pub/"
|
||||
echo ""
|
||||
# DELETE OLD TRANSMITED STARGATES IPNS LINKS
|
||||
rm -f ~/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate*
|
||||
|
||||
# DISTRIBUTE ENCRYPT AND PUBLISH NEW STARGATES KEY
|
||||
case $stars in
|
||||
1)
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/1/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate1.encrypt"
|
||||
;;
|
||||
2)
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/1/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate1.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/2/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate2.encrypt"
|
||||
;;
|
||||
3)
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/1/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate1.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/2/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate2.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/3/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate3.encrypt"
|
||||
;;
|
||||
4)
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/1/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate1.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/2/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate2.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/3/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate3.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/4/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate4.encrypt"
|
||||
;;
|
||||
5)
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/1/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate1.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/2/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate2.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/3/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate3.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/4/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate4.encrypt"
|
||||
$MY_PATH/tools/natools.py encrypt -p $fg1pub -i ~/.zen/key/5/stargate -o "$HOME/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/stargate5.encrypt"
|
||||
;;
|
||||
esac
|
||||
ls ~/.zen/ipfs/.$IPFSNODEID/FRIENDS/$fg1pub/
|
||||
echo "http://127.0.0.1:8181/ipns/$IPFSNODEID/.$IPFSNODEID/FRIENDS/$fg1pub/"
|
||||
echo ""
|
||||
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -154,7 +154,8 @@ if [[ ! $(ipfs key list | grep "${MEDIAKEY}") ]]; then
|
|||
## IPNS KEY CREATION
|
||||
mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}
|
||||
KEY=$(ipfs key gen "${MEDIAKEY}")
|
||||
KEYFILE=$(ls -t ~/.ipfs/keystore/ | head -n 1)
|
||||
# KEYFILE=$(ls -t ~/.ipfs/keystore/ | head -n 1) # get name of last created key (could be fooled during stargate exchange)
|
||||
KEYFILE=$(~/.zen/astrXbian/zen/tools/give_me_keystore_filename.py "${MEDIAKEY}") # better method applied
|
||||
fi
|
||||
|
||||
## IS IT NEW IPNS KEY?
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail
|
|||
IPFSNODEID=$(ipfs id -f='<id>\n')
|
||||
G1PUB=$(cat ~/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
|
||||
|
||||
## RUN FROM ./zen/gchange_INIT.sh
|
||||
## >>>>>>>>>>>>> Called from ./zen/gchange_INIT.sh <<<<<<<<<<<<<<<<<<<<<<<
|
||||
# This script is called to manage SWARM autoPIN
|
||||
# Actual behaviour is to accept anything from
|
||||
# SOURCE: ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.ipfsid.encrypt (new_file_in_astroport.sh)
|
||||
|
|
@ -26,6 +26,7 @@ for astrofile in $(ls -dt ~/.zen/ipfs_swarm/.12D*/KEY/*/*/${G1PUB}/.ipfsid.encry
|
|||
do
|
||||
astrofilelinksec=$(echo "$astrofile" | sed "s/.ipfsid.encrypt/.ipfs.filelink.encrypt/g")
|
||||
# decrypt $astrofile
|
||||
# /home/fred/.zen/ipfs_swarm/.12D3KooWJAQuoRt4HV8BYrmTfpws7gBGBSgSArap9uwAaHVDzru7/KEY/TMDB_100271/9M3k4JJM6arh8yG33ECXLt6Rh7do9AWLCKa9CJLL6vBB/HbBJDXDrN8swxvMohMxmegYRyZ7m99jqgxwwN1gwxck2/.ipfsid.encrypt
|
||||
mediakey=$(echo "$astrofile" | cut -d '/' -f 8 )
|
||||
keytype=$(echo "$mediakey" | cut -d '_' -f 1 )
|
||||
mediaid=$(echo "$mediakey" | cut -d '_' -f 2- )
|
||||
|
|
|
|||
Loading…
Reference in New Issue