Merge photo highlights by name and capture year

photo-upload/publisher.py

@@ -11,6 +11,7 @@ import sys
 import time
 
 from app import atomic_json
+from highlights import normalize_highlights
 from posts import publish_post
 
 log = logging.getLogger("publisher")
@@ -117,6 +118,8 @@ class Publisher:
                     self.git("add", "--", str(entry))
                 shutil.copytree(submission / "images", self.repo / images, dirs_exist_ok=True)
                 self.git("add", "--", str(images))
+            for path in normalize_highlights(self.repo / "_art"):
+                self.git("add", "--", str(path.relative_to(self.repo)))
             if self.git("diff", "--cached", "--name-only"):
                 self.git("commit", "-m", f"Publish {len(jobs)} submission(s)")
             self.git("push", "origin", f"HEAD:refs/heads/{self.branch}")