From 428bdbe0b99b5bb260d0329c60015d562fe825c2 Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Sun, 28 Jun 2020 03:58:14 +0000
Subject: [PATCH] committing live changes

---
 djindex.php       | 2 +-
 index.php         | 4 ++--
 webhook/index.php | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/djindex.php b/djindex.php
index 813dda9..f6af54e 100644
--- a/djindex.php
+++ b/djindex.php
@@ -18,7 +18,7 @@ $dj = basename(__DIR__);
 	<p><a href="..">&lt; back</a></p>
 	<hr>
 <?php
-foreach (glob("/var/www/html/$dj/*.mp3") as $dir) {
+foreach (glob("/var/www/archive/$dj/*.mp3") as $dir) {
 	$name = basename($dir);
 ?>
 	<div class="list-group">
diff --git a/index.php b/index.php
index 523db9c..e4d9ced 100644
--- a/index.php
+++ b/index.php
@@ -14,9 +14,9 @@
 	<p><a href="https://tilderadio.org">back to tilderadio.org</a> - <a href="https://radio.tildeverse.org/radio/8000/radio.ogg">listen now</a></p>
 	<hr>
 <?php
-foreach (glob("/var/www/html/*") as $dir) {
+foreach (glob("/var/www/archive/*") as $dir) {
 	$name = basename($dir);
-	if ($name == "webhook" || !is_dir($dir)) continue;
+	if ($name == "webhook" || $name == "log" || !is_dir($dir)) continue;
 ?>
 	<div class="list-group">
 	    <a href="<?=$name?>/" class="list-group-item">
diff --git a/webhook/index.php b/webhook/index.php
index 0d378a6..e875335 100644
--- a/webhook/index.php
+++ b/webhook/index.php
@@ -10,15 +10,16 @@ if ($json->live->is_live) {
     // posix_kill with 0 signal tells you if the process is running
     if ($current_pid != "" && posix_kill($current_pid, 0)) die();
 
-    $timestamp = date("Y-m-d\TH:i:s");
+    $timestamp = date("Y-m-d\TH_i_s");
     if (!is_dir(__DIR__."/../$streamer")) {
 	mkdir(__DIR__."/../$streamer");
-	copy(__DIR__."/../djindex.php", __DIR__."/../$streamer/index.php");
+	copy(__DIR__."/../djindex.html", __DIR__."/../$streamer/index.html");
     }
 
     $standard_stream = "https://radio.tildeverse.org/radio/8000/radio.ogg";
     $testing_stream = "https://radio.tildeverse.org/radio/8010/radio.mp3";
-    $cmd = "/usr/bin/ffmpeg -i $standard_stream ../$streamer/tilderadio-$timestamp.mp3 >out.log 2>&1 & echo $!";
+    $metadata = "-metadata title=\"tilderadio archive - $timestamp\" -metadata artist=\"$streamer\"";
+    $cmd = "/usr/bin/ffmpeg -i $standard_stream $metadata ../$streamer/tilderadio-$streamer-$timestamp.mp3 >out.log 2>&1 & echo $!";
     $pid = exec($cmd);
 
     echo $pid;