fix: New Aqua filename syntax

castelao · Oct 5, 2023 · 03b79c3 · 03b79c3
1 parent be7d658
commit 03b79c3
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/OceanColor/backend/common.py b/OceanColor/backend/common.py
@@ -249,9 +249,9 @@ def mission(self):
 
         if attrs["platform"] == "S":
             return "SeaWIFS"
-        elif attrs["platform"] == "A":
+        elif attrs["platform"] == "AQUA_MODIS":
             return "MODIS-Aqua"
-        elif attrs["platform"] == "T":
+        elif attrs["platform"] == "TERRA_MODIS":
             return "MODIS-Terra"
         elif attrs["platform"] == "V":
             if attrs["instrument"] == "JPSS1":
@@ -265,7 +265,8 @@ def dirname(self):
             self.mission,
             self.attrs["mode"],
             self.attrs["year"],
-            self.attrs["doy"],
+            self.attrs["month"],
+            self.attrs["day"],
         )
         return path
 
@@ -305,14 +306,16 @@ def parse_filename(filename: str):
       - V2018006230000.L2_JPSS1_OC.nc
     """
     rule = r"""
-        (?P<platform>[S|A|T|V])
+        (?P<platform>S|V|(?:AQUA_MODIS)|(?:TERRA_MODIS))
+        .
         (?P<year>\d{4})
-        (?P<doy>\d{3})
-        (?P<time>\d+)?
-        \.
+        (?P<month>\d{2})
+        (?P<day>\d{2})
+        .
         (?P<mode>(L2)|(L3m))
-        (?:_DAY)?
-        _ (?P<instrument>(?:SNPP)|(?:JPSS1))?
+        (?:.DAY)?
+        .
+        (?P<instrument>(?:SNPP)|(?:JPSS1))?
         .*?
         \.nc
         """