From 23c7e153ee5c84baa6bf78f2057979b616cf4853 Mon Sep 17 00:00:00 2001 From: Sacha Chua Date: Tue, 24 Oct 2023 13:57:05 -0400 Subject: include etherpad in JSON --- emacsconf-publish.el | 94 +++++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 45 deletions(-) diff --git a/emacsconf-publish.el b/emacsconf-publish.el index 4da789d..7a55a62 100644 --- a/emacsconf-publish.el +++ b/emacsconf-publish.el @@ -20,7 +20,7 @@ ;;; Commentary: -;; +;; ;;; Code: @@ -151,7 +151,7 @@ :audio-html (or (plist-get video :audio) "") :chapter-list (or (plist-get video :chapter-list) "") :resources (or (plist-get video :resources) "") - :extra (or (plist-get talk :extra) "") + :extra (or (plist-get talk :extra) "") :speaker-info (or (plist-get talk :speakers-with-pronouns) "")))) (emacsconf-replace-plist-in-string talk @@ -365,7 +365,7 @@ (format "%s%s/%s" emacsconf-media-base-url (plist-get talk :conf-year) (file-name-nondirectory (plist-get talk :audio-file))) (file-name-nondirectory (plist-get talk :audio-file)))) - "") + "") :resources (emacsconf-replace-plist-in-string info @@ -479,7 +479,7 @@ resources." :video-file (emacsconf-talk-file o "--answers.webm") :audio-file (emacsconf-talk-file o "--answers.opus") :chapter-file (emacsconf-talk-file o "--answers--chapters.vtt")) - + o) (list "--answers.webm" "--answers.vtt" "--answers--chapters.vtt" "--answers.opus"))) ""))) @@ -544,8 +544,8 @@ resources." ""))) (concat "[[!toc ]] -Format: ${format} -${pad-info}${irc-info}${status-info}${schedule-info}\n" +Format: ${format} +${pad-info}${irc-info}${status-info}${schedule-info}\n" (if (plist-get o :alternate-apac) (format "[[!inline pages=\"internal(%s/inline-alternate)\" raw=\"yes\"]] \n" emacsconf-year) "") @@ -585,7 +585,7 @@ ${pad-info}${irc-info}${status-info}${schedule-info}\n" (concat "\nThe following image shows where the talk is in the schedule for " (format-time-string "%a %Y-%m-%d" (plist-get talk :start-time) emacsconf-timezone) ". Solid lines show talks with Q&A via BigBlueButton. Dashed lines show talks with Q&A via IRC or Etherpad." - (format "
\n" (plist-get talk :slug)) + (format "
\n" (plist-get talk :slug)) (let* ((width 800) (height 150) (talk-date (format-time-string "%Y-%m-%d" (plist-get talk :start-time) emacsconf-timezone)) (start (date-to-time (concat talk-date "T" emacsconf-schedule-start-time emacsconf-timezone-offset))) @@ -621,7 +621,7 @@ This includes the intro note, the schedule, and talk resources." (setq info (or info (emacsconf-publish-prepare-for-display (emacsconf-get-talk-info)))) (with-temp-file (expand-file-name (format "%s-before.md" (plist-get talk :slug)) (expand-file-name "info" (expand-file-name emacsconf-year emacsconf-directory))) - + (insert "\n") (insert (emacsconf-surround "" (plist-get talk :intro-note) "\n\n" "")) (let ((is-live (emacsconf-talk-live-p talk))) @@ -659,7 +659,7 @@ This includes the intro note, the schedule, and talk resources." (defun emacsconf-publish-format-transcript (talk &optional video-id lang) "Format the transcript for TALK, adding paragraph markers when possible." - (require 'subed) + (require 'subed) (let* ((chapters (plist-get talk :chapter-file)) (subtitles (subed-parse-file (if lang @@ -820,7 +820,7 @@ Back to the [[talks]] \n" (lambda (o) (if (null (plist-get o :slug)) (format "%s" (emacsconf-format-talk-link o)) - (format "%s%s%s" + (format "%s%s%s" (plist-get o :time) (emacsconf-format-talk-link o) (plist-get o :speakers)))) @@ -994,7 +994,7 @@ Entries are sorted chronologically, with different tracks interleaved." "draft-schedule.md" (expand-file-name emacsconf-year emacsconf-directory)) (insert - "[[!sidebar content=\"\"]]\n\n" + "[[!sidebar content=\"\"]]\n\n" "This is a *DRAFT* schedule.\n" (let ((emacsconf-publishing-phase 'schedule)) (emacsconf-publish-format-interleaved-schedule info)))))) @@ -1013,8 +1013,8 @@ Entries are sorted chronologically, with different tracks interleaved." (plist-get o :speakers))) (emacsconf-filter-talks info))) (captioned (seq-filter (lambda (o) (plist-get o :captioner)) talks)) - (received (seq-remove (lambda (o) - (plist-get o :captioner)) + (received (seq-remove (lambda (o) + (plist-get o :captioner)) talks))) (format "
%d talks total: %d captioned (%d min), %d waiting for captions (%d min)
" (length talks) @@ -1042,7 +1042,7 @@ Entries are sorted chronologically, with different tracks interleaved." ("STARTED" "now playing") (_ nil)) :time (plist-get o :time) - :q-and-a (plist-get o :qa-link) + :q-and-a (plist-get o :qa-link) :pad (and emacsconf-publish-include-pads (plist-get o :pad-url)) :startutc (format-time-string "%FT%T%z" (plist-get o :start-time) t) :endutc (format-time-string "%FT%T%z" (plist-get o :end-time) t) @@ -1172,7 +1172,7 @@ Entries are sorted chronologically, with different tracks interleaved." (setq f (append f (list :extra - + (concat "
" (emacsconf-surround "Being captioned by " (plist-get f :captioner) " " "") (emacsconf-surround "Note: " (plist-get f :caption-note) "" "") @@ -1251,7 +1251,7 @@ Entries are sorted chronologically, with different tracks interleaved." " - " (plist-get o :slug) (plist-get o :title) (plist-get o :speakers) url url))) talks "

\n") + " (plist-get o :slug) (plist-get o :title) (plist-get o :speakers) url url))) talks "

\n") "

-------------------------------------------------------------------------------------------------
General Feedback: What went well?