Merge pull request #40 from SilverRainZ/anydomain3

Migrate to any domain 3.0

Author: SilverRainZ

conf.py

@@ -19,7 +19,7 @@
 
 # -- Split configurations ----------------------------------------------------
 
-from confs.schemas import _schemas
+from confs.schemas import OBJECT_TYPES as _OBJECT_TYPES
 from confs.deploy import Deployment
 
 _D = Deployment.current()
@@ -94,8 +94,12 @@
     keep_warnings = True
 
 # A list of warning codes to suppress arbitrary warning messages.
+suppress_warnings = [
+    'misc.highlighting_failure' # pygment highlight error
+]
+
 if _D is _D.Local:
-    suppress_warnings = ['ref.' + x.objtype for x in _schemas]
+    suppress_warnings.extend(['ref.' + x for x in _OBJECT_TYPES])
 
 # Auto numbered figures, tables and code-blocks if they have a caption.
 # numfig = True
@@ -223,7 +227,8 @@
 }
 
 extensions.append('sphinxnotes.any')
-any_schemas = _schemas
+any_domain_name = 'any'
+any_object_types = _OBJECT_TYPES
 
 extensions.append('ablog')
 blog_path = 'blog'
@@ -370,13 +375,12 @@
 
 extensions.append('sphinxnotes.poc')
 
+extensions.append('sphinxnotes.data')
+
 def setup(app):
-    # Dump any domain data:
-    # from conf.dump_any_domain import setup
-    # setup(app)
-    # Query artworks from LATree.
 
     from confs import fetch_artwork
-    fetch_artwork.setup(app)
+
+    fetch_artwork.setup(app) # query artworks from LATree
 
     ...

confs/fetch_artwork.py

@@ -5,7 +5,7 @@
 from sphinx.application import Sphinx
 from sphinx.environment import BuildEnvironment
 from sphinx.util import logging
-from sphinxnotes.any.template import Environment as TemplateEnvironment
+from sphinxnotes.data.render.template import _JinjaEnv
 
 from .deploy import Deployment
 
@@ -24,14 +24,22 @@ def _filter(id_: str) -> str | None:
         imgdir = env.srcdir.joinpath(imgdir)
         if Deployment.current() == Deployment.Local:
             try:
-                subprocess.run(['/home/la/sync/latree/bin/artworks', 'fetch', id_, imgdir])
+                result = subprocess.run(['/home/la/sync/latree/bin/artworks', 'fetch', id_, imgdir])
             except Exception as e:
-                logger.warning('failed to fetch artwork: %s', e)
+                errmsg = str(e)
+            else:
+                if result.returncode == 0:
+                    errmsg = None
+                else:
+                    errmsg = f'error code: {result.returncode}'
+            if errmsg:
+                logger.warning(f'failed to fetch arwork by ID {id_}: {errmsg}')
+
         f = f'/{imgdir}/{id_}.webp'
         return f if path.exists(f) else None
 
     return _filter
 
 
 def setup(app: Sphinx):
-    TemplateEnvironment.add_filter('fetch_artwork', fetch_artwork_filter)
+    _JinjaEnv.add_filter('fetch_artwork', fetch_artwork_filter)