Update sid's nick, include extra answer

1 files changed, 21 insertions, 22 deletions

diff --git a/2020/submissions.org b/2020/submissions.org
index 90187754..bea68af5 100644
--- a/2020/submissions.org
+++ b/2020/submissions.org
@@ -170,16 +170,17 @@ execute the buffer, update the talk's info/TALKID.md file.
 
 ** NOVEMBER 28 (Saturday)                                              :sat:
 
-*** Opening remarks
+*** Day 1 opening remarks
 SCHEDULED: <2020-11-28 Sat 09:00-09:30>
 :PROPERTIES:
 :FIXED_TIME: t
 :MIN_TIME: 30
-:NAME:     Amin Bandali
+:NAME:     Amin Bandali, Sacha Chua, Leo Vivier
 :CUSTOM_ID: talk00
 :TALK_ID:  00
 :ROOM:     A
 :END:
+
 *** 9:30 - 12:00 User talks                                       :morning:
 :PROPERTIES:
 :TARGET_TIME: 120
@@ -576,7 +577,7 @@ SCHEDULED: <2020-11-28 Sat 10:48-10:58>
 :MAX_TIME: 10
 :MIN_TIME: 10
 :AVAILABILITY: ok
-:NAME:     Corwin Brust
+:NAME:     Corwin Brust (mplsCorwin)
 :CUSTOM_ID: talk06
 :TALK_ID:  06
 :END:
@@ -628,7 +629,7 @@ SCHEDULED: <2020-11-28 Sat 11:01-11:21>
 :MIN_TIME: 20
 :MAX_TIME: 50
 :AVAILABILITY: PST, so maybe 11 AM EST - 5 PM EST?
-:NAME:     Sid Kasivajhula (countvaj`)
+:NAME:     Sid Kasivajhula (countvajhula)
 :CUSTOM_ID: talk07
 :TALK_ID:  07
 :END:
@@ -1716,7 +1717,7 @@ SCHEDULED: <2020-11-28 Sat 16:16-16:36>
 :MIN_TIME: 20
 :MAX_TIME: 20
 :AVAILABILITY: ok
-:NAME:     Corwin Brust
+:NAME:     Corwin Brust (mplsCorwin)
 :CUSTOM_ID: talk20
 :TALK_ID:  20
 :END:
@@ -1773,24 +1774,24 @@ material owned by third parties, I represent that the material is
 sublicensable to the EmacsConf organizers or that my use of them is
 fair use.
 
-*** Closing remarks
+*** Day 1 closing remarks
 SCHEDULED: <2020-11-28 Sat 16:30-17:00>
 :PROPERTIES:
 :FIXED_TIME: t
 :MIN_TIME: 30
-:NAME:     Amin Bandali
+:NAME:     Amin Bandali, Sacha Chua, Leo Vivier, Corwin Brust
 :TALK_ID:  40
 :CUSTOM_ID: talk40
 :END:
 
 ** NOVEMBER 29 (Sunday)                                                :sun:
 
-*** Opening remarks
+*** Day 2 opening remarks
 SCHEDULED: <2020-11-29 Sun 09:00-09:10>
 :PROPERTIES:
 :FIXED_TIME: t
 :MIN_TIME: 10
-:NAME:     Amin Bandali
+:NAME:     Amin Bandali, Sacha Chua, Leo Vivier
 :TALK_ID:  41
 :CUSTOM_ID: talk41
 :END:
@@ -2442,13 +2443,13 @@ SCHEDULED: <2020-11-29 Sun 14:22-14:42>
 :MAX_TIME: 20
 :MIN_TIME: 20
 :AVAILABILITY: ok
-:NAME:     Erik Elmshauser and Corwin Brust
+:NAME:     Erik Elmshauser and Corwin Brust (mplsCorwin)
 :CUSTOM_ID: talk29
 :QA:  rtmp
 :TALK_ID:  29
 :END:
 
-Name: Erik Elmshauser and Corwin Brust
+Name: Erik Elmshauser and Corwin Brust (mplsCorwin)
 
 ***** Preferred format
 
@@ -2937,12 +2938,12 @@ material owned by third parties, I represent that the material is
 sublicensable to the EmacsConf organizers or that my use of them is
 fair use.
 
-*** Closing remarks
+*** Day 2 closing remarks
 SCHEDULED: <2020-11-29 Sun 16:30-17:00>
 :PROPERTIES:
 :FIXED_TIME: t
 :MIN_TIME: 30
-:NAME:     Amin Bandali
+:NAME:     Amin Bandali, Sacha Chua, Leo Vivier, Corwin Brust
 :TALK_ID:  42
 :CUSTOM_ID: talk42
 :END:
@@ -3120,6 +3121,7 @@ The total is written to the MIN_TIME_SUM property of this heading"
 ** Generate schedule file
 
 #+begin_src emacs-lisp :results none :eval yes :exports code :tangle "conf.el"
+
 (defvar conf/timezones '("EST" "America/Los_Angeles" "UTC" "CET" "Asia/Singapore") "List of timezones")
 
 (defun conf/get-talk-info ()
@@ -3261,6 +3263,8 @@ The total is written to the MIN_TIME_SUM property of this heading"
     (goto-char (point-min))
     (goto-char (org-find-property "ID" "talks"))
     (conf/get-talk-info)))
+  (defvar conf/info nil)
+  (setq conf/info (conf/get-talk-info-from-file))
 
 (defun conf/generate-pad-template ()
   (interactive)
@@ -3312,22 +3316,17 @@ Talk page: <https://emacsconf.org/2020/schedule/%s>
                                (format "<tr><td colspan=\"2\"%s</td></tr>" (plist-get o :title))
                              (format "<tr><td>%s</td><td>%s</td><tr>" (conf/format-talk-link o)
                                      (plist-get o :speakers)))))
-                       (cdr info) "\n")))
+                                     info "\n")))
       (save-buffer))))
 
 (defun conf/generate-schedule-files (&optional filename)
   (interactive)
   (let ((info (conf/get-talk-info-from-file filename)))
+    (conf/generate-talks-page)
     (with-temp-buffer
       (insert (conf/format-talk-info-as-schedule info))
-      (write-file "schedule-details.txt"))
-    (conf/format-talk-pages info)
-    (with-current-buffer (find-file "schedule.org")
-      (let ((output (org-export-as 'md)))
-        (with-current-buffer (find-file "schedule.md")
-          (erase-buffer)
-          (insert output)
-          (save-buffer))))))
+      (write-file "schedule-details.md"))
+    (conf/format-talk-pages info)))
 #+end_src
 
 #+RESULTS: