update: update format selector config option, allow using any format

ckanext/pygments/config.py

@@ -18,15 +18,7 @@
 
 
 def is_format_supported(fmt: str) -> bool:
-    """Check if the format is supported by the pygments library"""
-    if fmt not in tk.config[CONF_SUPPORTED_FORMATS]:
-        return False
-
-    for formats in pygment_utils.LEXERS:
-        if fmt in formats:
-            return True
-
-    return False
+    return fmt in tk.config[CONF_SUPPORTED_FORMATS].split(",")
 
 
 def bytes_to_render() -> int:

ckanext/pygments/config_declaration.yaml

@@ -3,9 +3,8 @@ groups:
   - annotation: ckanext-pygments
     options:
       - key: ckanext.pygments.supported_formats
-        type: list
         description: Specify a list of supported formats
-        default: sql html xhtml htm xslt py pyw pyi jy sage sc rs rs.in rst rest md markdown xml xsl rss xslt xsd wsdl wsf json jsonld yaml yml dtd php inc rdf ttl js
+        default: sql, html, xhtml, htm, xslt, py, pyw, pyi, jy, sage, sc, rs, rs.in, rst, rest, md, markdown, xml, xsl, rss, xslt, xsd, wsdl, wsf, json, jsonld, yaml, yml, dtd, php, inc, rdf, ttl, js
         editable: true
 
       - key: ckanext.pygments.max_size

ckanext/pygments/config_schema.yaml

@@ -8,12 +8,11 @@ fields:
     help_text: Specify a list of supported formats
     required: true
     choices_helper: pygments_supported_formats_options
-    form_select_attrs:
-      data-module: autocomplete
-      data-module-tags: ""
-      # data-module-createtags: "true"
-      multiple: 1
-      class: ""
+    validators: not_missing unicode_safe
+    form_snippet: tom_select.html
+    form_attrs:
+      multiple: "true"
+      data-module-load-url: "/api/action/pygments_formats_list"
 
   - field_name: ckanext.pygments.max_size
     label: Max Size

ckanext/pygments/logic/action.py

@@ -0,0 +1,14 @@
+from ckan.plugins import toolkit as tk
+
+import ckanext.pygments.utils as pygment_utils
+
+
+@tk.side_effect_free
+def pygments_formats_list(context, data_dict):
+    result = []
+
+    for formats, _ in pygment_utils.LEXERS.items():
+        for res_format in formats:
+            result.append({"value": res_format, "text": res_format})
+
+    return result

ckanext/pygments/plugin.py

@@ -16,6 +16,7 @@
 @tk.blanket.validators
 @tk.blanket.config_declarations
 @tk.blanket.blueprints
+@tk.blanket.actions
 class PygmentsPlugin(p.SingletonPlugin):
     p.implements(p.IConfigurer)
     p.implements(p.IResourceView, inherit=True)

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ckanext-pygments
-version = 1.1.2
+version = 1.1.3
 description = Provides previews with syntax highlight for multiple formats
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -19,7 +19,8 @@ keywords = CKAN
 [options]
 packages = find:
 namespace_packages = ckanext
-install_requires = Pygments~=2.16.1
+install_requires =
+    Pygments~=2.16.1
 include_package_data = True
 
 [options.entry_points]
@@ -30,6 +31,8 @@ babel.extractors =
                  ckan = ckan.lib.extract:extract_ckan
 
 [options.extras_require]
+admin =
+    ckanext-admin_panel>=1.0.14
 
 [extract_messages]
 keywords = translate isPlural