From 132298b0d02a0a407c8d8bae6d556779167cca48 Mon Sep 17 00:00:00 2001 From: Armust Blegde Date: Thu, 24 Dec 2020 15:00:48 +0100 Subject: [PATCH 1/9] astroport teleportation door for youtube-dl --- zen/mint_youtube.sh | 93 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 zen/mint_youtube.sh diff --git a/zen/mint_youtube.sh b/zen/mint_youtube.sh new file mode 100644 index 0000000..23196cb --- /dev/null +++ b/zen/mint_youtube.sh @@ -0,0 +1,93 @@ +#!/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/youtube and mp3 files to IPFS +# Create index in ~/.zen/ipfs/xbian/Y$XZUID +######## #### ### ## # + +# 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://localhost: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/youtube +mkdir -p ~/astroport/mp3 +######################################################################## +path="$1" +file="$2" +[[ "$file" == "" || "$path" == "" ]] && echo "ERROR. Parameters missing. xbian_vstream.sh file=$file? path=$path?" +extension="${file##*.}" +TITLE="${file%.*}" + +# Partial file download +[[ $extension == "part" ]] && echo "PARTIAL DOWNLOAD please check $file" && exit 1 + +# GET XZUID +[[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && XZUID=$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid) || XZUID=$(hostname) +# TODO use ~/.zen/ipfs/.$IPFSNODEID/ + +TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: youtube, mp3 +PREFIX=$(echo "$TYPE" | head -c 1 | awk '{ print toupper($0) }' ) # ex: Y, M + +# file is placed in ROOT ~/astroport +[[ $PREFIX != "Y" || $PREFIX != "Y" ]] && echo "WARNING. $TYPE unrecognize, please add code for it ${path}${file}" && exit 1 + + +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=http://localhost:10021" > ~/.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;/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 found 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 | 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://localhost:10021/${PREFIX}ASTRXBIAN" From 7d24ed512d90a0e85ffe8298899296e6bd83f625 Mon Sep 17 00:00:00 2001 From: Armust Blegde Date: Thu, 24 Dec 2020 15:49:41 +0100 Subject: [PATCH 2/9] change inotifaywait command to mint_youtube.sh --- cron_MINUTE.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index 0e7263a..ac6a352 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -1,6 +1,7 @@ #!/bin/bash ######################################################################## # Author: Fred (support@qo-op.com) +# Armust Blegde release # Version: 0.3 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) ######################################################################## @@ -83,20 +84,13 @@ fi # __ _| |__ (_) __ _ _ __ # \ \/ / '_ \| |/ _` | '_ \ # > <| |_) | | (_| | | | | -# /_/\_\_.__/|_|\__,_|_| |_| +# /_/\_\_.__/|_|\__,_|_| |_| ASTROPORT youtube mp3 # # Transfert ~/astroport/*/files to IPFS and make Vstream/ASTROPORT indexes on IPNS -# OPTION 1 : NOT DELETING SOURCE -# NB: Index published in ~/.zen/ipfs/xbian is the same as files in ~/astroport/*/ -# [[ $(($minute % 30 )) == 0 ]] && $MY_PATH/zen/xbian_vstream.sh & - -# OPTION 2: DELETING SOURCE -# NB: INDEX published in ~/.zen/ipfs/xbian IS ONLY GROWING... -# Must manualy run "ipfs unpin" + "ipfs rm" to clean bad files from ~/.zen/ipfs/xbian/INDEXFILES !!! 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/xbian_vstream.sh "$dir" "$file"; done & + /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 & fi # restart inotifywait (may be useless) From 2fa0e7cc1953579698096131c1e7e8835c69c1cd Mon Sep 17 00:00:00 2001 From: Armust Blegde Date: Thu, 24 Dec 2020 16:29:36 +0100 Subject: [PATCH 3/9] add EXTERNIP to ipfstryme message --- ISOconfig.sh | 3 ++- zen/gchange_INIT.sh | 1 + .../lib/__pycache__/cesium.cpython-38.pyc | Bin 0 -> 3330 bytes .../__pycache__/cesiumCommon.cpython-38.pyc | Bin 0 -> 1744 bytes .../lib/__pycache__/likes.cpython-38.pyc | Bin 0 -> 5933 bytes .../lib/__pycache__/messaging.cpython-38.pyc | Bin 0 -> 6705 bytes .../lib/__pycache__/natools.cpython-38.pyc | Bin 0 -> 9410 bytes .../lib/__pycache__/profiles.cpython-38.pyc | Bin 0 -> 3101 bytes zen/mint_youtube.sh | 0 zen/tools/add_externIP_to_ipfstryme.sh | 22 ++++++++++++++++++ 10 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 zen/jaklis/lib/__pycache__/cesium.cpython-38.pyc create mode 100644 zen/jaklis/lib/__pycache__/cesiumCommon.cpython-38.pyc create mode 100644 zen/jaklis/lib/__pycache__/likes.cpython-38.pyc create mode 100644 zen/jaklis/lib/__pycache__/messaging.cpython-38.pyc create mode 100644 zen/jaklis/lib/__pycache__/natools.cpython-38.pyc create mode 100644 zen/jaklis/lib/__pycache__/profiles.cpython-38.pyc mode change 100644 => 100755 zen/mint_youtube.sh create mode 100755 zen/tools/add_externIP_to_ipfstryme.sh diff --git a/ISOconfig.sh b/ISOconfig.sh index 827e562..bfdef5f 100755 --- a/ISOconfig.sh +++ b/ISOconfig.sh @@ -172,7 +172,7 @@ sed -i "s/_PROFIL_/$XZUID/g" ~/.kodi/addons/plugin.video.vstream/resources/sites sed -i "s/_LOGIN_/$salt/g" ~/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py sed -i "s/_MDP_/$pepper/g" ~/.kodi/addons/plugin.video.vstream/resources/sites/astroport.py -~/.zen/astrXbian/zen/cesium_IPFS_swarm.sh +~/.zen/astrXbian/zen/gchange_IPFS_swarm.sh ~/.zen/astrXbian/zen/ipfs_SWARM_refresh.sh ######################################################################## @@ -184,6 +184,7 @@ do isLAN=$(echo $tryme | cut -f3 -d '/' | grep -E "(^127\.)|(^192\.168\.)|(^fd42\:)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/") [[ ! $isLAN && $tryme != "" ]] && echo "$tryme" >> ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr && echo "$tryme" done +~/.zen/astrXbian/zen/tools/add_externIP_to_ipfstryme.sh echo 'SEND ipfstryme to A_boostrap_nodes.txt listed PUBs' # Add your bootstrap Pub here for g1node in $(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#") # remove comments diff --git a/zen/gchange_INIT.sh b/zen/gchange_INIT.sh index 58ba947..7808d04 100755 --- a/zen/gchange_INIT.sh +++ b/zen/gchange_INIT.sh @@ -36,6 +36,7 @@ do isLAN=$(echo $tryme | cut -f3 -d '/' | grep -E "(^127\.)|(^192\.168\.)|(^fd42\:)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/") [[ ! $isLAN ]] && echo "$tryme" >> ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr done +~/.zen/astrXbian/zen/tools/add_externIP_to_ipfstryme.sh cat ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr diff --git a/zen/jaklis/lib/__pycache__/cesium.cpython-38.pyc b/zen/jaklis/lib/__pycache__/cesium.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..87af3c1597182d5e995ed7e2f11ec181435866b1 GIT binary patch literal 3330 zcmZ`*TW{RP73T0ximO``$4yhfMO&boq7sk_?gdGj#bYMNo!mSVn17#%XNU++wFp z(!`9tqF3&wyX9WGSMI0#%z9*Tp9gO&9tiKsNe?(Xv-;s%eBB!KZJpc`Dxa43>awgW zojiW}MG9X^)z^SlrW zZ%6d@*ZE7KbVM(9!{BLU1{rN(vjmuYfvWzAMpy&~pkUm7V*v_>yXal+aUZ?M-{&EZ z-mui?w|LBVFba6Wdw3S|5BMJ6$4bO+^8v+Sm5XYaMwPbGP-(iZk;Yul27Ov#MRJ`^$9- z%$fB)8}tK7pV9%JR)FQTb|y8~i2^qF>ug$zs!5XzRaf5#rAA}m=1pWyixNmK7yE&B zl_;L4eswOtQDg1b)8@SXF7PPL0!;1`lglj+*Z+`5w0M-_w&9 zbtz6pvYe{sE3=)|>C4?zd)+-o_Jq7Gmw74O{ox?gG(w25;}+``YRs zO4_09QG;x?bRgfFLDHmDIg?2CMywYA(S9m?j>gstuM%dF>RGEA|X%I@ehfVY& zc|d#dn!G85c1o<@rX3!lNn>J5hqL?{nX#b`pXb%6z;BtjcFhqz15YYWBejo)V&yw7 z;`Jdrv~RPmc#&o1kkz92=vRqwipf^IkOU?|ZtEZ+++{+TWH3m-IwaCd;z-|<^kZw7 z<{E}WH>TbB`cZNU3stVD-Njrp#mj@eU z>}&>^F(4xpqA+pN@bOa&w)_j*uuF9Ck`ml+gX>@xVbyITPP~ed>@g*K8$(d+fp(N= z`o1KNuU$=(RiMvAV|)GMP`B93t#}n-_?CFyaz2AappXRc@ZR z=!ucvj+&7qCNvAR)gfQ#2Y4#fv}kU?B!7i(evGQj@dP5=VhM1%+}%J4zqiEzLTkl< z3X?TLkVEInnSllBBaGb{YrMJN1js#Go;G2N4Cd^mEC0YDnw85PNT)N8Ae6)vhs1Lp zw;l&qWWPrQ zG3y=N=50!no4DV_8vTHxEVS4mq|#@%nQyx`2`5BzGXnTX#>j9{=(M0}IC_l1Is!P1 zSj*x32CdBRJj`quEeo+~<=1xZEtqAuHhhATgJbp_K4AnOaj3d90@K{3mz~Ch zlIXflJo#Iiu7oDtF;RZfC5OpC&-f|n^V%!un(}|Wq;p|$mH7(hizGT^G5y(>M;qR* z47XBg%i$jc(lH{6Fd`Xn!;l|ij-EudONFJ3l3s1NxbhAP+Z`DS!k~;x@^i8!j^3c8 zcFET#ll37?8!*{z<=A0V7Ut5wY7p1&en7Nw<5sH_YC0;qC-QyTT%Q_}Rim$xfRU6C@{iO|TF5V{ zS)W;EL|P!}{Gqc#(RmlTVHEblC=TO2)B5H)E-1ez+n-SLV`}c8N%wIhJI*#P?vj$r zs9f5kXQjD6;(B84o82XcLYOA>bRlfY=x7?zQb&K2L55={K(xbmZC!_-cA$JtT4iv) M!}i$`cywg{54J(|yZ`_I literal 0 HcmV?d00001 diff --git a/zen/jaklis/lib/__pycache__/cesiumCommon.cpython-38.pyc b/zen/jaklis/lib/__pycache__/cesiumCommon.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..cc67099471a71b6e5bc344c58a6090a37f412f79 GIT binary patch literal 1744 zcmZuy-EZ7P5Z_&|eZG&B0x7g=g-ijpMkFVyv=XR5p-n3aN-Nqz>Z-Dw+fB}iKd!rL zXby)5E&a1EOZErkAC|*{?jAm zFI*fQ4lJ&~tJi@DB4|dU`Aj3)tXafhW|@=oh*Q)#nVWl&m$#x;?ngezc+?hM(GvbX zjXF1oXp7E15uFK(x`N&zVebIEleLgqPY;s|7cYg5bvAQjxlXqV+uf2T9;x)(9l1L` zeg2a-AKdypdl)`=f9Zoym!f28{P6pg3-7I5+`D_g!OsALJ{-tHV&p2k`U((3YBHgQ z?)d7wVaD0!#+kY`nbDfoOwga538kc1oa<_GR4NDr%ho~`wRNdX4Do2|rG=1%2|dfr z?nqik8)aPxw}AM!by-+fRQX6-H!BmNLnrE>G&aMu*n$kfk!{U==qE%ShZz6)us8z z?A6_xY@;u~IA+>46@0?BeO#N)v}<~x^=C}|U>1;@P~q-y^~+PA-t#`24z||D$FEgI z3hfJ09msrScE=ZPXEM<;*i5r5Fhd!P5;F`;8SIvo3J`sXkpY^Vzg=zIk%O>vKp{)( zjj9bT2M0^AsNMzgWfBasKb{02&(cSg42pA78}O%tqzX35BG@cdo|xrMc+5JZQrLx} zT$55fjmfseJUH9=I>{=zs#K`}R){rigj4{p?^J4}Rt2b8Ht&_&J0gq$ZA0-r#~zk9v#& z<+KO1M~^d3JM0)c1N`{JQB*7+S`QeQ9}Yz0Gj#030?r|w(ixn^DVve0Gb4M_owOp7E#_QeLZ@Efpu2h21!iLgay#o^S4r$ZOnc=5T8JpCLl*z2K-?JbgA z#&emu;YnF60*ArTO9V(X_!=i z1WRC>JmIct3L15RTZS5!Wu{-O;aRl7d#dsHf16wX@;v5`@$_l@eVqghE;7zK{=XC2 BsjvV5 literal 0 HcmV?d00001 diff --git a/zen/jaklis/lib/__pycache__/likes.cpython-38.pyc b/zen/jaklis/lib/__pycache__/likes.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..107a43bc56b5404878ad797f75f76366865d2f53 GIT binary patch literal 5933 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

