efj-parser 0.9.4__tar.gz → 1.0__tar.gz

{efj_parser-0.9.4 → efj_parser-1.0}/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: efj-parser
-Version: 0.9.4
+Version: 1.0
 Summary: Parse an electronic Flight Journal file
 Home-page: https://github.com/JonHurst/efj_parser
 Author: Jon Hurst
 Author-email: jon.a@hursts.org.uk
 Project-URL: docs, https://hursts.org.uk/efjdocs/
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
@@ -19,6 +19,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-python
 Dynamic: summary

{efj_parser-0.9.4 → efj_parser-1.0}/efj_parser/__init__.py

@@ -101,7 +101,7 @@ class _VE(Exception):
         Code.BAD_SYNTAX: "Invalid syntax",
         Code.BAD_TIME: "Invalid time format",
         Code.MISSING_AIRCRAFT: "Prior aircraft specifier required",
-        Code.MISSING_AIRCRAFT: "No Captain specified",
+        Code.MISSING_CAPTAIN: "No Captain specified",
         Code.MISSING_DATE: "Prior date specifier required",
         Code.MISSING_DEST: "No destination airfield specified",
         Code.MISSING_ORIGIN: "No origin airfield specified",
@@ -235,11 +235,10 @@ class Parser():
     ) -> tuple[Conditions, Roles, Landings, Flags]:
         conditions, unused_flags = _process_conditions(flags, duration)
         roles, unused_flags = _process_roles(unused_flags, duration)
+        landings, unused_flags = _process_landings(unused_flags, duration,
+                                                   conditions.night)
         if roles.p2 == duration:
             landings = Landings()
-        else:
-            landings, unused_flags = _process_landings(unused_flags, duration,
-                                                       conditions.night)
         return conditions, roles, landings, unused_flags
 
     def __captain(self, roles, duration) -> str:
@@ -363,21 +362,23 @@ def _process_landings(
         night: int
 ) -> tuple[Landings, Flags]:
     night_ldg, day_ldg = 0, 0
-    found_landing_flag = False
+    m_flag, ldg_flag = False, False
     unused: list[Flag] = []
     for f in flags:
         match f[0]:
             case "m":
-                found_landing_flag = True
+                m_flag = True
             case "ld":
-                day_ldg += 1 if f[1] is None else f[1]
-                found_landing_flag = True
+                day_ldg += (1 if f[1] is None else f[1])
+                ldg_flag = True
             case "ln":
-                night_ldg += 1 if f[1] is None else f[1]
-                found_landing_flag = True
+                night_ldg += (1 if f[1] is None else f[1])
+                ldg_flag = True
             case _:
                 unused.append(f)
-    if not found_landing_flag:
+    if m_flag:  # m flag is like p2 flag for captains
+        night_ldg, day_ldg = 0, 0
+    elif not ldg_flag:
         if duration == night:
             night_ldg = 1
         else:

{efj_parser-0.9.4 → efj_parser-1.0}/efj_parser.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: efj-parser
-Version: 0.9.4
+Version: 1.0
 Summary: Parse an electronic Flight Journal file
 Home-page: https://github.com/JonHurst/efj_parser
 Author: Jon Hurst
 Author-email: jon.a@hursts.org.uk
 Project-URL: docs, https://hursts.org.uk/efjdocs/
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: OS Independent
@@ -19,6 +19,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-python
 Dynamic: summary

{efj_parser-0.9.4 → efj_parser-1.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="efj-parser",
-    version="0.9.4",
+    version="1.0",
     author="Jon Hurst",
     author_email="jon.a@hursts.org.uk",
     description="Parse an electronic Flight Journal file",
@@ -15,7 +15,7 @@ setuptools.setup(
     packages=['efj_parser'],
     package_data={"efj_parser": ["py.typed"]},
     classifiers=[
-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: "
         "GNU General Public License v3 or later (GPLv3+)",

{efj_parser-0.9.4 → efj_parser-1.0}/tests/test_parser.py

@@ -149,6 +149,7 @@ N2:320
 OB-T-1274:A-321
 /NCE 1100/1300 ld:3
 / 1340/1540 v:30 n:10 ln
+/ 1700/1800 n ln:2 m
 
 ++
 0600/1200 r:60 test # ESBY
@@ -204,6 +205,14 @@ OB-T-1274:A-321
                 efj.Landings(night=1),
                 efj.Aircraft("OB-T-1274", "A-321", ""),
                 efj.Airports("NCE", "BRS"),
+                "Self", (), "", ()),
+            efj.Sector(
+                dt.datetime(2024, 1, 22, 17, 0), 60,
+                efj.Roles(p1=60),
+                efj.Conditions(night=60, ifr=60),
+                efj.Landings(day=0, night=0),
+                efj.Aircraft("OB-T-1274", "A-321", ""),
+                efj.Airports("BRS", "NCE"),
                 "Self", (), "", ()))
         self.assertEqual(
             efj.Parser().parse(data),
@@ -217,7 +226,7 @@ G-ABCD:320
 {CP:Bloggs Joe}
 # A general comment about something
 BRS/BFS 1100/1200 p1s #belfast
-/ 1300/1400 p2
+/ 1300/1400 p2 ld:2
 
 +++
 1000/1610  # Comment
@@ -413,6 +422,13 @@ BRS/BFS 1100/1200 v n:30
                 str(e.exception),
                 "Line 2: [Invalid syntax] 2200-2400")
 
+    def test_missing_captain(self):
+        with self.assertRaises(efj.ValidationError) as e:
+            efj.Parser().parse("2024-01-21\nG-ABCD:320\nBRS/BFS 1100/1200 p2")
+        self.assertEqual(
+            str(e.exception),
+            "Line 3: [No Captain specified] BRS/BFS 1100/1200 p2")
+
 
 class TestSectorFlags (unittest.TestCase):
 
@@ -470,6 +486,11 @@ class TestSectorFlags (unittest.TestCase):
             self.assertEqual(
                 efj._process_landings((("ld", None),), 2, 2),
                 (efj.Landings(day=1, night=0), ()))
+        with self.subTest("Night landing, PM"):
+            # m overrides ln flag
+            self.assertEqual(
+                efj._process_landings((("ln", None), ("m", None)), 2, 1),
+                (efj.Landings(day=0, night=0), ()))
 
     def test_roles(self):
         with self.subTest("All p1"):