one more rule

Author: Kraysent

app/designations/rules.py

@@ -34,7 +34,7 @@ def match(self, value: str) -> str | None:
     NameRule(
         name="CAT JHHMMSS.sss+DDMMSS.sss",
         pattern=re.compile(
-            r"^([A-Za-z0-9]{2,5})J(\d{2})(\d{2})(\d{2}(?:\.\d+)?)([+-])(\d{2})(\d{2})(\d{2}(?:\.\d+)?)$",
+            r"^([A-Za-z0-9]{2,6})J(\d{2})(\d{2})(\d{2}(?:\.\d+)?)([+-])(\d{2})(\d{2})(\d{2}(?:\.\d+)?)$",
             re.IGNORECASE,
         ),
         replacement="",
@@ -61,6 +61,15 @@ def match(self, value: str) -> str | None:
         replacement="",
         replacer=lambda m: f"{m.group(1).upper()} J{m.group(2)}{m.group(3)}{m.group(4)}{m.group(5)}{m.group(6)}",
     ),
+    NameRule(
+        name="CAT HHMM+DDMM",
+        pattern=re.compile(
+            r"^([A-Za-z0-9]{2,5})\s*(\d{2})(\d{2})([+-])(\d{2})(\d{2})$",
+            re.IGNORECASE,
+        ),
+        replacement="",
+        replacer=lambda m: f"{m.group(1).upper()} {m.group(2)}{m.group(3)}{m.group(4)}{m.group(5)}{m.group(6)}",
+    ),
     NameRule(
         name="CAT J HHMM+DD",
         pattern=re.compile(
@@ -140,11 +149,6 @@ def match(self, value: str) -> str | None:
         ),
         replacement="[{0}] J{1}{2}{3}",
     ),
-    NameRule(
-        name="MAGE",
-        pattern=re.compile(r"^MAGE\s*(\d{4})([+-])(\d{4})$", re.IGNORECASE),
-        replacement="MAGE {0}{1}{2}",
-    ),
     NameRule(
         name="ISI96",
         pattern=re.compile(r"^ISI96_(\d{4})([+-])(\d{4})$", re.IGNORECASE),
@@ -259,14 +263,6 @@ def match(self, value: str) -> str | None:
         pattern=re.compile(r"^CNOC2_(\d+)\.(\d+)$", re.IGNORECASE),
         replacement="CNOC2_{0}.{1}",
     ),
