efj-parser 0.9__tar.gz → 0.9.2__tar.gz

{efj-parser-0.9 → efj_parser-0.9.2}/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.1
 Name: efj-parser
-Version: 0.9
+Version: 0.9.2
 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: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)

{efj-parser-0.9 → efj_parser-0.9.2}/efj_parser/__init__.py

@@ -123,8 +123,11 @@ class Parser():
         ftl_correction = 0
         unused_flags = []
         for f in flags:
-            if f and (mo_cor := re.match(r"r(\d+)", f)):
-                ftl_correction = int(mo_cor.group(1))
+            if f and (mo_cor := re.match(r"r(:\d+)?", f)):
+                if mo_cor.group(1):
+                    ftl_correction = int(mo_cor.group(1)[1:])
+                else:
+                    ftl_correction = duration
             else:
                 unused_flags.append(f)
         comment = mo.group(4)[1:].strip() if mo.group(4) else ""
@@ -245,7 +248,7 @@ class Parser():
              self.__parse_nextdate, "short_date"),
             (re.compile(r"\A(\d{4})/(\d{4})([^#]*)(#.+)?\Z"),
              self.__parse_duty, "duty"),
-            (re.compile(r"(\w{1,2}-\w{3,5})\s*:\s*([-\w]+)"),
+            (re.compile(r"([-\w]{2,10})\s*:\s*([-\w]+)"),
              self.__parse_aircraft, "aircraft"),
             (re.compile(r"\{([^}]*)}\Z"),
              self.__parse_crewlist, "crewlist"),

{efj-parser-0.9 → efj_parser-0.9.2}/efj_parser.egg-info/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.1
 Name: efj-parser
-Version: 0.9
+Version: 0.9.2
 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: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)

{efj-parser-0.9 → efj_parser-0.9.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="efj-parser",
-    version="0.9",
+    version="0.9.2",
     author="Jon Hurst",
     author_email="jon.a@hursts.org.uk",
     description="Parse an electronic Flight Journal file",
@@ -22,4 +22,7 @@ setuptools.setup(
         "Operating System :: OS Independent",
     ],
     python_requires='>=3.11',
+    project_urls = {
+        "docs" : "https://hursts.org.uk/efjdocs/",
+        },
 )

{efj-parser-0.9 → efj_parser-0.9.2}/tests/test_parser.py

@@ -10,19 +10,21 @@ class TestParser(unittest.TestCase):
         data = """\
 2024-01-21
 1000/1430
-G-ABCD:320
+N1:320
 {FO: Bloggs}
 BRS/BFS 1100/1200 ins #belfast
 / 1300/1400 ins:20 test spme
 {}
 +
 1000/1610  # Comment
-G-EFGH:321
+OB-T-1274:A-321
 /NCE 1100/1300 ld:3
 / 1340/1540 v:30 n:10 ln
 
 ++
-0600/1200 r60 test # ESBY
+0600/1200 r:60 test # ESBY
++
+0600/0630 r # HCT
 """
         expected_duties = (
             efj.Duty(
@@ -33,7 +35,11 @@ G-EFGH:321
                 370, 0, (), "Comment"),
             efj.Duty(
                 dt.datetime(2024, 1, 24, 6),
-                360, 60, ("test",), "ESBY"))
+                360, 60, ("test",), "ESBY"),
+            efj.Duty(
+                dt.datetime(2024, 1, 25, 6),
+                30, 30, (), "HCT")
+        )
 
         expected_sectors = (
             efj.Sector(
@@ -41,7 +47,7 @@ G-EFGH:321
                 efj.Roles(p1=60, instructor=60),
                 efj.Conditions(ifr=60),
                 efj.Landings(day=1),
-                efj.Aircraft("G-ABCD", "320"),
+                efj.Aircraft("N1", "320"),
                 efj.Airports("BRS", "BFS"),
                 "Self", (), "belfast",
                 (efj.Crewmember("FO", "Bloggs"),)),
@@ -50,7 +56,7 @@ G-EFGH:321
                 efj.Roles(p1=60, instructor=20),
                 efj.Conditions(ifr=60),
                 efj.Landings(day=1),
-                efj.Aircraft("G-ABCD", "320", "spme"),
+                efj.Aircraft("N1", "320", "spme"),
                 efj.Airports("BFS", "BRS"),
                 "Self", ("test",), "",
                 (efj.Crewmember("FO", "Bloggs"),)),
@@ -59,7 +65,7 @@ G-EFGH:321
                 efj.Roles(p1=120),
                 efj.Conditions(ifr=120),
                 efj.Landings(day=3),
-                efj.Aircraft("G-EFGH", "321"),
+                efj.Aircraft("OB-T-1274", "A-321"),
                 efj.Airports("BRS", "NCE"),
                 "Self", (), "", ()),
             efj.Sector(
@@ -67,7 +73,7 @@ G-EFGH:321
                 efj.Roles(p1=120),
                 efj.Conditions(night=10, ifr=90),
                 efj.Landings(night=1),
-                efj.Aircraft("G-EFGH", "321"),
+                efj.Aircraft("OB-T-1274", "A-321"),
                 efj.Airports("NCE", "BRS"),
                 "Self", (), "", ()))
         self.assertEqual(