From 894a847242164ae6aa521ed146ef87042b1db72f Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 10 Aug 2021 02:06:10 +0200 Subject: [PATCH] remove ];; mean no ipns link --- www/boris/film.php | 2 +- www/boris/get_youtube_videos.sh | 11 ------ www/boris/youtube.php | 66 ++++++++++++++++----------------- 3 files changed, 34 insertions(+), 45 deletions(-) delete mode 100755 www/boris/get_youtube_videos.sh diff --git a/www/boris/film.php b/www/boris/film.php index 6725ecb..4621fa0 100644 --- a/www/boris/film.php +++ b/www/boris/film.php @@ -5,7 +5,7 @@ require_once('functions.php'); $videosList = array(); -exec("/bin/bash -c './get_youtube_videos.sh F'", $videos); +exec("/bin/bash -c './get_astrxbian_index.sh F'", $videos); exec("/bin/bash -c './check_bootstrap_wallet.sh'", $gg1); $videos = array_reverse($videos); // ## film;MDan5TDuT-0;;Le Manuel de Survie en Dictature v1.1 au format papier;;["onelove"];k51qzi5uqu5dl0hnglpzumjezep2avacrtbx7i15v91elcxac4cpd8290kl1hq;720p;/ipfs/QmZp63RXhLm6QASmw1t2R8fu5waSJFmyW7cmdVNxyuJXzg/MDan5TDuT-0_Le%20Manuel%20de%20Survie%20en%20Dictature%20v1.1%20au%20format%20papier.mp4 diff --git a/www/boris/get_youtube_videos.sh b/www/boris/get_youtube_videos.sh deleted file mode 100755 index ff30334..0000000 --- a/www/boris/get_youtube_videos.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -######################################################################## -# Author: -# Version: 0.1 -# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) -######################################################################## -PREFIX="$1" -[[ $PREFIX == "" ]] && PREFIX="Y" -YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) && [[ ! $YOU ]] && echo "ipfs NOT RUNNING. EXIT" && exit 1 - -cat /home/$YOU/.zen/{ipfs,ipfs_swarm}/.*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sort | uniq | tail -n +2 diff --git a/www/boris/youtube.php b/www/boris/youtube.php index 62509fa..6aab55e 100644 --- a/www/boris/youtube.php +++ b/www/boris/youtube.php @@ -5,31 +5,31 @@ require_once('functions.php'); $videosList = array(); -exec("/bin/bash -c './get_youtube_videos.sh'", $videos); +exec("/bin/bash -c './get_astrxbian_index.sh'", $videos); $videos = array_reverse($videos); // ## film;MDan5TDuT-0;;Le Manuel de Survie en Dictature v1.1 au format papier;;["onelove"];k51qzi5uqu5dl0hnglpzumjezep2avacrtbx7i15v91elcxac4cpd8290kl1hq;720p;/ipfs/QmZp63RXhLm6QASmw1t2R8fu5waSJFmyW7cmdVNxyuJXzg/MDan5TDuT-0_Le%20Manuel%20de%20Survie%20en%20Dictature%20v1.1%20au%20format%20papier.mp4 foreach ($videos as $v) { - list($a, $youtubeID, $c, $videoName, $e, $src, $h, $quality, $videoURI) = explode(";", $v); + list($a, $youtubeID, $c, $videoName, $e, $src, $h, $quality, $videoURI) = explode(";", $v); - $videoURL = 'https://'. HOST. $videoURI; - $videoEco = 'https://'. HOST. '/ipns/' . $h; - $mimeType = guessTypeFromFilename($videoURI); + $videoURL = 'https://'. HOST. $videoURI; + $videoEco = 'https://'. HOST. '/ipns/' . $h; + $mimeType = guessTypeFromFilename($videoURI); - if ($mimeType == 'video/mp4') { + if ($mimeType == 'video/mp4') { - $videosList[] = [ - 'mime' => $mimeType, - 'url' => $videoURL, - 'eco' => $videoEco, - 'uri' => $videoURI, - 'name' => $videoName, - 'youtubeID' => $youtubeID - ]; - } + $videosList[] = [ + 'mime' => $mimeType, + 'url' => $videoURL, + 'eco' => $videoEco, + 'uri' => $videoURI, + 'name' => $videoName, + 'youtubeID' => $youtubeID + ]; + } } @@ -37,16 +37,16 @@ foreach ($videos as $v) { ?> - AstroCrowdBuster - - + AstroCrowdBuster + +
-

- Astroport × Crowdbunker -

+

+ Astroport × Crowdbunker +

@@ -55,23 +55,23 @@ echo '';