aims-convert 2.3__tar.gz → 2.4__tar.gz

{aims_convert-2.3 → aims_convert-2.4}/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: aims-convert
-Version: 2.3
+Version: 2.4
 Summary: Extract useful information from AIMS
 Home-page: https://github.com/JonHurst/aims-convert
 Author: Jon Hurst
 Author-email: jon.a@hursts.org.uk
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
@@ -18,6 +18,17 @@ Requires-Dist: bs4
 Requires-Dist: html5lib
 Provides-Extra: unit-tests
 Requires-Dist: freezegun; extra == "unit-tests"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # AIMS Roster Data Extraction #
 

aims_convert-2.4/aims/csv_logbook_report.py

@@ -0,0 +1,63 @@
+import datetime as dt
+from csv import DictReader
+
+from aims.data_structures import Duty, Sector, CrewMember, AllDayEvent
+
+
+HEADER = ("Date,Flight,DepPlace,DepTime,ArrPlace,ArrTime,ACType,Reg,"
+          "FltTime,PicName,TKoffsDay,TKoffsNight,LandsDay,LandsNight,"
+          "PIC,CoPlt,Instr,SimTime,SimType")
+
+
+def _sector(record: dict[str, str]) -> Sector:
+    date = dt.datetime.strptime(record["Date"], "%d/%m/%y").date()
+    off = dt.datetime.combine(
+        date,
+        dt.datetime.strptime(record["DepTime"], "%H:%M").time())
+    on = dt.datetime.combine(
+        date,
+        dt.datetime.strptime(record["ArrTime"], "%H:%M").time())
+    if on < off:
+        on += dt.timedelta(1)
+    return Sector(
+        name=record["Flight"],
+        reg=record["Reg"],
+        type_=record["ACType"],
+        from_=record["DepPlace"],
+        to=record["ArrPlace"],
+        off=off,
+        on=on,
+        quasi=False,
+        position=False,
+        crew=(CrewMember(record['PicName'], "CP"),)
+        )
+
+
+def _duty(sectors: tuple[Sector, ...]) -> Duty:
+    lowest_off = min([X.off for X in sectors])
+    highest_on = max([X.on for X in sectors])
+    return Duty(lowest_off - dt.timedelta(hours=1),
+                highest_on + dt.timedelta(minutes=30),
+                sectors)
+
+
+def duties(csv) -> tuple[tuple[Duty, ...], tuple[AllDayEvent, ...]]:
+    if not csv.startswith(HEADER):
+        return ((), ())
+    sectors: list[Sector] = []
+    for record in DictReader(csv.splitlines()):
+        if record["SimTime"]:
+            pass # a sim sector
+        else:
+            sectors.append(_sector(record))
+    if len(sectors) == 0:
+        return ((), ())
+    groups = [[sectors[0]]]
+    last_on = sectors[0].on
+    for sector in sectors[1:]:
+        if sector.off - last_on > dt.timedelta(hours=10):
+            groups.append([sector])
+        else:
+            groups[-1].append(sector)
+        last_on = sector.on
+    return (tuple(_duty(tuple(X)) for X in groups), ())

{aims_convert-2.3 → aims_convert-2.4}/aims/gui.py

@@ -301,13 +301,14 @@ class MainWindow(ttk.Frame):
             self.txt.delete('1.0', tk.END)
             messagebox.showerror("Error", str(e))
 
-    def __roster_html(self):
+    def __load_data(self):
         retval = ""
         path = self.settings.get('openPath')
         fn = filedialog.askopenfilename(
             filetypes=(
-                ("HTML file", "*.htm"),
-                ("HTML file", "*.html"),
+                ("AIMS file", "*.htm"),
+                ("AIMS file", "*.html"),
+                ("AIMS file", "*.csv"),
                 ("All", "*.*")),
             initialdir=path)
         if fn:
@@ -321,24 +322,24 @@ class MainWindow(ttk.Frame):
 
     def __csv(self):
         txt = ""
-        html = self.__roster_html()
-        if not html:
+        data = self.__load_data()
+        if not data:
             return
         self.txt.delete('1.0', tk.END)
         self.txt.insert(tk.END, "Getting registration and type info...")
         self.txt.update()
 