-    NameRule(
-        name="LAMOST",
-        pattern=re.compile(
-            r"^LAMOSTJ(\d{2})(\d{2})(\d{2}(?:\.\d+)?)([+-])(\d{2})(\d{2})(\d{2}(?:\.\d+)?)$",
-            re.IGNORECASE,
-        ),
-        replacement="LAMOST J{0}{1}{2}{3}{4}{5}{6}",
-    ),
     NameRule(
         name="2MFGC",
         pattern=re.compile(r"^2MFGC\s*0*(\d+)$", re.IGNORECASE),

tests/test_designation_rules.py

@@ -11,6 +11,7 @@
     ("CAT JHHMMSSss+DDMMSSs", "2MASXJ09592150-2733330", "2MASX J09592150-2733330"),
     ("CAT JHHMMSSss+DDMMSSs", "2MASXJ10274703+2725368", "2MASX J10274703+2725368"),
     ("CAT JHHMMSSss+DDMMSSs", "2masxj09592150-2733330", "2MASX J09592150-2733330"),
+    ("CAT HHMMSSs+DDMMSS", "SMDG1103517+284120", "SMDG 1103517+284120"),
     ("CAT JHHMMSS.sss+DDMMSS.sss", "SDSSJ121551.62+573421.6", "SDSS J121551.62+573421.6"),
     ("CAT JHHMMSS.sss+DDMMSS.sss", "SDSSJ121552.44+294932.9", "SDSS J121552.44+294932.9"),
     ("CAT JHHMMSS.sss+DDMMSS.sss", "SDSSJ121553.17+202452.4", "SDSS J121553.17+202452.4"),
@@ -27,14 +28,19 @@
     ("CAT JHHMMSS.sss+DDMMSS.sss", "WINGSJ132627.17-271414.2", "WINGS J132627.17-271414.2"),
     ("CAT JHHMMSS.sss+DDMMSS.sss", "wingsj125634.96-173656.6", "WINGS J125634.96-173656.6"),
     ("CAT JHHMMSS.sss+DDMMSS.sss", "WINGS J125634.96-173656.6", None),
-    ("CAT JHHMM+DDMM", "LVJ1235-1104", "LV J1235-1104"),
-    ("CAT JHHMM+DDMM", "LVJ1052+3628", "LV J1052+3628"),
-    ("CAT JHHMM+DDMM", "lvj1235-1104", "LV J1235-1104"),
     ("CAT JHHMMSS.sss+DDMMSS.sss", "2QZJ233027.0-280856", "2QZ J233027.0-280856"),
     ("CAT JHHMMSS.sss+DDMMSS.sss", "2QZJ121201.1+012648", "2QZ J121201.1+012648"),
     ("CAT JHHMMSS.sss+DDMMSS.sss", "2QZJ103110.2+001703", "2QZ J103110.2+001703"),
     ("CAT JHHMMSS.sss+DDMMSS.sss", "2qzj233027.0-280856", "2QZ J233027.0-280856"),
     ("CAT JHHMMSS.sss+DDMMSS.sss", "2QZJ233027-280856", "2QZ J233027-280856"),
+    ("CAT JHHMMSS.sss+DDMMSS.sss", "LAMOSTJ003619.93+320329.5", "LAMOST J003619.93+320329.5"),
+    ("CAT JHHMMSS.sss+DDMMSS.sss", "LAMOSTJ022723.16+013324.5", "LAMOST J022723.16+013324.5"),
+    ("CAT JHHMMSS.sss+DDMMSS.sss", "lamostj085334.71+262244.1", "LAMOST J085334.71+262244.1"),
+    ("CAT JHHMMSS.sss+DDMMSS.sss", "LAMOSTJ003619+320329", "LAMOST J003619+320329"),
+    ("CAT JHHMMSS.sss+DDMMSS.sss", "", None),
+    ("CAT JHHMM+DDMM", "LVJ1235-1104", "LV J1235-1104"),
+    ("CAT JHHMM+DDMM", "LVJ1052+3628", "LV J1052+3628"),
+    ("CAT JHHMM+DDMM", "lvj1235-1104", "LV J1235-1104"),
     ("CAT J HHMM+DD", "HIPASSJ1558-10", "HIPASS J1558-10"),
     ("CAT J HHMM+DD", "HIPASS J1348-37", "HIPASS J1348-37"),
     ("CAT J HHMM+DD", "HIPASS J0916-23b", "HIPASS J0916-23b"),
@@ -43,7 +49,6 @@
     ("CAT J HHMM+DD", "HIPASS 1348-37", "HIPASS 1348-37"),
     ("CAT J HHMM+DD", "SMDG1256-00", "SMDG 1256-00"),
     ("CAT J HHMM+DD", "SMDG0740+40", "SMDG 0740+40"),
-    ("CAT HHMMSSs+DDMMSS", "SMDG1103517+284120", "SMDG 1103517+284120"),
     ("CAT J HHMM+DD", "smdg1349+04", "SMDG 1349+04"),
     ("CAT J HHMM+DD", "SMDG 1256-00", "SMDG 1256-00"),
     ("CAT J HHMM+DD", "SMDG1256-0", None),
@@ -61,6 +66,12 @@
     ("CAT J HHMM+DD", "fashi0237+38", "FASHI 0237+38"),
     ("CAT J HHMM+DD", "FASHI1334+6", None),
     ("CAT J HHMM+DD", "", None),
+    ("CAT HHMM+DDMM", "MAGE1423+5613", "MAGE 1423+5613"),
+    ("CAT HHMM+DDMM", "MAGE0740+1651", "MAGE 0740+1651"),
+    ("CAT HHMM+DDMM", "mage1132+5311", "MAGE 1132+5311"),
+    ("CAT HHMM+DDMM", "MAGE 1423+5613", "MAGE 1423+5613"),
+    ("CAT HHMM+DDMM", "MAGE1423+561", None),
+    ("CAT HHMM+DDMM", "", None),
     ("[REF]J", "[BZZ2000]J132523.95-305406.7", "[BZZ2000] J132523.95-305406.7"),
     ("[REF]J", "[BZZ2000] J132523.95-305406.7", "[BZZ2000] J132523.95-305406.7"),
     ("[REF]J", "[IBG2003]J114222+195346", "[IBG2003] J114222+195346"),
@@ -289,12 +300,6 @@
     ("ISI96", "isi96_0922+0233", "ISI96_0922+0233"),
     ("ISI96", "ISI96_1450+023", None),
     ("ISI96", "", None),
-    ("MAGE", "MAGE1423+5613", "MAGE 1423+5613"),
-    ("MAGE", "MAGE0740+1651", "MAGE 0740+1651"),
-    ("MAGE", "mage1132+5311", "MAGE 1132+5311"),
-    ("MAGE", "MAGE 1423+5613", "MAGE 1423+5613"),
-    ("MAGE", "MAGE1423+561", None),
-    ("MAGE", "", None),
     ("AM", "AM 0316-484", "AM 0316-484"),
     ("AM", "AM2220-460", "AM 2220-460"),
     ("AM", "am0316-484", "AM 0316-484"),
@@ -353,11 +358,6 @@
     ("CNOC2", "CNOC2_0223.090502", "CNOC2_0223.090502"),
     ("CNOC2", "CNOC20223.051394", None),
     ("CNOC2", "", None),
-    ("LAMOST", "LAMOSTJ003619.93+320329.5", "LAMOST J003619.93+320329.5"),
-    ("LAMOST", "LAMOSTJ022723.16+013324.5", "LAMOST J022723.16+013324.5"),
-    ("LAMOST", "lamostj085334.71+262244.1", "LAMOST J085334.71+262244.1"),
-    ("LAMOST", "LAMOSTJ003619+320329", "LAMOST J003619+320329"),
-    ("LAMOST", "", None),
     ("2MFGC", "2MFGC15266", "2MFGC 15266"),
     ("2MFGC", "2MFGC 15266", "2MFGC 15266"),
     ("2MFGC", "2mfgc15266", "2MFGC 15266"),