Add support for the new pretalx API

4 files changed, 41 insertions, 40 deletions

diff --git a/halfnarp2.py b/halfnarp2.py
index 0cc3906..5ac9405 100755
--- a/halfnarp2.py
+++ b/halfnarp2.py
@@ -121,14 +121,14 @@ def get_preferences(public_uid):
 def filter_keys_halfnarp(session):
     abstract_html = markdown.markdown(session["abstract"], enable_attributes=False)
     abstract_clean_html = Sanitizer().sanitize(abstract_html)
-    slot = session["slot"]
+    slot = next(iter(session["slots"]), {})
 
     return {
         "title": session.get("title", "!!! NO TITLE !!!"),
         "duration": 60 * session.get("duration", 40),
         "event_id": session["code"],
         "language": session.get("content_locale", "de"),
-        "track_id": session["track_id"],
+        "track_id": session["track"],
         "speaker_names": ", ".join(
             [speaker.get("name", "unnamed") for speaker in session.get("speakers", {})]
         ),
@@ -141,7 +141,7 @@ def filter_keys_halfnarp(session):
 def filter_keys_fullnarp(session, speakers):
     abstract_html = markdown.markdown(session["abstract"], enable_attributes=False)
     abstract_clean_html = Sanitizer().sanitize(abstract_html)
-    slot = session["slot"]
+    slot = next(iter(session["slots"]), {})
 
     speaker_info = []
     for speaker in session.get("speakers", {}):
@@ -181,7 +181,7 @@ def filter_keys_fullnarp(session, speakers):
         "duration": 60 * session.get("duration", 40),
         "event_id": session["code"],
         "language": session.get("content_locale", "de"),
-        "track_id": session["track_id"],
+        "track_id": session["track"],
         "speakers": speaker_info,
         "speaker_names": ", ".join(
             [speaker.get("name", "unnamed") for speaker in session.get("speakers", {})]
@@ -194,27 +194,28 @@ def filter_keys_fullnarp(session, speakers):
 
 def fetch_talks(config):
     sess = requests.Session()
-
-    response = sess.get(
-        config["pretalx-api-url"] + "/submissions/?format=json&limit=20000",
-        stream=True,
-        headers={"Authorization": "Token " + config["pretalx-token"]},
-    )
-    # with open('dump.txt', mode='wb') as localfile:
-    #           localfile.write(response.content)
-    talks_json = json.loads(response.text)
-
-    response = sess.get(
-        config["pretalx-api-url"] + "/speakers/?format=json&limit=20000",
-        stream=True,
-        headers={"Authorization": "Token " + config["pretalx-token"]},
-    )
-    speakers_json = json.loads(response.text)
-    speakers = dict((speaker["code"], speaker) for speaker in speakers_json["results"])
+    headers = {'Accept': 'application/json',
+               'Authorization': "Token " + config['pretalx-token'],
+               'Pretalx-Version' : 'v1'}
+
+    speakers_result = []
+    url = config['pretalx-api-url'] + '/speakers/?format=json&limit=20000'
+    while url:
+        response = sess.get(url, stream=True, headers=headers).json()
+        speakers_result.extend(response['results'])
+        url = response['next']
+    speakers = { speaker['code']: speaker for speaker in speakers_result }
+
+    session_results = []
+    url = config['pretalx-api-url'] + '/submissions/?expand=speakers,slot,speakers.availabilities&format=json&limit=20000'
+    while url:
+        response = sess.get(url, stream=True, headers=headers).json()
+        session_results.extend(response['results'])
+        url = response['next']
 
     sessions = [
         filter_keys_halfnarp(submission)
-        for submission in talks_json["results"]
+        for submission in session_results
         if submission["state"] == "confirmed"
         and not "non-public" in submission.get("tags", {})
     ]
@@ -223,7 +224,7 @@ def fetch_talks(config):
 
     sessions = [
         filter_keys_fullnarp(submission, speakers)
-        for submission in talks_json["results"]
+        for submission in session_results
         if submission["state"] == "confirmed" or submission["state"] == "accepted"
     ]
     with open("var/talks_local_fullnarp", mode="w", encoding="utf8") as sessionsfile:
diff --git a/scripts/gen_css_tables.py b/scripts/gen_css_tables.py
index 4bc5ea8..0eb88f4 100755
--- a/scripts/gen_css_tables.py
+++ b/scripts/gen_css_tables.py
@@ -8,7 +8,7 @@
 start_y   = 400
 starttime = 10
 endtime   = 28
-rooms     = 3
+rooms     = 4
 days      = 4
 columns   = days * rooms          # how many columns does 
 event_gap = { 'large': 5, 'medium': 3, 'small': 2 }  # how much is an event shorter than what the grid would allow in px
diff --git a/static/fullnarp.html b/static/fullnarp.html
index a00f89e..3b86d6c 100644
--- a/static/fullnarp.html
+++ b/static/fullnarp.html
@@ -3,8 +3,8 @@
 <head>
   <meta charset="utf-8">
   <title>FULLnarp web scheduling helper app</title>
-  <link rel="stylesheet" href="style_38c3.css">
-  <link rel="stylesheet" href="style_38c3_tables.css">
+  <link rel="stylesheet" href="style_39c3.css">
+  <link rel="stylesheet" href="style_39c3_tables.css">
   <script src="fullnarp.js"></script>
   <script>
     document.addEventListener('DOMContentLoaded', () => { do_the_fullnarp(); });
@@ -20,7 +20,7 @@
 </div>
 <div class="trashbin">🗑️</div>
 <div class="version">version</div>
-<div class="headline">The 38C3 fullnarp</div>
+<div class="headline">The 39C3 fullnarp</div>
 <div class="header">
 <div class="leftbox">
 <input id="filter" type="text" placeholder="Filter events"/>
@@ -46,10 +46,10 @@
 </div>
 </div>
 </div>
-<div class="day_1 room-label room1">Saal 1</div><div class="day_1 room-label room2">Saal 2</div><div class="day_1 room-label room3">Saal 3</div></div>
-<div class="day_2 room-label room1">Saal 1</div><div class="day_2 room-label room2">Saal 2</div><div class="day_2 room-label room3">Saal 3</div></div>
-<div class="day_3 room-label room1">Saal 1</div><div class="day_3 room-label room2">Saal 2</div><div class="day_3 room-label room3">Saal 3</div></div>
-<div class="day_4 room-label room1">Saal 1</div><div class="day_4 room-label room2">Saal 2</div><div class="day_4 room-label room3">Saal 3</div></div>
+<div class="day_1 room-label room1">Saal 1</div><div class="day_1 room-label room2">Saal 2</div><div class="day_1 room-label room3">Saal 3</div><div class="day_1 room-label room4">Saal 4</div></div>
+<div class="day_2 room-label room1">Saal 1</div><div class="day_2 room-label room2">Saal 2</div><div class="day_2 room-label room3">Saal 3</div><div class="day_2 room-label room4">Saal 4</div></div>
+<div class="day_3 room-label room1">Saal 1</div><div class="day_3 room-label room2">Saal 2</div><div class="day_3 room-label room3">Saal 3</div><div class="day_3 room-label room4">Saal 4</div></div>
+<div class="day_4 room-label room1">Saal 1</div><div class="day_4 room-label room2">Saal 2</div><div class="day_4 room-label room3">Saal 3</div><div class="day_4 room-label room4">Saal 4</div></div>
 
 <div class=" time_1815 duration_3600 guide pause ">P A U S E</div>
 <div class=" time_1445 wholeblock room1 guide day_1"></div>
@@ -65,13 +65,13 @@
 <div class="wholeday room1 day_1 guide uneven"></div>
 <div class="wholeday room1 day_3 guide uneven"></div>
 
-<div class="track" id="6"><h2>Security</h2></div>
-<div class="track" id="4"><h2>Hardware &amp; Making</h2></div>
-<div class="track" id="7"><h2>Ethics, Society &amp; Politics</h2></div>
-<div class="track" id="2"><h2>CCC</h2></div>
-<div class="track" id="3"><h2>Entertainment</h2></div>
-<div class="track" id="5"><h2>Science</h2></div>
-<div class="track" id="1"><h2>Art &amp; Beauty</div>
+<div class="track" id="31"><h2>Security</h2></div>
+<div class="track" id="32"><h2>Hardware &amp; Making</h2></div>
+<div class="track" id="28"><h2>Ethics, Society &amp; Politics</h2></div>
+<div class="track" id="30"><h2>CCC</h2></div>
+<div class="track" id="27"><h2>Entertainment</h2></div>
+<div class="track" id="29"><h2>Science</h2></div>
+<div class="track" id="33"><h2>Art &amp; Beauty</div>
 <div class="track" id="999"><h2>Other</div>
 
 </body>
diff --git a/static/fullnarp.js b/static/fullnarp.js
index c4e24f4..34a59c4 100644
--- a/static/fullnarp.js
+++ b/static/fullnarp.js
@@ -1,5 +1,5 @@
 let ws; // WebSocket instance
-let allrooms   = ['1','2','3']
+let allrooms   = ['1','2','3','4']
 let allminutes = ['00','05','10','15','20','25','30','35','40','45','50','55']
 let allhours   = ['10','11','12','13','14','15','16','17','18','19','20','21','22','23','00','01','02'];
 let alldays    = ['1','2','3','4'];
@@ -395,7 +395,7 @@ function signalFullnarpConnect(state) {
 
 function getFullnarpData() {
     signalFullnarpConnect('fullnarp-connecting');
-    connect = window.location.href.replace('http', 'ws') + '/ws/';
+    connect = window.location.href.replace('http', 'ws') + 'ws/';
     ws = new WebSocket(connect);
 
     ws.onopen = () => {