list-widgets : count all the macros and not only files

README.md

@@ -111,7 +111,7 @@ For each command, the option `-h` give u some help.
 
  `./manage.py list-widgets` to list all widgets found in content directories
 
- `./manage.py make-widgets` to make a file that groups all jinja2 widgets macros for easier includes. It is called by `runserver` and `distill-local` commands. \
+ `./manage.py make-widgets` to make a file that groups all jinja2 widgets macros for easier includes. It is automatically called by `runserver` and `distill-local` commands. \
  See an example in `EXAMPLE.md`
 
 

jssg/management/commands/distill-local.py

@@ -2,6 +2,7 @@
 DistilllocalCommand = importlib.import_module("django_distill.management.commands.distill-local").Command
 from django.core.management import call_command
 
+#Override the default distill-local command to call the make-widget before it execute
 class Command(DistilllocalCommand):
     def handle(self, *args, **options):
         call_command('make-widgets')

jssg/management/commands/list-widgets.py

@@ -1,6 +1,7 @@
 from django.core.management.base import BaseCommand
 from django.core.management import call_command
 from django.conf import settings
+from re import findall
 
 class Command(BaseCommand):
     help = "List all the widgets found in content templates."
@@ -27,9 +28,13 @@ def handle(self, *args, **options) :
         n = 0
         for template_dir in settings.JFME_TEMPLATES_DIRS :
             for widget in (template_dir / options["engine"] / "widgets").rglob("*") :
-                if widget.is_file() :
-                    self.stdout.write(str(widget.relative_to(settings.BASE_DIR)))
-                    n += 1
+                with open(widget, "r") as w :
+                    self.stdout.write("In %s : " % str(widget))
+                    i = 0
+                    for macro in findall(r"{%[\s]*macro[\s]*(.*)\(", w.read()) :
+                        self.stdout.write("\tmacro '%s()'" % macro)
+                        i += 1
+                    n += i
 
         if n > 1 :
             self.stdout.write(

jssg/management/commands/runserver.py

@@ -1,6 +1,7 @@
 from django.core.management.commands.runserver import Command as RunserverCommand
 from django.core.management import call_command
 
+#Override the default runserver command to call the make-widget before it execute
 class Command(RunserverCommand):
     def inner_run(self, *args, **options):
         call_command('make-widgets')