nicer YAML output

Author: nikolasibalic

caroline/caroline.py

@@ -9,6 +9,15 @@
 
 __all__ = ["Presentation"]
 
+def str_presenter(dumper, data):
+    if data.count('\n') > 0:
+        data = "\n".join([line.rstrip() for line in data.splitlines()])  # Remove any trailing spaces, then put it back together again
+        return dumper.represent_scalar('tag:yaml.org,2002:str', data, style='|')
+    return dumper.represent_scalar('tag:yaml.org,2002:str', data)
+
+yaml.add_representer(str, str_presenter)
+yaml.representer.SafeRepresenter.add_representer(str, str_presenter) # to use with safe_dum
+
 
 class Presentation:
     def __init__(
@@ -70,10 +79,10 @@ def spanText(self, markdown_text, fontSize=1):
         self.leftPartExists = False
 
     def spanCenterText(self, markdown_text, fontSize=1):
-        # self.slides[-1] = {"spanCenter":{"text": markdown_text, fontSize: 1}}
-        self.slides[-1] += self._spanCenter(
-            self._text(markdown_text), fontSize=fontSize
-        )
+        self.slides[-1] = {"spanCenterText": markdown_text, "fontSize": 1}
+        # self.slides[-1] += self._spanCenter(
+        #     self._text(markdown_text), fontSize=fontSize
+        # )
         self.leftPartExists = False
 
     def leftImage(
@@ -533,7 +542,7 @@ def save(self, fileName):
 
         d = []
         for i, slideHTML in enumerate(self.slides):
-            if type("slides") is dict:
+            if type(slideHTML) is dict:
                 d.append(slideHTML)
             else:
                 d.append(
@@ -569,11 +578,13 @@ def save(self, fileName):
                     else -1,
                     "startPresentation": True,
                 },
-                file
+                file,
+                default_flow_style=False, default_style=None, indent=2
             )
             for slide in d:
                 file.write("---\n")
-                yaml.safe_dump(slide, file, default_style="|")
+                
+                yaml.safe_dump(slide, file, default_flow_style=False, default_style=None, indent=2)
 
         with open(fileName, "w") as file:
             file.write(
@@ -601,10 +612,9 @@ def save(self, fileName):
                 )
             fileNameAudience = fileName.replace(".html", "_audience.yaml")
             with open(fileNameAudience, "w") as file:
-                yaml.dump(
+                yaml.safe_dump(
                     {
                         "pageTitle": "Caroline presentation",
-                        "data": d,
                         "logo": l,
                         "username": "Audience",
                         "presenter": False,
@@ -619,8 +629,11 @@ def save(self, fileName):
                         else -1,
                         "startPresentation": True,
                     },
-                    file,
+                    file
                 )
+                for slide in d:
+                    file.write("---\n")
+                    yaml.safe_dump(slide, file)
                 print(
                     "Presentation copy for distribution to Audience is saved in %s"
                     % fileNameAudience

caroline/html/index.html

@@ -218,14 +218,16 @@ <h2 id="confirmmessage"></h2>
 		fetch(initDataLocation)
 		.then(response => response.text())
 		.then((data) => {
-			const d = YAML.parseAllDocuments(data);
-			const init = d[0];
-			const data = d.slice(1);
+			const parse_data = YAML.parseAllDocuments(data).map(function(e){
+				return e.toJSON();
+			});
+			console.log(parse_data);
+			const init = parse_data[0];
 
 			window.roundTable = false; init.roundTable; //false;
 			window.username = init.username;
 			window.room = null; //init.room;  // roundtable room
-			window.data = data;
+			window.data = {"slides": parse_data.slice(1)};
 			window.logoURL = init.logo;
 			window.leftHanded = init.leftHanded;
 			window.drawingHelp = init.drawingHelp;

caroline/html/js/caroline.js

@@ -25,6 +25,7 @@ import markdownItMathjax from "markdown-it-mathjax";
 import markdownit from "markdown-it";
 import { nbv_constructor } from "./nbv.js";
 import { jsPDF } from "jspdf";
+import { yaml2html } from "./yaml2html.js"
 
 
 function resize() {
@@ -3361,7 +3362,7 @@ function showSlide(doNotPushHistory = false) {
 
 
   var l;
-  if (data["slides"][slideIndex]["style"] != "") {
+  if ("style" in data["slides"][slideIndex] && data["slides"][slideIndex]["style"] != "") {
     l = "style='" + data["slides"][slideIndex]["style"].replace("'", '"') + "'";
   }
   else if (logoURL === null) {
@@ -3374,7 +3375,7 @@ function showSlide(doNotPushHistory = false) {
   var d = document.getElementById("slidespace");
   d.innerHTML =
     "<div class='slide'" + l + ">"
-    + data["slides"][slideIndex]["html"]
+    + yaml2html(data["slides"][slideIndex])
     + "</div>";
 
   if (data["slides"][slideIndex]["textAnnotation"] != null) {

caroline/html/js/yaml2html.js

@@ -0,0 +1,12 @@
+
+
+export function yaml2html(slide ){
+    console.log(slide);
+    if ("html" in slide){
+        return slide["html"];
+    }
+    else if ("spanCenterText" in slide){
+        return slide["spanCenterText"];
+    }
+}
+

caroline/preview/__main__.py

@@ -27,14 +27,14 @@ def end_headers(self):
         http.server.SimpleHTTPRequestHandler.end_headers(self)
 
 
-def server(port):
-    httpd = socketserver.TCPServer(("", port), HTTPRequestHandler)
+def server():
+    httpd = socketserver.TCPServer(("", 0), HTTPRequestHandler)
     return httpd
 
 
 if __name__ == "__main__":
-    port = PORT
-    httpd = server(port)
+    httpd = server()
+    host, port = httpd.server_address
     try:
         os.chdir(os.getcwd())
         print("\n = = = = = = CAROLINE presentation = = = = =")