diff --git a/.install/ipfs_alone.sh b/.install/ipfs_alone.sh index 9d071a3..191e296 100755 --- a/.install/ipfs_alone.sh +++ b/.install/ipfs_alone.sh @@ -84,6 +84,8 @@ sudo systemctl enable ipfs || err "Enable IPFS daemon" # INIT ipfs [[ $isLAN ]] && ipfs init -p lowpower \ || ipfs init -p server +# TODO try ipfs init --profile=badgerds (for better performance) +# https://discuss.ipfs.io/t/adding-content-to-ipfs-is-quite-slow-any-ideas-on-why-and-how-to-speed-things-up/8135/3 sudo chown -R $USER:$USER ~/.ipfs || exit 1 @@ -107,6 +109,8 @@ ipfs bootstrap add /dnsaddr/oasis.astroport.com/tcp/4001/ipfs/Qmf98yiZja5yrVctp5 ipfs bootstrap add /ip4/51.15.166.54/tcp/4001/p2p/Qmf98yiZja5yrVctp5x4FicUe3Dubzbm5TiUHqJQwwT5Rj ipfs bootstrap add /ip6/fe80::208:a2ff:fe0c:20d8/tcp/4001/p2p/Qmf98yiZja5yrVctp5x4FicUe3Dubzbm5TiUHqJQwwT5Rj ########################################### +# TODO: ADD some other bootstrap NODES +########################################### sudo systemctl start ipfs || err "Start IPFS daemon" diff --git a/zen/_CopyLaRadio/artist_song_to_sbotc_zenyta.sh b/www/LOVELand/_CopyLaRadio/artist_song_to_sbotc_zenyta.sh similarity index 100% rename from zen/_CopyLaRadio/artist_song_to_sbotc_zenyta.sh rename to www/LOVELand/_CopyLaRadio/artist_song_to_sbotc_zenyta.sh diff --git a/zen/_CopyLaRadio/bip.wav b/www/LOVELand/_CopyLaRadio/bip.wav similarity index 100% rename from zen/_CopyLaRadio/bip.wav rename to www/LOVELand/_CopyLaRadio/bip.wav diff --git a/zen/_CopyLaRadio/copy.sh b/www/LOVELand/_CopyLaRadio/copy.sh similarity index 100% rename from zen/_CopyLaRadio/copy.sh rename to www/LOVELand/_CopyLaRadio/copy.sh diff --git a/zen/_CopyLaRadio/install_osb-studio.sh b/www/LOVELand/_CopyLaRadio/install_osb-studio.sh similarity index 71% rename from zen/_CopyLaRadio/install_osb-studio.sh rename to www/LOVELand/_CopyLaRadio/install_osb-studio.sh index 90f155d..03d2c59 100755 --- a/zen/_CopyLaRadio/install_osb-studio.sh +++ b/www/LOVELand/_CopyLaRadio/install_osb-studio.sh @@ -3,8 +3,14 @@ sudo add-apt-repository ppa:obsproject/obs-studio sudo apt update sudo apt install obs-studio -y + +# Screen recording + sound DJing + code seeing sudo apt install simplescreenrecorder mixxx geany -y +# Gig anime sudo add-apt-repository ppa:peek-developers/stable sudo apt update sudo apt install peek + + +sudo apt install gifsicle luarocks libgirepository1.0-dev -y diff --git a/zen/_CopyLaRadio/libradio/FIP autour de llectro.php b/www/LOVELand/_CopyLaRadio/libradio/FIP autour de llectro.php similarity index 100% rename from zen/_CopyLaRadio/libradio/FIP autour de llectro.php rename to www/LOVELand/_CopyLaRadio/libradio/FIP autour de llectro.php diff --git a/zen/_CopyLaRadio/libradio/Nova zz.php b/www/LOVELand/_CopyLaRadio/libradio/Nova zz.php similarity index 100% rename from zen/_CopyLaRadio/libradio/Nova zz.php rename to www/LOVELand/_CopyLaRadio/libradio/Nova zz.php diff --git a/zen/_CopyLaRadio/libradio/fipelectro-midfi.mp3.php b/www/LOVELand/_CopyLaRadio/libradio/fipelectro-midfi.mp3.php similarity index 100% rename from zen/_CopyLaRadio/libradio/fipelectro-midfi.mp3.php rename to www/LOVELand/_CopyLaRadio/libradio/fipelectro-midfi.mp3.php diff --git a/zen/_CopyLaRadio/libradio/radionova.php b/www/LOVELand/_CopyLaRadio/libradio/radionova.php similarity index 100% rename from zen/_CopyLaRadio/libradio/radionova.php rename to www/LOVELand/_CopyLaRadio/libradio/radionova.php diff --git a/zen/_CopyLaRadio/libradio/simple_html_dom.php b/www/LOVELand/_CopyLaRadio/libradio/simple_html_dom.php similarity index 100% rename from zen/_CopyLaRadio/libradio/simple_html_dom.php rename to www/LOVELand/_CopyLaRadio/libradio/simple_html_dom.php diff --git a/zen/_CopyLaRadio/parle.sh b/www/LOVELand/_CopyLaRadio/parle.sh similarity index 100% rename from zen/_CopyLaRadio/parle.sh rename to www/LOVELand/_CopyLaRadio/parle.sh diff --git a/zen/_CopyLaRadio/sbotc.sh b/www/LOVELand/_CopyLaRadio/sbotc.sh similarity index 100% rename from zen/_CopyLaRadio/sbotc.sh rename to www/LOVELand/_CopyLaRadio/sbotc.sh diff --git a/zen/_CopyLaRadio/sbotc_zenyta.sh b/www/LOVELand/_CopyLaRadio/sbotc_zenyta.sh similarity index 100% rename from zen/_CopyLaRadio/sbotc_zenyta.sh rename to www/LOVELand/_CopyLaRadio/sbotc_zenyta.sh diff --git a/zen/_CopyLaRadio/watch.sh b/www/LOVELand/_CopyLaRadio/watch.sh similarity index 100% rename from zen/_CopyLaRadio/watch.sh rename to www/LOVELand/_CopyLaRadio/watch.sh diff --git a/www/LOVELand/jukebox/REC/youtube-dl.php b/www/LOVELand/jukebox/REC/youtube-dl.php index ab5fea0..715be29 100644 --- a/www/LOVELand/jukebox/REC/youtube-dl.php +++ b/www/LOVELand/jukebox/REC/youtube-dl.php @@ -38,7 +38,7 @@ if( $search == "REC" ) { if( ! exec('grep '.escapeshellarg($lnk).' /tmp/ytdl.list') ) { // file_put_contents("/tmp/ytdl.list","CopyLibre||$lnk\n", FILE_APPEND); // instead of using a relay daemon to monitor a /tmp shared file, we are going to send sbot message to make it. #zenyta SSB message. - shell_exec('/home/pi/.zen/astroport/zen/_CopyLaRadio/sbotc_zenyta.sh'. $lnk); + shell_exec('/var/www/loveland/_CopyLaRadio/sbotc_zenyta.sh'. $lnk); } $result.='

