Fix render_patterns using the wrong value as a file name

Author: thibaudcolas

pattern_library/management/commands/render_patterns.py

@@ -69,11 +69,11 @@ def handle(self, **options):
     def render_group(self, request, parent_dir: Path, pattern_templates):
         for template in pattern_templates['templates_stored']:
             if self.verbosity >= 2:
-                self.stderr.write(f'Pattern: {template.pattern_name}')
+                self.stderr.write(f'Pattern: {template.pattern_filename}')
             if self.verbosity >= 1:
                 self.stderr.write(template.origin.template_name)
 
-            render_path = parent_dir.joinpath(template.pattern_name)
+            render_path = parent_dir.joinpath(template.pattern_filename)
             rendered_pattern = self.render_pattern(request, template.origin.template_name)
 
             if self.dry_run:

pattern_library/utils.py

@@ -92,13 +92,17 @@ def get_pattern_templates():
                     template = get_template(pattern_path)
                     pattern_config = get_pattern_config(pattern_path)
                     pattern_name = pattern_config.get('name')
+                    pattern_filename = os.path.relpath(
+                        template.origin.template_name,
+                        base_path,
+                    )
                     if pattern_name:
                         template.pattern_name = pattern_name
                     else:
-                        template.pattern_name = os.path.relpath(
-                            template.origin.template_name,
-                            base_path,
-                        )
+                        template.pattern_name = pattern_filename
+
+                    template.pattern_filename = pattern_filename
+
                     found_templates.append(template)
 
             if found_templates:

tests/tests/test_commands.py

@@ -60,6 +60,12 @@ def test_shows_wrap_fragment(self):
     </body>
 </html>""", stdout.getvalue())
 
+    def test_saves_with_template_filename(self):
+        stdout = io.StringIO()
+        stderr = io.StringIO()
+        call_command('render_patterns', dry_run=True, stdout=stdout, stderr=stderr, verbosity=2)
+        self.assertIn('Pattern: test_molecule.html', stderr.getvalue())
+
 
 class RenderPatternsFileSystemTests(SimpleTestCase):
     """Tests of the render_pattern command’s file system changes, based on the test project’s templates"""