From f6c0270d40f6730fe1e1820f2866b08792df1db6 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 10 Dec 2016 18:22:34 +0100
Subject: rewrite data-model so that every configuration option is accessed
 through the conference

---
 model/Relive.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'model/Relive.php')

diff --git a/model/Relive.php b/model/Relive.php
index d0e7522..ca32f19 100644
--- a/model/Relive.php
+++ b/model/Relive.php
@@ -1,16 +1,27 @@
 <?php
 
-class Relive extends ModelBase
+class Relive
 {
+	private $conference;
+
+	public function __construct($conference)
+	{
+		$this->conference = $conference;
+	}
+
+	public function getConference() {
+		return $this->conference;
+	}
+
 	public function isEnabled()
 	{
 		// having CONFERENCE.RELIVE is not enough!
-		return $this->has('CONFERENCE.RELIVE_JSON');
+		return $this->getConference()->has('CONFERENCE.RELIVE_JSON');
 	}
 
 	public function getJsonUrl()
 	{
-		return $this->get('CONFERENCE.RELIVE_JSON');
+		return $this->getConference()->get('CONFERENCE.RELIVE_JSON');
 	}
 
 	public function getTalks()
-- 
cgit v1.2.3


From b137ccc18be2f8addf10b0db5257da8c3767dba9 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 10 Dec 2016 18:24:03 +0100
Subject: repair indentation

---
 model/Relive.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'model/Relive.php')

diff --git a/model/Relive.php b/model/Relive.php
index ca32f19..7f0e747 100644
--- a/model/Relive.php
+++ b/model/Relive.php
@@ -34,22 +34,22 @@ class Relive
 
 		$mapping = $this->getScheduleToRoomMapping();
 
-                usort($talks, function($a, $b) {
-                        // first, make sure that live talks are always on top
-                        if($a['status'] == 'live' && $b['status'] != 'live') {
-                                return -1;
-                        } else if($a['status'] != 'live' && $b['status'] == 'live') {
-                                return 1;
-                        } else if($a['status'] == 'live' && $b['status'] == 'live') {
-                                // sort live talks by room
-
-                                return strcmp($a['room'], $b['room']);
-                        }
-
-                        // all other talks get sorted by their name
-
-                        return strcmp($a['title'], $b['title']);
-                });
+		usort($talks, function($a, $b) {
+			// first, make sure that live talks are always on top
+			if($a['status'] == 'live' && $b['status'] != 'live') {
+				return -1;
+			}
+			else if($a['status'] != 'live' && $b['status'] == 'live') {
+				return 1;
+			}
+			else if($a['status'] == 'live' && $b['status'] == 'live') {
+				// sort live talks by room
+				return strcmp($a['room'], $b['room']);
+			}
+
+			// all other talks get sorted by their name
+			return strcmp($a['title'], $b['title']);
+		});
 
 		$talks_by_id = array();
 		foreach ($talks as $talk)
-- 
cgit v1.2.3


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/Relive.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'model/Relive.php')

diff --git a/model/Relive.php b/model/Relive.php
index 7f0e747..5676b62 100644
--- a/model/Relive.php
+++ b/model/Relive.php
@@ -24,6 +24,11 @@ class Relive
 		return $this->getConference()->get('CONFERENCE.RELIVE_JSON');
 	}
 
+	public function getJsonCache()
+	{
+		return sprintf('/tmp/relive-cache-%s', $this->getConference()->getSlug());
+	}
+
 	public function getTalks()
 	{
 		if(!file_exists($this->getJsonUrl()))
-- 
cgit v1.2.3


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

---
 model/Relive.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'model/Relive.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()
-- 
cgit v1.2.3


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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'model/Relive.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());
-- 
cgit v1.2.3