Boris
/
astrXbian_UX-et-webUI
forked from axiom-team/astrXbian
0
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Compare commits

base: Boris:af51349bba2ee0176391d207229d81858f8e17a3
Branches Tags
Boris:master
Boris:boris
axiom-team:master
...
compare: Boris:23a6aad73c4c6913a71c90b5dddd24a6f46b483a
Branches Tags
Boris:boris
Boris:master
axiom-team:master

2 Commits
af51349bba ... 23a6aad73c

Author SHA1 Message Date
Boris 23a6aad73c [FIX] Improvement of duplicate content detection and handling 2021-09-22 20:08:20 +02:00
fred 71b79cd842 30s timeout before restart 2021-09-22 12:26:24 +02:00
3 changed files with 19 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
cron_MINUTE.sh
View File

@ -20,7 +20,7 @@ source $HOME/.profile
#### CONTROL STATION IPFS DAEMON
## timeout is fixing ipfs minimum response time, before considering stuck process
IPFSNODEID=$(ipfs --timeout=20s id -f='<id>\n')
IPFSNODEID=$(ipfs --timeout=30s id -f='<id>\n')
[[ ! $IPFSNODEID && -f /etc/sudoers.d/systemctl ]] && echo "IPFS NOT RUNNING" && sudo systemctl restart ipfs && exit 1
[[ ! $IPFSNODEID && "${USER}" == "xbian" ]] && echo "IPFS NOT RUNNING" && sudo service ipfs restart && exit 1
## CONTROL IPFS IS RUNNING OR RESTART

12
www/boris/functions.php
View File

@ -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;
}

7
www/boris/youtube.php
View File

@ -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);