LIEN: '.$lnk.'

'; @@ -49,10 +49,10 @@ if( $search == "REC" ) { if( ! exec('grep '.escapeshellarg($cmd).' /tmp/ytdl.list') ) { // shell_exec('/home/pi/G1sms+/_CopyLaRadio/parle.sh "Enregistrement ajouté."'); - shell_exec('/home/pi/.zen/astroport/zen/_CopyLaRadio/artist_song_to_sbotc_zenyta.sh "'. $artist . '" "' . $title .'"'); + shell_exec('/var/www/loveland/_CopyLaRadio/artist_song_to_sbotc_zenyta.sh "'. $artist . '" "' . $title .'"'); } else { - shell_exec('/home/pi/.zen/astroport/zen/_CopyLaRadio/parle.sh "Copie déjà lancée"'); + shell_exec('/var/www/loveland/_CopyLaRadio/parle.sh "Copie déjà lancée"'); } $result.='

'.$artist.' / '.$title.'

@@ -60,16 +60,16 @@ if( $search == "REC" ) { // RADIO EXTERNAL TRACK SCRAPERs .... } else if($radio != "" && $artist == "undefined" && $title == "undefined" ){ - shell_exec('/home/pi/.zen/astroport/zen/_CopyLaRadio/parle.sh "Recherche externe pour '.$radio.'"'); + shell_exec('/var/www/loveland/_CopyLaRadio/parle.sh "Recherche externe pour '.$radio.'"'); file_put_contents("/tmp/youtube-dl.log", "/home/pi/G1sms+/_CopyLaRadio/libradio/".escapeshellcmd($radio).".php".PHP_EOL, FILE_APPEND); if ( file_exists("/home/pi/G1sms+/_CopyLaRadio/libradio/".escapeshellcmd($radio).".php") ) { file_put_contents("/tmp/ytdl.list","$radio||".PHP_EOL, FILE_APPEND); } else { - shell_exec('/home/pi/.zen/astroport/zen/_CopyLaRadio/parle.sh "Aucun module"'); + shell_exec('/var/www/loveland/_CopyLaRadio/parle.sh "Aucun module"'); } } else { - shell_exec('/home/pi/.zen/astroport/zen/_CopyLaRadio/parle.sh "Identification imprécise. Podcast? Fichier local?"'); + shell_exec('/var/www/loveland/_CopyLaRadio/parle.sh "Identification imprécise. Podcast? Fichier local?"'); } } diff --git a/zen/ssb_GET_zenyta.sh b/zen/ssb_GET_zenyta.sh index 2c34354..65dfcf6 100755 --- a/zen/ssb_GET_zenyta.sh +++ b/zen/ssb_GET_zenyta.sh @@ -51,7 +51,7 @@ a u d i o #messages=$(sbotc messagesByType '{"type":"post","gt":'$last_ts'}') # SEARCH "#zenyta" CMD in message text messages=$(sbotc backlinks.read '{"query":[{"$filter":{"dest":"#zenyta","value":{"content":{"type":"post"}},"timestamp":{"$gt":'"$last_ts"'}}}]}') -[[ $messages == "" ]] && messages=$(sbotc query.read '{"query":[{"$filter":{"value":{"author": "'"$WHOAMI"'", "content":{"type":"zenyta"}}}}]}') || exit 1 +[[ $messages == "" ]] && messages=$(sbotc query.read '{"query":[{"$filter":{"value":{"author": "'"$WHOAMI"'", "content":{"type":"zenyta"}}}}]}') while read -r msg do # EXTRACT CMD PARAM @@ -67,7 +67,7 @@ do # SWARM ALREADY DONE CHECKSWARM=$(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/') # OR SWARM PROCESS IN ACTION - [[ ! $CHECKSWARM ]] && $(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/process.timestamp.ssb | tail -n 1 | cut -f 6 -d '/') + [[ ! $CHECKSWARM ]] && CHECKSWARM=$(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/process.timestamp.ssb | tail -n 1 | cut -f 6 -d '/') [[ $CHECKSWARM ]] \ && echo "$timestamp ALREADY on NODE $CHECKSWARM CONTINUE" \ && echo "$timestamp" > ~/.zen/zenyta.last.ts \ @@ -98,7 +98,7 @@ do $MY_PATH/miam_miam.sh "$timestamp" # ANTI DOUBLE COPY END - echo "$timestamp" > ~/.zen/ipfs/.$ipfsnodeid/process.timestamp.ssb + rm ~/.zen/ipfs/.$ipfsnodeid/process.timestamp.ssb $MY_PATH/ipfs_SWARM_refresh.sh # ANTI DOUBLE COPY diff --git a/zen/ssb_GET_zenytv.sh b/zen/ssb_GET_zenytv.sh index 7145b7f..dd37ba2 100755 --- a/zen/ssb_GET_zenytv.sh +++ b/zen/ssb_GET_zenytv.sh @@ -66,7 +66,7 @@ do # SWARM ALREADY DONE CHECKSWARM=$(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/') # OR SWARM PROCESS IN ACTION - [[ ! $CHECKSWARM ]] && $(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/process.timestamp.ssb | tail -n 1 | cut -f 6 -d '/') + [[ ! $CHECKSWARM ]] && CHECKSWARM=$(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/process.timestamp.ssb | tail -n 1 | cut -f 6 -d '/') [[ $CHECKSWARM ]] \ && echo "$timestamp ALREADY on NODE $CHECKSWARM CONTINUE" \ && echo "$timestamp" > ~/.zen/zenytv.last.ts \ diff --git a/zen/zen_MAKE.sh b/zen/zen_MAKE.sh index 93d6083..3752597 100755 --- a/zen/zen_MAKE.sh +++ b/zen/zen_MAKE.sh @@ -449,6 +449,7 @@ sbotc publish '{"type":"post", "branch": "'"$msg_branch"'", "root": "'"$msg_root else +# This code is activated for qrcode (zentx terminal) @piniche # REGULAR ZenTAG, Send QRCode to INPUT TX emitter ### TODO PRINT AND SEND BY SSB WITH WHEN PASSENGER TOO # CAREFULL IN THAT CASE ISSUER IS A G1WALLET