From 284878f0f9917b55359cd464b86508cacc472653 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 11 Dec 2016 21:46:01 +0100
Subject: add cache-file getters and download preparations

---
 model/Schedule.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'model/Schedule.php')

diff --git a/model/Schedule.php b/model/Schedule.php
index eb9fe05..4032ecb 100644
--- a/model/Schedule.php
+++ b/model/Schedule.php
@@ -265,11 +265,16 @@ class Schedule
 		return ((int)$parts[0] * 60 + (int)$parts[1]) * 60;
 	}
 
-	private function getScheduleUrl()
+	public function getScheduleUrl()
 	{
 		return $this->getConference()->get('SCHEDULE.URL');
 	}
 
+	public function getScheduleCache()
+	{
+		return sprintf('/tmp/schedule-cache-%s', $this->getConference()->getSlug());
+	}
+
 	public function getScheduleToRoomSlugMapping()
 	{
 		$mapping = array();
-- 
cgit v1.3.1


From 3384e963da66e9089b71c546750c8981be8c6ed8 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 17 Dec 2016 14:11:47 +0100
Subject: change storage paths according to issue description

---
 command/download.php | 13 +++++--------
 index.php            |  3 +++
 model/Relive.php     |  2 +-
 model/Schedule.php   |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'model/Schedule.php')

diff --git a/command/download.php b/command/download.php
index 8deb454..17ae7c9 100644
--- a/command/download.php
+++ b/command/download.php
@@ -77,13 +77,13 @@ foreach ($conferences as $conference)
 		);
 	}
 
-	foreach($conference->getExtraFiles() as $file)
+	foreach($conference->getExtraFiles() as $filename => $url)
 	{
 		download(
 			'extra-file',
 			$conference,
-			$file,
-			get_file_cache($conference, $file)
+			$url,
+			get_file_cache($conference, $filename)
 		);
 	}
 }
@@ -91,12 +91,9 @@ foreach ($conferences as $conference)
 
 
 
-function get_file_cache($conference, $url)
+function get_file_cache($conference, $filename)
 {
-	$info = parse_url($url);
-	$host = trim(preg_replace('/[^a-z0-9]/i', '_', $info['host']), '_');
-	$path = trim(preg_replace('/[^a-z0-9]/i', '_', $info['path']), '_');
-	return sprintf('/tmp/file-cache-%s_%s_%s-%s', $conference->getSlug(), $host, $path, md5($url));
+	return joinpath([$GLOBALS['BASEDIR'], 'configs/conferences', $conference->getSlug(), $filename]);
 }
 
 function download($what, $conference, $url, $cache)
diff --git a/index.php b/index.php
index 9b4689c..ca0a6d4 100644
--- a/index.php
+++ b/index.php
@@ -3,6 +3,9 @@
 if(!ini_get('short_open_tag'))
 	die("`short_open_tag = On` is required\n");
 
+$GLOBALS['BASEDIR'] = dirname(__FILE__);
+chdir($GLOBALS['BASEDIR']);
+
 require_once('config.php');
 require_once('lib/helper.php');
 
diff --git a/model/Relive.php b/model/Relive.php
index 5676b62..1e8266a 100644
--- a/model/Relive.php
+++ b/model/Relive.php
@@ -26,7 +26,7 @@ class Relive
 
 	public function getJsonCache()
 	{
-		return sprintf('/tmp/relive-cache-%s', $this->getConference()->getSlug());
+		return sprintf('/tmp/relive-cache-%s.json', $this->getConference()->getSlug());
 	}
 
 	public function getTalks()
diff --git a/model/Schedule.php b/model/Schedule.php
index 4032ecb..6536864 100644
--- a/model/Schedule.php
+++ b/model/Schedule.php
@@ -272,7 +272,7 @@ class Schedule
 
 	public function getScheduleCache()
 	{
-		return sprintf('/tmp/schedule-cache-%s', $this->getConference()->getSlug());
+		return sprintf('/tmp/schedule-cache-%s.xml', $this->getConference()->getSlug());
 	}
 
 	public function getScheduleToRoomSlugMapping()
-- 
cgit v1.3.1


From da739f3b60a30d5dd5c7877742f8b5c292f25f46 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 18 Dec 2016 10:37:10 +0100
Subject: use the new cache-files for viewing

---
 model/Relive.php   |  2 +-
 model/Schedule.php | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'model/Schedule.php')

diff --git a/model/Relive.php b/model/Relive.php
index 1e8266a..542836d 100644
--- a/model/Relive.php
+++ b/model/Relive.php
@@ -31,7 +31,7 @@ class Relive
 
 	public function getTalks()
 	{
-		if(!file_exists($this->getJsonUrl()))
+		if(!file_exists($this->getJsonCache()))
 			return array();
 
 		$talks = file_get_contents($this->getJsonUrl());
diff --git a/model/Schedule.php b/model/Schedule.php
index 6536864..b54709e 100644
--- a/model/Schedule.php
+++ b/model/Schedule.php
@@ -36,17 +36,10 @@ class Schedule
 
 	private function fetchSchedule()
 	{
-		$opts = array(
-			'http' => array(
-				'timeout' => 2,
-				'user_agent' => 'C3VOC Universal Streaming-Website Backend @ '.$_SERVER['HTTP_HOST'],
-			)
-		);
-		$context  = stream_context_create($opts);
-		$schedule = file_get_contents($this->getScheduleUrl(), false, $context);
+		$schedule = file_get_contents($this->getScheduleCache());
 
 		if(!$schedule)
-			throw new ScheduleException("Error Downloading Schedule from ".$this->getConference()->getScheduleUrl());
+			throw new ScheduleException("Error Loading Schedule from ".$this->getScheduleCache());
 
 		return simplexml_load_string($schedule);
 	}
-- 
cgit v1.3.1