update to generate pads

2 files changed, 16 insertions, 14 deletions

diff --git a/emacsconf-pad.el b/emacsconf-pad.el
index 152b636..7bcb8c2 100644
--- a/emacsconf-pad.el
+++ b/emacsconf-pad.el
@@ -296,14 +296,15 @@ ${next-talk-list}
       (let ((cached-last-modified (emacsconf-pad-with-heading pad-id (org-entry-get (point) "PAD_RESET")))
             (result (emacsconf-pad-get-last-edited pad-id)))
         (let-alist result
-          (not (string= cached-last-modified
-                        (number-to-string .data.lastEdited))))))))
+					(and cached-last-modified
+							 (not (string= cached-last-modified
+														 (number-to-string .data.lastEdited)))))))))
 
 ;;; Hyperlists
 
 (defun emacsconf-pad-export-initial-content-for-hyperlists (dir &optional info)
   (interactive (list (read-file-name "Output directory: " nil nil nil nil 'file-directory-p)))
-  (setq info (emacsconf-prepare-for-display (emacsconf-get-talk-info)))
+  (setq info (emacsconf-publish-prepare-for-display (emacsconf-get-talk-info)))
   (unless (file-directory-p dir)
     (make-directory dir))
   (mapc
@@ -456,7 +457,7 @@ ${bbb-checklist}</li>")
 
 (defun emacsconf-pad-prepopulate-checkins (&optional info)
   (interactive)
-  (setq info (or info (emacsconf-prepare-for-display (emacsconf-get-talk-info))))
+  (setq info (or info (emacsconf-publish-prepare-for-display (emacsconf-get-talk-info))))
   (mapc
    (lambda (day)
      (let ((pad-id (concat "checkin-" (downcase (format-time-string "%a" (plist-get (cadr day) :checkin-time))))))
@@ -488,8 +489,8 @@ ${bbb-checklist}</li>")
                                       (mapcar (lambda (o) (plist-get o :id)) emacsconf-shifts))))
   (when (stringp shift)
     (setq shift (seq-find (lambda (o) (string= (plist-get o :id) shift)) emacsconf-shifts)))
-  (unless info (setq info (emacsconf-prepare-for-display (emacsconf-get-talk-info))))
-  (let ((info (emacsconf-prepare-for-display (emacsconf-get-talk-info))))
+  (unless info (setq info (emacsconf-publish-prepare-for-display (emacsconf-get-talk-info))))
+  (let ((info (emacsconf-publish-prepare-for-display (emacsconf-get-talk-info))))
     (let ((pad-id (format "private_%s_%s"
                           emacsconf-private-pad-prefix
                           (plist-get shift :id))))
@@ -507,8 +508,8 @@ ${bbb-checklist}</li>")
                                       (mapcar (lambda (o) (plist-get o :id)) emacsconf-shifts))))
   (when (stringp shift)
     (setq shift (seq-find (lambda (o) (string= (plist-get o :id) shift)) emacsconf-shifts)))
-  (unless info (setq info (emacsconf-prepare-for-display (emacsconf-get-talk-info))))
-  (let ((info (emacsconf-prepare-for-display (emacsconf-get-talk-info))))
+  (unless info (setq info (emacsconf-publish-prepare-for-display (emacsconf-get-talk-info))))
+  (let ((info (emacsconf-publish-prepare-for-display (emacsconf-get-talk-info))))
     (let* ((pad-id (format "host-%s"
                            (plist-get shift :id)))
 					 (shift-talks
@@ -596,7 +597,7 @@ ${bbb-checklist}</li>")
 
 (defun emacsconf-pad-prepopulate-shift-hyperlists ()
   (interactive)
-  (let ((info (emacsconf-prepare-for-display (emacsconf-get-talk-info))))
+  (let ((info (emacsconf-publish-prepare-for-display (emacsconf-get-talk-info))))
     (mapc (lambda (shift)
             (emacsconf-pad-prepopulate-shift-hyperlist shift info))
           emacsconf-shifts)))
@@ -789,7 +790,7 @@ This page is for easy reference and recording. Please make sure any changes here
               (emacsconf-replace-plist-in-string
                (append (list :intro-note (emacsconf-pad-expand-intro o)) o)
                "<li>${slug} - ${track}: ${title} (${speakers-with-pronouns}, Q&amp;A: ${q-and-a})<ul><li>${absolute-url}</li><li>Intro: ${intro-note}</li></ul></li>"))
-            (emacsconf-prepare-for-display (emacsconf-get-talk-info)))
+            (emacsconf-publish-prepare-for-display (emacsconf-get-talk-info)))
            "</ul>")))
 
 (defun emacsconf-pad-backup-talk (talk)
@@ -808,6 +809,6 @@ This page is for easy reference and recording. Please make sure any changes here
 	(interactive)
 	(mapc
 	 #'emacsconf-pad-backup-talk
-	 (emacsconf-prepare-for-display (emacsconf-get-talk-info))))
+	 (emacsconf-publish-prepare-for-display (emacsconf-get-talk-info))))
 (provide 'emacsconf-pad)
 ;;; emacsconf-pad.el ends here
diff --git a/emacsconf.el b/emacsconf.el
index 7839688..1439570 100644
--- a/emacsconf.el
+++ b/emacsconf.el
@@ -109,7 +109,8 @@
 (defvar emacsconf-media-extensions '("webm" "mkv" "mp4" "webm" "avi" "ts" "ogv" "wav" "ogg" "mp3"))
 (defvar emacsconf-ftp-upload-dir "/ssh:orga@media.emacsconf.org:/srv/ftp/anon/upload-here")
 (defvar emacsconf-backstage-user "emacsconf")
-(defvar emacsconf-backstage-password nil "Password for backstage area")
+(defvar emacsconf-backstage-password nil "Password for backstage area.")
+(defvar emacsconf-upload-password nil "Password for file uploads.")
 (defvar emacsconf-notebook
   (expand-file-name
    "index.org"
@@ -877,7 +878,7 @@ The subheading should match `emacsconf-abstract-heading-regexp'."
     (emacsconf-get-talk-info 'wiki)))
 
 (defun emacsconf-include-next-talks (info number)
-  (let* ((info (emacsconf-prepare-for-display info))
+  (let* ((info (emacsconf-publish-prepare-for-display info))
          (cur-list info))
     ;; add links to the next talks
     (while cur-list
@@ -885,7 +886,7 @@ The subheading should match `emacsconf-abstract-heading-regexp'."
     info))
 
 (defun emacsconf-previous-talk (talk &optional info)
-	(setq info (emacsconf-prepare-for-display (or info (emacsconf-get-talk-info))))
+	(setq info (emacsconf-publish-prepare-for-display (or info (emacsconf-get-talk-info))))
 	(let* ((pos (seq-position info talk))
 				 (prev (and pos
 										(> pos 0)