Merge pull request #28 from obelisk/emoji-gen-fix

remove emojis after parse for text slides
obelisk · Jul 24, 2024 · 848d36c · 848d36c
2 parents d823590 + 42f8958
commit 848d36c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/src/presentation/mod.rs b/src/presentation/mod.rs
@@ -52,9 +52,9 @@ impl Presentation {
         authentication_key: DecodingKey,
         title: String,
     ) -> Self {
-        // Create a default 10s ratelimiter
+        // Create a default 5s ratelimiter
         let ratelimiter = Arc::new(Ratelimiter::new());
-        ratelimiter.add_ratelimit("10s".to_string(), Arc::new(TimeLimiter::new(10)));
+        ratelimiter.add_ratelimit("5s".to_string(), Arc::new(TimeLimiter::new(5)));
 
         /*
         ratelimiter.add_ratelimit(

diff --git a/tools/obsidian-directed-graph-exporter.py b/tools/obsidian-directed-graph-exporter.py
@@ -26,6 +26,7 @@
 STATE_POLL = "STATE_POLL"
 
 # Regexes
+EMOJIS_REGEX = r'^Emojis:\s*(.*)$'
 NEXT_SLIDE_REGEX = r'Next Slide:\s*\[\[(.*?)\]\]'
 FONT_SCALE_REGEX = r'^Font Scale: (.*)$'
 
@@ -213,9 +214,11 @@ def parse_md_file(md_dir: str, file_path: str, index: int) -> Slide:
         content = file.read()
 
     # Parse out possible emojis
-    emojis_match = re.search(r'^Emojis:\s*(.*)$', content, re.MULTILINE)
+    emojis_match = re.search(EMOJIS_REGEX, content, re.MULTILINE)
     emojis = emojis_match.group(1).split(",") if emojis_match else []
     emojis = [e.strip() for e in emojis]
+    # Remove Emojis tag now that it's parsed
+    content = re.sub(EMOJIS_REGEX, '', content, flags=re.MULTILINE)
 
     # Parse out possible poll
     maybe_poll = parse_contents_for_poll(content)
@@ -536,11 +539,15 @@ def main():
     if args.gen_images:
         print(f"Generation {len(slides)} images...")
     for slide in slides:
-        print(f"{int(count/len(slides)*100)}% ", end="")
+        print(f"{int(count/len(slides)*100)}% {count} ", end="")
         count += 1
         # Export slide image
         if args.gen_images:
-            generate_slide_image(slide, md_dir, output_dir)
+            try:
+                generate_slide_image(slide, md_dir, output_dir)
+            except Exception as e:
+                print(f"Error rendering slide {slide.title}")
+                exit(1)
         # Serialize and resolve all polls and linked slides by name to index with slide_map
         slides_json.append(slide.export(slide_map))
 

diff --git a/web/present.html b/web/present.html
@@ -87,7 +87,7 @@
             var reaction = document.createElement('span');
             reaction.innerText = emoji;
             if (size == 1) {
-                reaction.style = "font-size: 50px";
+                reaction.style = "font-size: 30px";
             } else {
                 reaction.style = "font-size: 10px";
             }

diff --git a/web/styles/present.css b/web/styles/present.css
@@ -169,7 +169,7 @@ body {
 
 .poll-result-label-count{font-size: 30px;color: #000;}
 
-.poll-result-label{color: #000;margin-right: 30px;font-size: 33px;}
+.poll-result-label{color: #000;margin-right: 20px;font-size: 31px;}
 
 .poll-result-bar-container{width: 100%;}