-        duties, _ = aims.parse.parse(html)
+        duties, _ = aims.parse.parse(data)
         # note: normalise newlines for Text widget - will restore on output
         txt = csv(duties).replace("\r\n", "\n")
         self.txt.delete('1.0', tk.END)
         self.txt.insert(tk.END, txt, 'csv')
 
     def __ical(self):
-        html = self.__roster_html()
-        if not html:
+        data = self.__load_data()
+        if not data:
             return
-        duties, ade = aims.parse.parse(html)
+        duties, ade = aims.parse.parse(data)
         # note: normalise newlines for Text widget - will restore on output
         if not self.ms.with_ade.get():
             ade = ()
@@ -347,13 +348,13 @@ class MainWindow(ttk.Frame):
         self.txt.insert(tk.END, txt, 'ical')
 
     def __efj(self):
-        html = self.__roster_html()
-        if not html:
+        data = self.__load_data()
+        if not data:
             return
         self.txt.delete('1.0', tk.END)
         self.txt.insert(tk.END, "Working…", 'efj')
         self.txt.update()
-        duties, _ = aims.parse.parse(html)
+        duties, _ = aims.parse.parse(data)
         txt = efj(duties)
         self.txt.delete('1.0', tk.END)
         self.txt.insert(tk.END, txt, 'efj')

aims_convert-2.4/aims/parse.py

@@ -0,0 +1,24 @@
+from aims.data_structures import Duty, AllDayEvent, InputFileException
+import aims.roster
+import aims.logbook_report
+import aims.csv_logbook_report
+
+
+def parse(in_: str) -> tuple[tuple[Duty, ...], tuple[AllDayEvent, ...]]:
+    if in_.startswith(
+            "Date,Flight,DepPlace,DepTime,ArrPlace,ArrTime,ACType,"
+            "Reg,FltTime,PicName,TKoffsDay,TKoffsNight,LandsDay,"
+            "LandsNight,PIC,CoPlt,Instr,SimTime,SimType"):
+        return aims.csv_logbook_report.duties(in_)
+    # check it's an html5 file
+    html5_header = "<!DOCTYPE html><html>"
+    if in_[:len(html5_header)] != html5_header:
+        raise InputFileException("Input format not supported.")
+    if in_.find("Personal&nbsp;Crew&nbsp;Schedule&nbsp;Report") != -1:
+        if in_.find("<nobr>Schedule&nbsp;Details</nobr>") != -1:
+            return aims.roster.duties(in_)
+        raise InputFileException("Horizontal Schedules not supported")
+    elif in_.find("Pilot&nbsp;Logbook") != -1:
+        return aims.logbook_report.duties(in_)
+    else:
+        raise InputFileException("Report type marker not found")

{aims_convert-2.3 → aims_convert-2.4}/aims_convert.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: aims-convert
-Version: 2.3
+Version: 2.4
 Summary: Extract useful information from AIMS
 Home-page: https://github.com/JonHurst/aims-convert
 Author: Jon Hurst
 Author-email: jon.a@hursts.org.uk
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
@@ -18,6 +18,17 @@ Requires-Dist: bs4
 Requires-Dist: html5lib
 Provides-Extra: unit-tests
 Requires-Dist: freezegun; extra == "unit-tests"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # AIMS Roster Data Extraction #
 

{aims_convert-2.3 → aims_convert-2.4}/aims_convert.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 setup.py
 aims/__init__.py
 aims/cli.py
+aims/csv_logbook_report.py
 aims/data_structures.py
 aims/gui.py
 aims/logbook_report.py
@@ -19,6 +20,7 @@ aims_convert.egg-info/entry_points.txt
 aims_convert.egg-info/requires.txt
 aims_convert.egg-info/top_level.txt
 tests/test_compound.py
+tests/test_csv_logbook.py
 tests/test_logbook.py
 tests/test_output.py
 tests/test_parse.py

