From 23a6aad73c4c6913a71c90b5dddd24a6f46b483a Mon Sep 17 00:00:00 2001 From: Boris Date: Wed, 22 Sep 2021 20:07:11 +0200 Subject: [PATCH] [FIX] Improvement of duplicate content detection and handling --- www/boris/functions.php | 12 ++++++++++++ www/boris/youtube.php | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/www/boris/functions.php b/www/boris/functions.php index b4acff7..5e81a81 100644 --- a/www/boris/functions.php +++ b/www/boris/functions.php @@ -228,3 +228,15 @@ function canReadVideoFormat ($mimeType) { return ($mimeType == 'video/mp4'); } + +function in_array_column($text, $column, $array) +{ + if (!empty($array) && is_array($array)) + { + for ($i=0; $i < count($array); $i++) + { + if ($array[$i][$column]==$text || strcmp($array[$i][$column],$text)==0) return true; + } + } + return false; +} diff --git a/www/boris/youtube.php b/www/boris/youtube.php index 8e6460b..387a89e 100644 --- a/www/boris/youtube.php +++ b/www/boris/youtube.php @@ -15,7 +15,7 @@ $videosList = array(); $search = isset($_GET['search']) ? urldecode($_GET['search']) : ""; exec("/bin/bash -c './get_astrxbian_index.sh \"*\" \"". $search . "\"'", $videos); exec("/bin/bash -c './get_PIN.sh'", $pinnedVideos); -$videos = array_unique($videos); +// $videos = array_unique($videos); // exec("/bin/bash -c './get_youtube_videos.sh'", $videos); // echo file_get_contents("http://youtube2.com/ipns/12D3KooWHLLohhFqwTs3Ccego51w1Q2WUQ8JmhSMWtsZnQpMigHY/.12D3KooWHLLohhFqwTs3Ccego51w1Q2WUQ8JmhSMWtsZnQpMigHY/FASTRXBIAN"); @@ -49,6 +49,11 @@ foreach ($videos as $v) { list($contentType, $videoID, $year, $filename, $saison, $tagsStr, $ipnsHash, $definition, $videoURI) = explode(";", $v); + if (in_array_column($videoURI, 'uri', $videosList)) { + + continue; + } + list($videoSource, $videoID) = handleVideoID($videoID); $ipfsHash = preg_replace('!^/ipfs/([^/]+)/.*$!isU', '$1', $videoURI);