ipyslides 7.0.2__tar.gz → 7.0.4__tar.gz

{ipyslides-7.0.2 → ipyslides-7.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipyslides
-Version: 7.0.2
+Version: 7.0.4
 Summary: Live rich content slides in jupyter notebook
 Home-page: https://github.com/asaboor-gh/ipyslides
 Author: Abdul Saboor

ipyslides-7.0.4/ipyslides/__version__.py

@@ -0,0 +1,2 @@
+
+__version__ = "7.0.4"

{ipyslides-7.0.2 → ipyslides-7.0.4}/ipyslides/_base/base.py

@@ -17,6 +17,7 @@ from .slide import SlideGroup, _build_slide
 from ..formatters import XTML, htmlize, slidebound
 from ..xmd import error, get_slides_instance, resolve_included_files, _matched_vars, _parse_as_snapshots, _stream_chunks
 from ..utils import _css_docstring
+from ..dashlab import FileWatcher
 
 
 class BaseSlides:
@@ -116,6 +117,13 @@ class BaseSlides:
         if synced:
             content = self._process_citations(content)
         
+        # included files should be able to trigger updates even if main file not edited yet, so we track them as assets
+        if synced and hasattr(self, '_watcher'):
+            self._watcher.assets = re.findall(r'include\`(.*?)\`',content, flags = re.DOTALL)
+        
+        # Now flatten incuded files, after detecting them as assets above
+        content = resolve_included_files(content)
+        
         chunks = list(_stream_chunks(content, '---'))
         handles = self.create(range(start, start + len(chunks))) # create slides faster or return older
         mdvars  = [{k:v for k,v in md_kws.items() if k in _matched_vars(chunk)} for chunk in chunks] # vars used in each chunk
@@ -137,10 +145,11 @@ class BaseSlides:
         return SlideGroup(handles)
     
     def _process_citations(self, content):
-        match1, *others = re.findall(r'^```citations.*?^```|^:::\s*citations.*?(?=^:::|\Z|^\S)', content, flags= re.DOTALL | re.MULTILINE)
-        if others:
-            raise ValueError(f"Only a single block of citations is parsed, found {len(others) + 1} blocks\n{(match1, *others)}")
+        matches = re.findall(r'^```citations.*?^```|^:::\s*citations.*?(?=^:::|\Z|^\S)', content, flags= re.DOTALL | re.MULTILINE)
+        if len(matches) > 1:
+            raise ValueError(f"Only a single block of citations is parsed, found {len(matches)} blocks\n{matches}")
         
+        match1 = matches[0] if matches else ''
         content = content.replace(match1, '') # clean up
         if getattr(self,'_bib_md','') != match1:
             self._bib_md = match1 # set for next test
@@ -181,47 +190,31 @@ class BaseSlides:
             raise ValueError("interval should be integer greater than 100 millieconds.")
         
         start = self._fix_slide_number(start_slide_number)
+        self._watcher = FileWatcher(path, interval=interval)
         
-        # NOTE: Background threads and other methods do not work. Do NOT change this way
-        # First call itself before declaring other things, so errors can be captured safely
-        self._from_markdown(start, resolve_included_files(path.read_text(encoding="utf-8")), synced=True) 
-        self.widgets._timer.clear() # remove previous updates
-        self._mtime = os.stat(path).st_mtime
-        included_files = set()
+        # First call after watcher set, so it can observe included files immediately, 
+        # and errors must be caught before going forward
+        self._from_markdown(start, path.read_text(encoding="utf-8"), synced=True) 
 
-        def update():
-            if path.is_file():
-                # Track whichever file is last edited from included or itself
-                mtime = max(os.stat(f).st_mtime for f in [path, *included_files] if f.is_file())
-                out_sync = any(['Out-Sync' in s._css_class for s in self.cited_slides]) or False
-                if out_sync or (mtime > self._mtime):  # set by interaction widget
-                    self._mtime = mtime
-                    try: 
-                        content = path.read_text(encoding="utf-8")
-                        # included files will be one step behind in sync, beacuse they are only detectable now
-                        included_files.update(
-                            map(Path, re.findall(r'include\`(.*?)\`',content, flags = re.DOTALL))
-                        ) 
-                        self._from_markdown(start, 
-                            resolve_included_files(content), # add included file text to be detected for changes
-                            synced=True # only one citation block allowed for consistency
-                        ) 
-                        self.notify('x') # need to remove any notification from previous error
-                        self._unregister_postrun_cell() # No cells buttons from inside file code run
-                    except:
-                        e, text = traceback.format_exc(limit=0).split(':',1) # only get last error for notification
-                        self.notify(f"{error('SyncError','something went wrong')}<br/>{error(e,text)}",20)
-            else:
-                self.notify(error("SyncError", f"file {path!r} no longer exists!").value, 20)
-        
-        self.widgets._timer.run(interval, update, loop = True)
-        print(f"Syncing content from file {path!r}\nYou can use `Slides.unsync()` to stop syncing.")
-        
+        @self._watcher.on_update
+        def update_target_slides(path):
+            try: 
+                self._from_markdown(start, path.read_text(encoding="utf-8"), synced=True) 
+                self.notify('x') # need to remove any notification from previous error
+                self._unregister_postrun_cell() # No cells buttons from inside file code run
+            except:
+                e, text = traceback.format_exc(limit=0).split(':',1) # only get last error for notification
+                self.notify(f"{error('SyncError','something went wrong')}<br/>{error(e,text)}",20)
+        
+        display(self._watcher) # must be displayed to work
+        self._unregister_postrun_cell() # avoid unnessary scroll button after postrun cell here
 
     def unsync(self):
         "Stop syncing markdown file synced with `Slides.sync_with_file` function."
-        if self.widgets._timer._callback[0]:
-            self.widgets._timer.clear()
+        if getattr(self, '_watcher', None):
+            self._watcher.stop()  # stop the file watcher
+            self._watcher.close() # clear the displayed watcher at frontend
+            del self._watcher  # remove reference to the watcher
         else:
             print("There was no markdown file linked to sync!")
     

{ipyslides-7.0.2 → ipyslides-7.0.4}/ipyslides/_base/settings.py

@@ -2,7 +2,7 @@
 Author Notes: Classes in this module should only be instantiated in Slides class or it's parent class
 and then provided to other classes via composition, not inheritance.
 """
-import json
+import json, re
 import traitlets
 from contextlib import suppress
 
@@ -167,11 +167,9 @@ class Footer(ConfigTraits):
         style = 'white-space:nowrap;margin-block:0;position:absolute;left:0;bottom:0;width:100%'
         inner = self.text
         if self.section and (running := self._running_section_text(slide)):
-            inner += ("<span style='white-space:pre;opacity:0.4;'> \u2502 </span>" if inner else "") + f"<span class='section'>{running}</span>"
+            inner += (" | " if inner else "") + f"<span class='section'>{running}</span>"
         if self.date:
-            inner += (
-                "<span style='white-space:pre;opacity:0.4;'> \u2502 </span>" if inner else ""
-            ) + f'{today(fg = "var(--fg2-color)") if self.date == "today" else self.date}'
+            inner += (" | " if inner else "") + f'{today(fg = "var(--fg2-color)") if self.date == "today" else self.date}'
         
         inner = f'<div class="footer-text"><div>{inner}</div>'
         if self.controls:
@@ -186,6 +184,8 @@ class Footer(ConfigTraits):
                 unit = 100/(self.main._slides._lms_idx or 1) # unit progress value per slide
                 pbar = f'<div class="sprogress-view" style="width:{pv}%;height:100%;background:var(--accent-color,blue);" data-cw="{pv}" data-uw="{unit}"></div>' # attributes for JS
                 inner += f'<div class="slide-progress print-only" style="background:var(--bg2-color,#aaa4);width:100%;height:2px;">{pbar}</div>'
+        
+        inner = re.sub(r'(?<![\`\\])\s*\|\s*', '<span style="white-space:pre;opacity:0.4;"> \u2502 </span>', inner) # replace | with fancy divider before parsing and preserve space around
         return htmlize(f'<div markdown="1" class="slide-footer" style="{style}">{inner}</div>') 
 
 @fix_sig

{ipyslides-7.0.2 → ipyslides-7.0.4}/ipyslides/_base/static/interaction.js

@@ -334,6 +334,7 @@ function printSlides(box, model) {
     });
     
     box.style.setProperty('--printPadding', `${fpad}px`); // set padding for print mode
+    zoom.reset(box); // reset any zoom before print to avoid weird scaling 
     
     for (let n = 0; n < slides.length; n++) {
         let slide = slides[n];

{ipyslides-7.0.2 → ipyslides-7.0.4}/ipyslides/_base/widgets.py

@@ -15,7 +15,7 @@ from . import styles
 from ._widgets import InteractionWidget, NotesWidget, LaserPointer
 from .intro import get_logo, how_to_print, instructions, key_combs
 from ..utils import html, htmlize
-from ..dashlab import ListWidget, JupyTimer, TabsWidget
+from ..dashlab import ListWidget, TabsWidget
 from .. import formatters as fmtrs
   
 
@@ -358,7 +358,6 @@ class Widgets:
         self.sliders = _Sliders()
         self.checks  = _Checks()
         self.htmls   = _Htmls()
-        self._timer  = JupyTimer()
         self.drawer  = DrawWidget(self)
         self._ctxmenu= CtxMenu(self, description='Shift + Right Click for Browser Menu')
         self.iw      = InteractionWidget(self)
@@ -384,7 +383,6 @@ class Widgets:
             self.htmls.theme,
             self.htmls.usercss,
             self.iw,
-            self._timer.widget(minimal=True),
             self.panelbox,
             self.htmls.pointer,
             self.htmls.hilite,

{ipyslides-7.0.2 → ipyslides-7.0.4}/ipyslides/core.py

@@ -973,6 +973,8 @@ class Slides(BaseSlides,metaclass=Singleton):
         ::: note
             `Slides.PART` is deprecated and kept as an alias for backward compatibility.
         """
+        # DO NOT FALL FOR GLOBAL PAGE STUFF, THAT WOULD BE A NIGHTMARE TO HANDLE 
+        # AND CANNOT HAVE ITS OWN STATE METADATA, AS WE REMOVED IT EARLIER.
         _type = "PART"
         
         def __init__(self, isolate=False):

{ipyslides-7.0.2 → ipyslides-7.0.4}/ipyslides.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipyslides
-Version: 7.0.2
+Version: 7.0.4
 Summary: Live rich content slides in jupyter notebook
 Home-page: https://github.com/asaboor-gh/ipyslides
 Author: Abdul Saboor

ipyslides-7.0.2/ipyslides/__version__.py

@@ -1,2 +0,0 @@
-
-__version__ = "7.0.2"