MEDIAKEY=${INDEXPREFIX}${REFERENCE} + encode for G1PUB
This commit is contained in:
parent
899cf88a7e
commit
36696f231f
|
|
@ -96,30 +96,31 @@ case ${CAT} in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
MEDIAKEY="${INDEXPREFIX}${REFERENCE}"
|
||||||
########################################################################
|
########################################################################
|
||||||
## CHECK if ${INDEXPREFIX}${REFERENCE} MEDIAKEY exists -> REFRESH DATA
|
## CHECK if MEDIAKEY exists -> REFRESH DATA
|
||||||
########################################################################
|
########################################################################
|
||||||
echo "SEARCH for ;$REFERENCE; in ${PREFIX}ASTRXBIAN"
|
echo "SEARCH for ;$REFERENCE; in ${PREFIX}ASTRXBIAN"
|
||||||
if [[ ${REFERENCE:0:1} != "0" ]]; then ## REFERENCE COULD BE A PHONE NUMBER (not in TMDB copy force)
|
if [[ ${REFERENCE:0:1} != "0" ]]; then ## REFERENCE COULD BE A PHONE NUMBER (not in TMDB copy force)
|
||||||
isREFERENCEinINDEX=$(grep ";$REFERENCE;" ~/.zen/ipfs_swarm/.12D*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN )
|
isREFERENCEinINDEX=$(grep ";$REFERENCE;" ~/.zen/ipfs_swarm/.12D*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN )
|
||||||
if [[ ${isREFERENCEinINDEX} ]]
|
if [[ ${isREFERENCEinINDEX} ]]
|
||||||
then
|
then
|
||||||
if [[ -d ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB} ]]
|
if [[ -d ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB} ]]
|
||||||
then
|
then
|
||||||
# FILE IS MINE, NEW VERSION?! replacing it in INDEX
|
# FILE IS MINE, NEW VERSION?! replacing it in INDEX
|
||||||
ipnslink=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipns.link)
|
ipnslink=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.ipns.link)
|
||||||
echo "FOUND IPNS ${INDEXPREFIX}${REFERENCE} = $ipnslink"
|
echo "FOUND IPNS ${MEDIAKEY} = $ipnslink"
|
||||||
|
|
||||||
# DELETING GCHANGE AD, WILL BE CREATED AGAIN
|
# DELETING GCHANGE AD, WILL BE CREATED AGAIN
|
||||||
gchangeAD=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gchange.ad)
|
gchangeAD=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad)
|
||||||
~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" deleteoffer -i $gchangeAD
|
~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" deleteoffer -i $gchangeAD
|
||||||
rm ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gchange.ad
|
rm ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad
|
||||||
else
|
else
|
||||||
er="$er | FILE IS ALREADY EXISTING FROM ANOTHER FRIEND" && echo "$er"
|
er="$er | FILE IS ALREADY EXISTING FROM ANOTHER FRIEND" && echo "$er"
|
||||||
## SEND messages to warn about need to Unify MEDIAKEY IPNS KEY
|
## SEND messages to warn about need to Unify MEDIAKEY IPNS KEY
|
||||||
ipfsnodeid=$(echo ${isREFERENCEinINDEX} | tail -n 1 | cut -d '.' -f 3- | cut -d '/' -f 1)
|
ipfsnodeid=$(echo ${isREFERENCEinINDEX} | tail -n 1 | cut -d '.' -f 3- | cut -d '/' -f 1)
|
||||||
destg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid)
|
destg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid)
|
||||||
[[ "$IPFSNODEID" != "$ipfsnodeid" ]] && ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" send -d $destg1 -t "MEDIAKEY COLLISION ${INDEXPREFIX}${REFERENCE}" -m "Conflit de MEDIAKEY. Choisir quelle clef IPNS conserver..."
|
[[ "$IPFSNODEID" != "$ipfsnodeid" ]] && ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" send -d $destg1 -t "MEDIAKEY COLLISION ${MEDIAKEY}" -m "Conflit de MEDIAKEY. Choisir quelle clef IPNS conserver..."
|
||||||
##
|
##
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
@ -143,44 +144,44 @@ URLENCODE_FILE_NAME=$(echo ${file} | jq -Rr @uri)
|
||||||
|
|
||||||
### MEDIAKEY FORGE
|
### MEDIAKEY FORGE
|
||||||
########################################################################
|
########################################################################
|
||||||
## CREATE NEW ipns KEY : ${INDEXPREFIX}${REFERENCE}
|
## CREATE NEW ipns KEY : ${MEDIAKEY}
|
||||||
########################################################################
|
########################################################################
|
||||||
## IPFS SELF IPNS DATA STORAGE
|
## IPFS SELF IPNS DATA STORAGE
|
||||||
## ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/
|
## ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/
|
||||||
########################################################################
|
########################################################################
|
||||||
if [[ ! $(ipfs key list | grep "${INDEXPREFIX}${REFERENCE}") ]]; then
|
if [[ ! $(ipfs key list | grep "${MEDIAKEY}") ]]; then
|
||||||
## IPNS KEY CREATION
|
## IPNS KEY CREATION
|
||||||
mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}
|
mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}
|
||||||
KEY=$(ipfs key gen "${INDEXPREFIX}${REFERENCE}")
|
KEY=$(ipfs key gen "${MEDIAKEY}")
|
||||||
KEYFILE=$(ls -t ~/.ipfs/keystore/ | head -n 1)
|
KEYFILE=$(ls -t ~/.ipfs/keystore/ | head -n 1)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## IS IT NEW IPNS KEY?
|
## IS IT NEW IPNS KEY?
|
||||||
if [[ $KEY ]]; then
|
if [[ $KEY ]]; then
|
||||||
# memorize IPNS key filename for easiest exchange
|
# memorize IPNS key filename for easiest exchange
|
||||||
echo "$KEYFILE" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipns.key.keystore_filename
|
echo "$KEYFILE" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.ipns.key.keystore_filename
|
||||||
# Publishing IPNS key
|
# Publishing IPNS key
|
||||||
echo "$KEY" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipns.link
|
echo "$KEY" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.ipns.link
|
||||||
# CREATE .zen = ZEN economic value
|
# CREATE .zen = ZEN economic value
|
||||||
touch ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.zen
|
touch ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.zen
|
||||||
# CREATE other encrypted copies for friends depending DEFCON & stars
|
# CREATE other encrypted copies for friends depending DEFCON & stars
|
||||||
# > STARGATE 1 - 2 - 3 - 4 - 5 !!
|
# > STARGATE 1 - 2 - 3 - 4 - 5 !!
|
||||||
################ ENCRYPT keystore/$KEYFILE
|
################ ENCRYPT keystore/$KEYFILE
|
||||||
else
|
else
|
||||||
## OLD IPNS KEY
|
## OLD IPNS KEY
|
||||||
KEY=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipns.link)
|
KEY=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.ipns.link)
|
||||||
KEYFILE=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipns.key.keystore_filename)
|
KEYFILE=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.ipns.key.keystore_filename)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[[ ! $KEY ]] && echo "FATAL ERROR" && exit 1
|
[[ ! $KEY ]] && echo "FATAL ERROR" && exit 1
|
||||||
########################################################################
|
########################################################################
|
||||||
## add default metadata (TODO = use json file?)
|
## add default metadata (TODO = use json file?)
|
||||||
########################################################################
|
########################################################################
|
||||||
echo "${file}" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipfs.filename
|
echo "${file}" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.ipfs.filename
|
||||||
echo "${TITLE}" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.title
|
echo "${TITLE}" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.title
|
||||||
echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.timestamp
|
echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.timestamp
|
||||||
## INIT MEDIAKEY .views.counter
|
## INIT MEDIAKEY .views.counter
|
||||||
echo "0" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.views.counter
|
echo "0" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.views.counter
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
@ -199,43 +200,47 @@ PINnode=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $nodeid)
|
||||||
|
|
||||||
echo "ASK AUTOPIN to $PINnode"
|
echo "ASK AUTOPIN to $PINnode"
|
||||||
## CREATE $PINnode IPFS communication directory
|
## CREATE $PINnode IPFS communication directory
|
||||||
[[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode} ]] && mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}
|
[[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/${PINnode} ]] && mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/${PINnode}
|
||||||
## ENCRYPT .ipfsid & .ipfs.filelink
|
## ENCRYPT .ipfsid & .ipfs.filelink
|
||||||
$MY_PATH/tools/natools.py encrypt -p $PINnode -i /tmp/.ipfs.filelink -o "~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.ipfs.filelink.encrypt"
|
$MY_PATH/tools/natools.py encrypt -p $PINnode -i /tmp/.ipfs.filelink -o "~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/${PINnode}/.ipfs.filelink.encrypt"
|
||||||
$MY_PATH/tools/natools.py encrypt -p $PINnode -i /tmp/.ipfsid -o "~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.ipfsid.encrypt"
|
$MY_PATH/tools/natools.py encrypt -p $PINnode -i /tmp/.ipfsid -o "~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/${PINnode}/.ipfsid.encrypt"
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
## GREAT natools can convert IPNS MEDIAKEY into .dunikey file
|
## GREAT natools can convert IPNS MEDIAKEY into .dunikey file
|
||||||
########################################################################
|
########################################################################
|
||||||
# CREATING QRCODE
|
# CREATING QRCODE
|
||||||
$MY_PATH/tools/natools.py privkey -f ipfs-keystore -k $HOME/.ipfs/keystore/$KEYFILE -F pubsec -o /tmp/${INDEXPREFIX}${REFERENCE}.dunikey
|
$MY_PATH/tools/natools.py privkey -f ipfs-keystore -k $HOME/.ipfs/keystore/$KEYFILE -F pubsec -o /tmp/${MEDIAKEY}.dunikey
|
||||||
# PubFromDunikey=$(cat /tmp/${INDEXPREFIX}${REFERENCE}.dunikey | grep "sec" | cut -d ' ' -f2 | base58 -d | tail -c+33 | base58)
|
# PubFromDunikey=$(cat /tmp/${MEDIAKEY}.dunikey | grep "sec" | cut -d ' ' -f2 | base58 -d | tail -c+33 | base58)
|
||||||
PubFromDunikey=$(cat /tmp/${INDEXPREFIX}${REFERENCE}.dunikey | grep "pub" | cut -d ' ' -f2)
|
PubFromDunikey=$(cat /tmp/${MEDIAKEY}.dunikey | grep "pub" | cut -d ' ' -f2)
|
||||||
qrencode -s 6 -o "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/QR.png" "$PubFromDunikey"
|
qrencode -s 6 -o "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/QR.png" "$PubFromDunikey"
|
||||||
|
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
## MEDIAKEY => DUNIKEY / 6 DIGITS openssl protection
|
## MEDIAKEY => DUNIKEY / 6 DIGITS openssl protection
|
||||||
########################################################################
|
########################################################################
|
||||||
PASS=$(echo "000000${RANDOM:0:6}" | tail -c-7) && echo "$PASS" > /tmp/${INDEXPREFIX}${REFERENCE}.pass
|
PASS=$(echo "000000${RANDOM:0:6}" | tail -c-7) && echo "$PASS" > /tmp/${MEDIAKEY}.pass
|
||||||
openssl enc -aes-256-cbc -salt -in /tmp/${INDEXPREFIX}${REFERENCE}.dunikey -out "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/dunikey.enc" -k $PASS
|
openssl enc -aes-256-cbc -salt -in /tmp/${MEDIAKEY}.dunikey -out "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/dunikey.enc" -k $PASS
|
||||||
# DECODE openssl enc -aes-256-cbc -d -in file.txt.enc -out file.txt -k $PASS
|
|
||||||
|
|
||||||
## STATION & BOOTSTRAP ACCESS TO PASS
|
## STATION & BOOTSTRAP ACCESS TO PASS
|
||||||
$MY_PATH/tools/natools.py encrypt -p $G1PUB -i /tmp/${INDEXPREFIX}${REFERENCE}.pass -o $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.pass.encrypt
|
$MY_PATH/tools/natools.py encrypt -p $G1PUB -i /tmp/${MEDIAKEY}.pass -o $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.pass.encrypt
|
||||||
$MY_PATH/tools/natools.py encrypt -p $PINnode -i /tmp/${INDEXPREFIX}${REFERENCE}.pass -o $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.pass.encrypt
|
$MY_PATH/tools/natools.py encrypt -p $PINnode -i /tmp/${MEDIAKEY}.pass -o $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/${PINnode}/.pass.encrypt
|
||||||
|
|
||||||
|
## DECODE MEDIAKEY.dunikey ##
|
||||||
|
# ~/.zen/astrXbian/zen/tools/natools.py decrypt -f pubsec -k "$HOME/.zen/secret.dunikey" -i "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.pass.encrypt" -o "/tmp/${MEDIAKEY}.pass"
|
||||||
|
# openssl enc -aes-256-cbc -d -in "$HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/dunikey.enc" -out "/tmp/${MEDIAKEY}.dunikey" -k $(cat "/tmp/${MEDIAKEY}.pass")
|
||||||
|
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
## PREPARE .ipns.mediakey.encrypt FOR PINnode TO BE ABLE TO REFRESH MEDIAKEY
|
## PREPARE .ipns.mediakey.encrypt FOR PINnode TO BE ABLE TO REFRESH MEDIAKEY
|
||||||
# used in ipns_TAG_refresh.sh & autoPINfriends.sh
|
# used in ipns_TAG_refresh.sh & autoPINfriends.sh
|
||||||
########################################################################
|
########################################################################
|
||||||
$MY_PATH/tools/natools.py encrypt -p $PINnode -i $HOME/.ipfs/keystore/$KEYFILE -o $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.ipns.mediakey.encrypt
|
$MY_PATH/tools/natools.py encrypt -p $G1PUB -i $HOME/.ipfs/keystore/$KEYFILE -o $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.ipns.mediakey.encrypt
|
||||||
|
$MY_PATH/tools/natools.py encrypt -p $PINnode -i $HOME/.ipfs/keystore/$KEYFILE -o $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/${PINnode}/.ipns.mediakey.encrypt
|
||||||
|
|
||||||
## Init zen, views counters & visitor
|
## Init zen, views counters & visitor
|
||||||
echo "0" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.zen
|
echo "0" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/${PINnode}/.zen
|
||||||
echo "0" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.views.counter
|
echo "0" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/${PINnode}/.views.counter
|
||||||
echo "anonymous" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/${PINnode}/.visitor
|
echo "anonymous" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/${PINnode}/.visitor
|
||||||
########################################################################
|
########################################################################
|
||||||
# MEMORIZE my PIN
|
# MEMORIZE my PIN
|
||||||
mkdir -p ~/.zen/PIN/${IPFSREPFILEID}/
|
mkdir -p ~/.zen/PIN/${IPFSREPFILEID}/
|
||||||
|
|
@ -244,22 +249,22 @@ touch ~/.zen/PIN/${IPFSREPFILEID}/${G1PUB}
|
||||||
########################################################################
|
########################################################################
|
||||||
## encrypt links for myself
|
## encrypt links for myself
|
||||||
########################################################################
|
########################################################################
|
||||||
$MY_PATH/tools/natools.py encrypt -p ${G1PUB} -i /tmp/.ipfs.filelink -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipfs.filelink.natools.encrypt
|
$MY_PATH/tools/natools.py encrypt -p ${G1PUB} -i /tmp/.ipfs.filelink -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.ipfs.filelink.natools.encrypt
|
||||||
$MY_PATH/tools/natools.py encrypt -p ${G1PUB} -i /tmp/.ipfsid -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipfsid.encrypt
|
$MY_PATH/tools/natools.py encrypt -p ${G1PUB} -i /tmp/.ipfsid -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.ipfsid.encrypt
|
||||||
rm /tmp/.ipfs.filelink
|
rm /tmp/.ipfs.filelink
|
||||||
rm /tmp/.ipfsid
|
rm /tmp/.ipfsid
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
## ADD "ajouter_video.txt" and "video.json" will be SELF IPNS publish data
|
## ADD "ajouter_video.txt" and "video.json" will be SELF IPNS publish data
|
||||||
[[ -f ~/astroport/${TYPE}/${REFERENCE}/ajouter_video.txt ]] && cp -f ~/astroport/${TYPE}/${REFERENCE}/ajouter_video.txt ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/
|
[[ -f ~/astroport/${TYPE}/${REFERENCE}/ajouter_video.txt ]] && cp -f ~/astroport/${TYPE}/${REFERENCE}/ajouter_video.txt ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/
|
||||||
[[ -f ~/astroport/${TYPE}/${REFERENCE}/video.json ]] && cp -f ~/astroport/${TYPE}/${REFERENCE}/video.json ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/
|
[[ -f ~/astroport/${TYPE}/${REFERENCE}/video.json ]] && cp -f ~/astroport/${TYPE}/${REFERENCE}/video.json ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
## EXPLANATIONS
|
## EXPLANATIONS
|
||||||
########################################################################
|
########################################################################
|
||||||
# What is being in ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/
|
# What is being in ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/
|
||||||
# is published on http://127.0.0.1:8181/ipns/$KEY/
|
# is published on http://127.0.0.1:8181/ipns/$KEY/
|
||||||
########################################################################
|
########################################################################
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
@ -280,9 +285,9 @@ rm /tmp/.ipfsid
|
||||||
## IPNS access to index.html
|
## IPNS access to index.html
|
||||||
## Level 1 (not crypted) -> Redirect to ipfs streaming link
|
## Level 1 (not crypted) -> Redirect to ipfs streaming link
|
||||||
## Modified by "./zen/ipns_TAG_refresh.sh" (add crypto/contracts there)
|
## Modified by "./zen/ipns_TAG_refresh.sh" (add crypto/contracts there)
|
||||||
echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://127.0.0.1:8181/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME\">" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/index.html
|
echo "<meta http-equiv=\"Refresh\" content=\"0;URL=http://127.0.0.1:8181/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME\">" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/index.html
|
||||||
|
|
||||||
IPNSLINK=$(ipfs key list -l | grep ${INDEXPREFIX}${REFERENCE} | cut -d ' ' -f 1)
|
IPNSLINK=$(ipfs key list -l | grep ${MEDIAKEY} | cut -d ' ' -f 1)
|
||||||
echo "<meta charset=\"UTF-8\"><meta http-equiv=\"Refresh\" content=\"10;URL=https://tube.copylaradio.com/ipns/$IPNSLINK/${G1PUB}/\">
|
echo "<meta charset=\"UTF-8\"><meta http-equiv=\"Refresh\" content=\"10;URL=https://tube.copylaradio.com/ipns/$IPNSLINK/${G1PUB}/\">
|
||||||
<h1><a href='https://astroport.com'>Astroport</a>/KODI</h1>
|
<h1><a href='https://astroport.com'>Astroport</a>/KODI</h1>
|
||||||
Ce média ${TITLE} vient d'être ajouté au Video Club P2P... Libre et légal<br>
|
Ce média ${TITLE} vient d'être ajouté au Video Club P2P... Libre et légal<br>
|
||||||
|
|
@ -291,7 +296,7 @@ Lancement de la lecture localhost dans 10 secondes...<br><br>
|
||||||
<br><a href=\"https://www.gchange.fr/#/app/user/${G1PUB}/\">
|
<br><a href=\"https://www.gchange.fr/#/app/user/${G1PUB}/\">
|
||||||
<img width=222 src=\"https://tube.copylaradio.com/ipns/$IPNSLINK/QR.png\"></a>
|
<img width=222 src=\"https://tube.copylaradio.com/ipns/$IPNSLINK/QR.png\"></a>
|
||||||
<br><br><b>QR Code du portefeuille du media (${id}) et lien vers son garant.</b>
|
<br><br><b>QR Code du portefeuille du media (${id}) et lien vers son garant.</b>
|
||||||
<br>envoyez un virement pour le conserver en ligne... Et offrir de la monnaie libre à son créateur." > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/index.html
|
<br>envoyez un virement pour le conserver en ligne... Et offrir de la monnaie libre à son créateur." > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/index.html
|
||||||
|
|
||||||
## COPY LOCALHOST IPFS URL TO CLIPBOARD
|
## COPY LOCALHOST IPFS URL TO CLIPBOARD
|
||||||
[[ $(which xclip) ]] && echo "http://127.0.0.1:8181/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" | xclip -selection c
|
[[ $(which xclip) ]] && echo "http://127.0.0.1:8181/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" | xclip -selection c
|
||||||
|
|
@ -301,8 +306,8 @@ Lancement de la lecture localhost dans 10 secondes...<br><br>
|
||||||
########################################################################
|
########################################################################
|
||||||
## PUBLISH new IPNS
|
## PUBLISH new IPNS
|
||||||
########################################################################
|
########################################################################
|
||||||
NEWIPFS=$(ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/ | tail -n 1 )
|
NEWIPFS=$(ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ | tail -n 1 )
|
||||||
IPNS=$(ipfs name publish --quieter --key="${INDEXPREFIX}${REFERENCE}" $NEWIPFS)
|
IPNS=$(ipfs name publish --quieter --key="${MEDIAKEY}" $NEWIPFS)
|
||||||
########################################################################
|
########################################################################
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
|
|
@ -314,14 +319,14 @@ IPNS=$(ipfs name publish --quieter --key="${INDEXPREFIX}${REFERENCE}" $NEWIPFS)
|
||||||
if [[ "${CAT}" =~ ^(film|serie|youtube)$ ]]
|
if [[ "${CAT}" =~ ^(film|serie|youtube)$ ]]
|
||||||
then
|
then
|
||||||
## CREATE GCHANGE AD
|
## CREATE GCHANGE AD
|
||||||
if [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gchange.ad && "${CAT}" != "youtube" ]]
|
if [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad && "${CAT}" != "youtube" ]]
|
||||||
then
|
then
|
||||||
GOFFER=$(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" setoffer -t "${TITLE} #astroport #${INDEXPREFIX}${REFERENCE}" -d "${TITLE} https://tube.copylaradio.com/ipns/$IPNS/ Faites un don à son portefeuille pour le conserver dans le Mediacenter des Amis - #CopyLaRadio - https://astroport.com" -p $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/QR.png)
|
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 - #CopyLaRadio - https://astroport.com" -p $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/QR.png)
|
||||||
echo $GOFFER > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gchange.ad
|
echo $GOFFER > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad
|
||||||
NEWIPFS=$(ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/ | tail -n 1 )
|
NEWIPFS=$(ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ | tail -n 1 )
|
||||||
IPNS=$(ipfs name publish --quieter --key="${INDEXPREFIX}${REFERENCE}" $NEWIPFS)
|
IPNS=$(ipfs name publish --quieter --key="${MEDIAKEY}" $NEWIPFS)
|
||||||
fi
|
fi
|
||||||
echo "Annonce gchange : $(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gchange.ad)"
|
echo "Annonce gchange : $(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad)"
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
# ${PREFIX}ASTRXBIAN FILE : Add Header
|
# ${PREFIX}ASTRXBIAN FILE : Add Header
|
||||||
|
|
@ -329,9 +334,9 @@ then
|
||||||
&& echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
|
&& echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
|
||||||
|
|
||||||
# ADD NEW LINE TO INDEX
|
# ADD NEW LINE TO INDEX
|
||||||
if [[ -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/ajouter_video.txt ]]
|
if [[ -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/ajouter_video.txt ]]
|
||||||
then
|
then
|
||||||
line=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/ajouter_video.txt | sed "s/_IPFSREPFILEID_/$IPFSREPFILEID/g" | sed "s/_IPNSKEY_/$IPNS/g" )
|
line=$(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/ajouter_video.txt | sed "s/_IPFSREPFILEID_/$IPFSREPFILEID/g" | sed "s/_IPNSKEY_/$IPNS/g" )
|
||||||
else
|
else
|
||||||
FILE_RES=$(ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=s=x:p=0 "${path}${file}" | cut -d "x" -f 2)
|
FILE_RES=$(ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=s=x:p=0 "${path}${file}" | cut -d "x" -f 2)
|
||||||
RES=${FILE_RES%?}0p
|
RES=${FILE_RES%?}0p
|
||||||
|
|
@ -340,10 +345,10 @@ then
|
||||||
echo "-------------------- UPDATE MY INDEX -----------------------------"
|
echo "-------------------- UPDATE MY INDEX -----------------------------"
|
||||||
echo "$line"
|
echo "$line"
|
||||||
echo "$line" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
|
echo "$line" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
|
||||||
echo "UPDATE IPNS ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/ajouter_video.txt"
|
echo "UPDATE IPNS ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ajouter_video.txt"
|
||||||
echo "$line" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/ajouter_video.txt
|
echo "$line" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/ajouter_video.txt
|
||||||
## UPDATE SOURCE ajouter_video.txt FILE
|
## UPDATE SOURCE ajouter_video.txt FILE
|
||||||
cp -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/ajouter_video.txt ~/astroport/${TYPE}/${REFERENCE}/ajouter_video.txt
|
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
|
## TODO: ACTIVATE SUB DEFCON 4 MODE = encrypt/decrypt file in $G1DEST subdirectory
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
@ -358,7 +363,7 @@ fi
|
||||||
if [[ "${CAT}" == "video" ]]
|
if [[ "${CAT}" == "video" ]]
|
||||||
then
|
then
|
||||||
## REPLACE IPFS / IPNS REFERENCE IN video.json (Maybe cyphered later)
|
## REPLACE IPFS / IPNS REFERENCE IN video.json (Maybe cyphered later)
|
||||||
cat ~/astroport/${CAT}/${INDEXPREFIX}${REFERENCE}/video.json | sed "s/_IPFSREPFILEID_/$IPFSREPFILEID/g" | sed "s/_IPNSKEY_/$IPNS/g" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
|
cat ~/astroport/${CAT}/${MEDIAKEY}/video.json | sed "s/_IPFSREPFILEID_/$IPFSREPFILEID/g" | sed "s/_IPNSKEY_/$IPNS/g" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -368,9 +373,9 @@ fi
|
||||||
if [[ "${CAT}" == "youtube" ]]
|
if [[ "${CAT}" == "youtube" ]]
|
||||||
then
|
then
|
||||||
## CREATE astroport call to Astroport/Wordpress stations
|
## CREATE astroport call to Astroport/Wordpress stations
|
||||||
if [[ ! -d ~/.zen/ipfs/.$IPFSNODEID/astroport/wordpress/${INDEXPREFIX}${REFERENCE} ]]; then
|
if [[ ! -d ~/.zen/ipfs/.$IPFSNODEID/astroport/wordpress/${MEDIAKEY} ]]; then
|
||||||
mkdir -p ~/.zen/ipfs/.$IPFSNODEID/astroport/wordpress/${INDEXPREFIX}${REFERENCE}
|
mkdir -p ~/.zen/ipfs/.$IPFSNODEID/astroport/wordpress/${MEDIAKEY}
|
||||||
echo "1" > ~/.zen/ipfs/.$IPFSNODEID/astroport/wordpress/${INDEXPREFIX}${REFERENCE}/do
|
echo "1" > ~/.zen/ipfs/.$IPFSNODEID/astroport/wordpress/${MEDIAKEY}/do
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue