Review follow-ups: pin legacy-base orphan repair, honest dry-run version note

Two items from the PR review:

1. Test the legacy-base branch of repair_diverged_artifact_filenames —
   the one changed path with no test. An orphan left on disk under the
   pre-#1404 base (plain and "-<timestamp>"-uniquified) is found and
   repaired forward to the new-scheme name; without these, dropping the
   legacy_base half of the scan would silently strand old orphans.

2. The 2.29.0 version description now says this is the dry-run stage
   (renames inventoried in debug.log, not performed), so the admin
   dashboard doesn't claim a rename that hasn't happened. The stage-2
   commit that removes --dry-run should restore the final wording.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: jonfroehlich

makeabilitylab/settings.py

@@ -87,7 +87,7 @@
 
 # Makeability Lab Global Variables, including Makeability Lab version
 ML_WEBSITE_VERSION = "2.29.0" # Keep this updated with each release and also change the short description below
-ML_WEBSITE_VERSION_DESCRIPTION = "Standardized filenames for talks and posters now end in '_Talk' and '_Poster' (#1404), so a downloaded slide deck or poster is no longer indistinguishable from the paper PDF of the same work. Publication filenames are unchanged. Existing talk/poster files are renamed once, on deploy."
+ML_WEBSITE_VERSION_DESCRIPTION = "Standardized filenames for talks and posters now end in '_Talk' and '_Poster' (#1404), so a downloaded slide deck or poster is no longer indistinguishable from the paper PDF of the same work. Publication filenames are unchanged. Dry-run stage: existing files are NOT renamed yet — the pending renames are inventoried in debug.log for review, and the one-time rename ships in the follow-up release."
 DATE_MAKEABILITYLAB_FORMED = datetime.date(2012, 1, 1)  # Date Makeability Lab was formed
 MAX_BANNERS = 7 # Maximum number of banners on a page
 

website/tests/test_repair_diverged_artifact_filenames.py

@@ -32,12 +32,20 @@ def setUp(self):
         override.enable()
         self.addCleanup(override.disable)
 
-    def _simulate_divergence(self, talk):
+    def _simulate_divergence(self, talk, include_type_suffix=True,
+                             name_suffix=""):
         """Reproduce the bug's end state for the pdf_file: move the real file to
         the extension-less standardized base (the orphan) and point the DB at a
-        now-missing old name."""
+        now-missing old name.
+
+        ``include_type_suffix=False`` names the orphan under the pre-#1404
+        scheme (no trailing "_Talk") — what an orphan left behind before that
+        scheme change looks like. ``name_suffix`` appends a
+        "-<timestamp>"-style uniqueness suffix to the orphan.
+        """
         directory = os.path.dirname(talk.pdf_file.path)
-        valid_base = get_valid_filename(Artifact.generate_filename(talk))
+        valid_base = get_valid_filename(Artifact.generate_filename(
+            talk, include_type_suffix=include_type_suffix)) + name_suffix
         orphan_path = os.path.join(directory, valid_base)  # no extension
         os.rename(talk.pdf_file.path, orphan_path)
         # DB now references a file that isn't there.
@@ -69,6 +77,51 @@ def test_repairs_pdf_pointing_at_missing_file(self):
         self.assertTrue(talk.pdf_file.storage.exists(talk.pdf_file.name))
         self.assertFalse(os.path.exists(orphan_path))
 
+    def test_repairs_orphan_left_under_the_pre_1404_base(self):
+        """The #1390 bug predates the #1404 scheme change, so an orphan it left
+        behind carries the OLD standardized base (no trailing "_Talk"). The
+        command must still find it — and repairs it forward to the new-scheme
+        name."""
+        alice = self.make_person(first_name="Alice", last_name="Smith")
+        talk = self.make_talk(
+            title="A Recoverable Talk", forum_name="CHI", year=2024,
+            authors=[alice],
+        )
+        _, orphan_path = self._simulate_divergence(
+            talk, include_type_suffix=False)
+        self.assertTrue(os.path.exists(orphan_path))
+
+        call_command("repair_diverged_artifact_filenames")
+
+        talk.refresh_from_db()
+        new_base = get_valid_filename(Artifact.generate_filename(talk))
+        self.assertEqual(
+            os.path.basename(talk.pdf_file.name), new_base + ".pdf"
+        )
+        self.assertTrue(talk.pdf_file.storage.exists(talk.pdf_file.name))
+        self.assertFalse(os.path.exists(orphan_path))
+
+    def test_repairs_uniquified_orphan_under_the_pre_1404_base(self):
+        """Same, for a pre-#1404 orphan whose name collided on disk and picked
+        up the "-<timestamp>" uniqueness suffix (ensure_filename_is_unique)."""
+        alice = self.make_person(first_name="Alice", last_name="Smith")
+        talk = self.make_talk(
+            title="A Recoverable Talk", forum_name="CHI", year=2024,
+            authors=[alice],
+        )
+        _, orphan_path = self._simulate_divergence(
+            talk, include_type_suffix=False, name_suffix="-1782399772.42")
+
+        call_command("repair_diverged_artifact_filenames")
+
+        talk.refresh_from_db()
+        new_base = get_valid_filename(Artifact.generate_filename(talk))
+        self.assertEqual(
+            os.path.basename(talk.pdf_file.name), new_base + ".pdf"
+        )
+        self.assertTrue(talk.pdf_file.storage.exists(talk.pdf_file.name))
+        self.assertFalse(os.path.exists(orphan_path))
+
     def test_dry_run_changes_nothing(self):
         alice = self.make_person(first_name="Alice", last_name="Smith")
         talk = self.make_talk(