2Jzb|MgVYqcKJ7@Ase=ALf&uaXVzauj z^S{A;)9t-vpptE=wzJ!6^fXVm%bg$EmI1u`)OvLG@* zVV6u17ZU?6LS7MtdWON~)L7pX*iu{XQ=Q@vevO+d0xNQOfKzm7v5$zFtdGPx$%-#U zr$IIY?N?dk_n2bdLdD!F9=(vS14R|FJ8MV={&h;fJ~JUaFCM}X#b1S`M^Gx73`-NA`(#u6^#Qc25DjH2%@;R zZVwT74_Zyh92p&vhs58!g#Y%_RH~L+#hdlAJeH;=IIku+7nf7t0J1v#?j5J2IQyc% z8sk_S^^3z_9Zay7SwY3%B!L`A8F9s#u3v@Q)zHfXaL@|zL(-#U-|N|^*Bj2;s^c6p(>c>=lNYx=#ubH*dh+Z{0n}XL+G6> /home/$YOU/.zen/ipfs/.${IPFSNODEID}/tryme.addr + + +exit 0 From edbb123fa877d70f35e2c75067d731fc347878dd Mon Sep 17 00:00:00 2001 From: Armust Blegde Date: Thu, 24 Dec 2020 16:43:37 +0100 Subject: [PATCH 4/9] add EXTERNIP to ipfstryme message --- zen/gchange_INIT.sh | 9 +++++++++ zen/tools/add_externIP_to_ipfstryme.sh | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/zen/gchange_INIT.sh b/zen/gchange_INIT.sh index 7808d04..fe6e23e 100755 --- a/zen/gchange_INIT.sh +++ b/zen/gchange_INIT.sh @@ -113,6 +113,15 @@ do echo "Sending IPFSTRYME message to $liking_me" [[ $friend_of_mine != null ]] && ./jaklis.py send -d $liking_me -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr done +echo 'SEND ipfstryme to A_boostrap_nodes.txt listed PUBs' # Add your bootstrap Pub here +for g1node in $(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#") # remove comments +do +if [[ $g1node != "" ]]; then + echo "LIKING my BOOTSTRAP node : $g1node" +# ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.le-sou.org" send -d $g1node -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr + ~/.zen/astrXbian/zen/jaklis/jaklis.py send -d $g1node -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr +fi +done cd - # SHOW RESULT diff --git a/zen/tools/add_externIP_to_ipfstryme.sh b/zen/tools/add_externIP_to_ipfstryme.sh index 90da2ba..cb980ba 100755 --- a/zen/tools/add_externIP_to_ipfstryme.sh +++ b/zen/tools/add_externIP_to_ipfstryme.sh @@ -16,7 +16,7 @@ EXTERNIP=$(curl -s http://whatismyip.akamai.com/) echo "ADD $EXTERNIP to /home/$YOU/.zen/ipfs/.${IPFSNODEID}/tryme.addr" ######################################################################## mkdir -p ~/.zen/ipfs/.${IPFSNODEID} -echo "/ip4/$EXTERNIP/udp/4001/quic/p2p/${IPFSNODEID}" >> /home/$YOU/.zen/ipfs/.${IPFSNODEID}/tryme.addr +echo "/ip4/$EXTERNIP/udp/4001/astro/p2p/${IPFSNODEID}" >> /home/$YOU/.zen/ipfs/.${IPFSNODEID}/tryme.addr exit 0 From 9a1f329506766f477fc0d1f3d3f69490cd40436f Mon Sep 17 00:00:00 2001 From: Armust Blegde Date: Thu, 24 Dec 2020 16:49:34 +0100 Subject: [PATCH 5/9] different xbian user inotifywait command xbian_vstream.sh --- cron_MINUTE.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index ac6a352..166495e 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -90,7 +90,8 @@ fi 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 & + [[ $YOU == "xbian" ]] && /usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/xbian_vstream.sh "$dir" "$file"; done & \ + || /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 & fi # restart inotifywait (may be useless) From 2f0c46bb630fad8a923a8418df4bc8485bd3c10b Mon Sep 17 00:00:00 2001 From: Armust Blegde Date: Thu, 24 Dec 2020 16:52:57 +0100 Subject: [PATCH 6/9] different xbian user inotifywait command xbian_vstream.sh --- cron_MINUTE.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index 166495e..3ba0751 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -90,8 +90,8 @@ fi if [[ ! $isinotifywaitRunning ]]; then mkdir -p /home/$YOU/astroport - [[ $YOU == "xbian" ]] && /usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/xbian_vstream.sh "$dir" "$file"; done & \ - || /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 & + [[ $YOU == "xbian" ]] && /usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/xbian_vstream.sh "$dir" "$file"; done & + [[ $YOU != "xbian" ]] &&  /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 & fi # restart inotifywait (may be useless) From e1dccc9a25fbd90509938ad6d6e4148a971736ff Mon Sep 17 00:00:00 2001 From: Armust Blegde Date: Thu, 24 Dec 2020 16:56:58 +0100 Subject: [PATCH 7/9] a space is a space --- cron_MINUTE.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cron_MINUTE.sh b/cron_MINUTE.sh index 3ba0751..e7e6983 100755 --- a/cron_MINUTE.sh +++ b/cron_MINUTE.sh @@ -91,7 +91,7 @@ fi if [[ ! $isinotifywaitRunning ]]; then mkdir -p /home/$YOU/astroport [[ $YOU == "xbian" ]] && /usr/bin/inotifywait -r -e close_write -m /home/$YOU/astroport | while read dir flags file; do $MY_PATH/zen/xbian_vstream.sh "$dir" "$file"; done & - [[ $YOU != "xbian" ]] &&  /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 & + [[ $YOU != "xbian" ]] && /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 & fi # restart inotifywait (may be useless) From bf81061573f91a74b0b64d56776d085660617739 Mon Sep 17 00:00:00 2001 From: Armust Blegde Date: Thu, 24 Dec 2020 17:43:00 +0100 Subject: [PATCH 8/9] youtube astroport channel opening --- ISOconfig.sh | 21 +++++++++++++++++++++ zen/mint_youtube.sh | 18 +++++++++--------- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/ISOconfig.sh b/ISOconfig.sh index bfdef5f..dce2527 100755 --- a/ISOconfig.sh +++ b/ISOconfig.sh @@ -229,6 +229,27 @@ echo "IPFS_SYNC_DIR=$IPFS_sync_directory" > ~/.zen/ipfs.sync # RESIZING / partition # sudo btrfs filesystem resize max / +# DHT PUBSUB mode +ipfs config Pubsub.Router gossipsub +# MAXSTORAGE = 1/2 available +availableDiskSize=$(df -P ~/ | awk 'NR>1{sum+=$4}END{print sum}') +diskSize="$((availableDiskSize / 2))" +ipfs config Datastore.StorageMax $diskSize +## Activate Rapid "ipfs p2p" +ipfs config --json Experimental.Libp2pStreamMounting true +ipfs config --json Experimental.P2pHttpProxy true + +######### MAKE DEFAULT BOOTSTRAP TO oasis.astroport.com 2jQUH4HfHxdTesjCjvMCx1VJgA5AnpuvrWRq1swfRdsS ########### +ipfs bootstrap rm --all +ipfs bootstrap add /dnsaddr/oasis.astroport.com/tcp/4001/ipfs/12D3KooWBYme2BsNUrtx4mEdNX6Yioa9AV7opWzQp6nrPs6ZKabN +ipfs bootstrap add /ip4/51.15.166.54/tcp/4001/p2p/12D3KooWBYme2BsNUrtx4mEdNX6Yioa9AV7opWzQp6nrPs6ZKabN +ipfs bootstrap add /ip4/51.15.166.54/udp/4001/quic/p2p/12D3KooWBYme2BsNUrtx4mEdNX6Yioa9AV7opWzQp6nrPs6ZKabN +ipfs bootstrap add /ip6/fe80::208:a2ff:fe0c:20d8/tcp/4001/p2p/12D3KooWBYme2BsNUrtx4mEdNX6Yioa9AV7opWzQp6nrPs6ZKabN +########################################### +# TODO: ADD some other bootstrap NODES +########################################### +# AVOID CONFLICT WITH KODI REMOTE +ipfs config Addresses.Gateway "/ip4/127.0.0.1/tcp/8181" ######################################################################## echo 'REBOOT NOW...' diff --git a/zen/mint_youtube.sh b/zen/mint_youtube.sh index 23196cb..294f3cd 100755 --- a/zen/mint_youtube.sh +++ b/zen/mint_youtube.sh @@ -21,15 +21,14 @@ mkdir -p ~/astroport/mp3 ######################################################################## path="$1" file="$2" +echo "~/.zen/astrXbian/zen/mint_youtube.sh \"$path\" \"$file\"" [[ "$file" == "" || "$path" == "" ]] && echo "ERROR. Parameters missing. xbian_vstream.sh file=$file? path=$path?" extension="${file##*.}" TITLE="${file%.*}" -# Partial file download -[[ $extension == "part" ]] && echo "PARTIAL DOWNLOAD please check $file" && exit 1 # GET XZUID -[[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && XZUID=$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid) || XZUID=$(hostname) +[[ -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && XZUID="$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid)" || XZUID="$(hostname)" # TODO use ~/.zen/ipfs/.$IPFSNODEID/ TYPE=$(echo "$path" | cut -d '/' -f 5 ) # ex: youtube, mp3 @@ -44,23 +43,24 @@ 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 "-----------------------------------------------------------------" +echo "CHECK IPFS $file : ipfs ls /ipfs/$NEWSHARE" +echo "-----------------------------------------------------------------" +echo "UPDATE $TYPE INDEX in ~/.zen/ipfs/xbian/${PREFIX}${XZUID} " 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=http://localhost:10021" > ~/.zen/ipfs/xbian/${PREFIX}${XZUID} +rm ~/.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;/ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID} + echo "ipfs get -o ~/astroport/$TYPE/ /ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID} else if [[ $isFILEinINDEX ]]; then echo "$file already in index" ## File was updated => Change OLDLINK @@ -84,8 +84,8 @@ echo "-----------------------------------------------------------------" echo "CREATE my local ${PREFIX}ASTRXBIAN ($TYPE) from ipfs_swarm found 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 +echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://localhost:10021" > /tmp/xbian/${PREFIX}ASTRXBIAN # CREATE INDEX HEADER +cat ~/.zen/ipfs_swarm/xbian/${PREFIX}* | grep -v -E 'CAT;TMDB' | cut -d ';' -f 9 >> /tmp/xbian/${PREFIX}ASTRXBIAN # GET ipfs get commands cat /tmp/xbian/${PREFIX}ASTRXBIAN | uniq > /tmp/xbian/${PREFIX}ASTRXBIAN.uniq # REMOVE DUPLICATE INDEX mv /tmp/xbian/${PREFIX}ASTRXBIAN.uniq /var/www/astrxbian/${PREFIX}ASTRXBIAN From 2d61cc47112dcd6dd1c8a224e7d57a61a3ce07d4 Mon Sep 17 00:00:00 2001 From: Armust Blegde Date: Thu, 24 Dec 2020 17:52:34 +0100 Subject: [PATCH 9/9] create YASTRXBIAN file containing ipfs get sync command --- zen/mint_youtube.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zen/mint_youtube.sh b/zen/mint_youtube.sh index 294f3cd..7eb85b7 100755 --- a/zen/mint_youtube.sh +++ b/zen/mint_youtube.sh @@ -60,7 +60,7 @@ isLINKinINDEX=$(grep "$NEWSHARE" ~/.zen/ipfs/xbian/${PREFIX}${XZUID}) # Is it a new file? Add it to INDEX if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then - echo "ipfs get -o ~/astroport/$TYPE/ /ipfs/$NEWSHARE/$file" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID} + echo "ipfs get -o ~/astroport/$TYPE/ \"/ipfs/$NEWSHARE/$file\"" >> ~/.zen/ipfs/xbian/${PREFIX}${XZUID} else if [[ $isFILEinINDEX ]]; then echo "$file already in index" ## File was updated => Change OLDLINK