aboutsummaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorMaZderMind2015-11-08 15:15:53 +0100
committerMaZderMind2015-11-08 15:15:53 +0100
commita0b2129479ba10561811847c0651df8b55c8a6ba (patch)
tree2177365d737a24453783107697d19e712330f66d /configs
parentefe1f83a7cc419df700dfe36ef11da20607d8eae (diff)
Support an All-Conference-Closed Screen and mutliple Schedules & Relive-URLs
Diffstat (limited to 'configs')
-rw-r--r--configs/conferences/31c3/config.php6
-rwxr-xr-xconfigs/conferences/31c3/download.sh7
-rwxr-xr-xconfigs/download.sh14
3 files changed, 19 insertions, 8 deletions
diff --git a/configs/conferences/31c3/config.php b/configs/conferences/31c3/config.php
index a0f6383..1ad5709 100644
--- a/configs/conferences/31c3/config.php
+++ b/configs/conferences/31c3/config.php
@@ -106,7 +106,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
*
* Wird diese Zeile auskommentiert, wird der Link nicht angezeigt
*/
- 'RELIVE_JSON' => 'configs/vod.json',
+ 'RELIVE_JSON' => 'configs/conferences/31c3/vod.json',
);
/**
@@ -486,12 +486,12 @@ $GLOBALS['CONFIG']['SCHEDULE'] = array(
/**
* URL zum Fahrplan-XML
*
- * Diese URL muss immer verfügbar sein, sonst können kann die Programm-Ansicht
+ * Diese URL muss immer verfügbar sein, sonst könnte die Programm-Ansicht
* aufhören zu funktionieren. Üblicherweise wird diese daher Datei über
* das Script configs/download.sh heruntergeladen, welches von einem
* Cronjob regelmäßig getriggert wird.
*/
- 'URL' => 'configs/schedule.xml',
+ 'URL' => 'configs/conferences/31c3/schedule.xml',
/**
* Nur die angegebenen Räume aus dem Fahrplan beachten
diff --git a/configs/conferences/31c3/download.sh b/configs/conferences/31c3/download.sh
new file mode 100755
index 0000000..81d5ad7
--- /dev/null
+++ b/configs/conferences/31c3/download.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# fahrplan
+wget --no-check-certificate -q "http://events.ccc.de/congress/2014/Fahrplan/schedule.xml" -O /tmp/schedule.xml && mv /tmp/schedule.xml schedule.xml
+
+# vod json
+wget -q "http://cdn.c3voc.de/releases/relive/index.json" -O /tmp/vod.json && mv /tmp/vod.json vod.json
diff --git a/configs/download.sh b/configs/download.sh
index 8808ff0..c2a2b3e 100755
--- a/configs/download.sh
+++ b/configs/download.sh
@@ -1,10 +1,14 @@
#!/bin/sh
-# fahrplan
-wget --no-check-certificate -q "http://events.ccc.de/congress/2014/Fahrplan/schedule.xml" -O /tmp/schedule.xml && mv /tmp/schedule.xml schedule.xml
-
-# vod json
-wget -q "http://cdn.c3voc.de/releases/relive/index.json" -O /tmp/vod.json && mv /tmp/vod.json vod.json
+# conferences
+wd=`pwd`
+for d in conferences/*; do
+ if [ -x $d/download.sh ]; then
+ cd $d
+ ./download.sh
+ cd $wd
+ fi
+done
# eventkalender upcoming
wget -q --no-check-certificate "https://c3voc.de/eventkalender/events.json?filter=upcoming&streaming=yes" -O /tmp/upcoming.json && mv /tmp/upcoming.json upcoming.json