{aims_convert-2.3 → aims_convert-2.4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="aims-convert",
-    version="2.3",
+    version="2.4",
     author="Jon Hurst",
     author_email="jon.a@hursts.org.uk",
     description="Extract useful information from AIMS",
@@ -14,7 +14,7 @@ setuptools.setup(
     packages=setuptools.find_packages(),
     url="https://github.com/JonHurst/aims-convert",
     classifiers=[
-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
         "Programming Language :: Python :: 3",
         ("License :: OSI Approved :: "

aims_convert-2.4/tests/test_csv_logbook.py

@@ -0,0 +1,55 @@
+import unittest
+import datetime as dt
+
+import aims.csv_logbook_report as report
+from aims.data_structures import Duty, Sector, CrewMember
+
+
+class TestDuties(unittest.TestCase):
+
+    def test_standard(self):
+        src = """\
+Date,Flight,DepPlace,DepTime,ArrPlace,ArrTime,ACType,Reg,FltTime,PicName,TKoffsDay,TKoffsNight,LandsDay,LandsNight,PIC,CoPlt,Instr,SimTime,SimType
+22/08/26,2831,BRS,06:29,VCE,08:33,320,G-EZPX,02:04,HURST,,,,,02:04,,,,
+22/08/26,2832,VCE,09:21,BRS,11:47,320,G-EZPX,02:26,HURST,,,,,02:26,,,,
+23/08/26,2829,BRS,23:00,JSI,01:00,321,G-UZLT,03:16,HURST,,,,,03:16,,,,
+09/11/25,,LGW,06:30,LGW,10:30,319,,,,,,,,,,,04:00,E2D1
+"""
+        s1 = Sector("2831", "G-EZPX", "320", "BRS", "VCE",
+                    dt.datetime(2026, 8, 22, 6, 29),
+                    dt.datetime(2026, 8, 22, 8, 33),
+                    False, False,
+                    (CrewMember("HURST", "CP"),))
+        s2 = Sector("2832", "G-EZPX", "320", "VCE", "BRS",
+                    dt.datetime(2026, 8, 22, 9, 21),
+                    dt.datetime(2026, 8, 22, 11, 47),
+                    False, False,
+                    (CrewMember("HURST", "CP"),))
+        s3 = Sector("2829", "G-UZLT", "321", "BRS", "JSI",
+                    dt.datetime(2026, 8, 23, 23, 0),
+                    dt.datetime(2026, 8, 24, 1, 0),
+                    False, False,
+                    (CrewMember("HURST", "CP"),))
+        expected = (
+            (Duty(
+                dt.datetime(2026, 8, 22, 5, 29),
+                dt.datetime(2026, 8, 22, 12, 17),
+                (s1, s2)),
+            Duty(
+                dt.datetime(2026, 8, 23, 22, 0),
+                dt.datetime(2026, 8, 24, 1, 30),
+                (s3,))),
+            ())
+        self.assertEqual(report.duties(src), expected)
+
+    def test_empty(self):
+        src = """\
+Date,Flight,DepPlace,DepTime,ArrPlace,ArrTime,ACType,Reg,FltTime,PicName,TKoffsDay,TKoffsNight,LandsDay,LandsNight,PIC,CoPlt,Instr,SimTime,SimType
+"""
+        self.assertEqual(report.duties(src), ((), ()))
+
+    def test_bad(self):
+        src = "bad"
+        self.assertEqual(report.duties(src), ((), ()))
+        src = ""
+        self.assertEqual(report.duties(src), ((), ()))

aims_convert-2.3/aims/parse.py

@@ -1,16 +0,0 @@
-from aims.data_structures import Duty, AllDayEvent, InputFileException
-import aims.roster
-import aims.logbook_report
-
-
-def parse(html: str) -> tuple[tuple[Duty, ...], tuple[AllDayEvent, ...]]:
-    # check it's an html5 file
-    html5_header = "<!DOCTYPE html><html>"
-    if html[:len(html5_header)] != html5_header:
-        raise InputFileException("HTML5 header not found.")
-    if html.find("Personal&nbsp;Crew&nbsp;Schedule&nbsp;Report") != -1:
-        return aims.roster.duties(html)
-    elif html.find("Pilot&nbsp;Logbook") != -1:
-        return aims.logbook_report.duties(html)
-    else:
-        raise InputFileException("Report type marker not found")