P2 (all in 1)

.github/workflows/ci.yml

@@ -11,15 +11,15 @@ on:
   pull_request:
 
 jobs:
-  build_package_lint_check:
-    name: Build, package, lint, check
+  ensure_build_package:
+    name: Ensure build and package
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
-          cache: "pip"
+          cache: pip
       - name: Setup, build, install
         run: |
           pip install build
@@ -29,6 +29,13 @@ jobs:
         run: qgis-plugin-ci --no-validation package 'test'
       - name: Lint
         run: black . --check
+      - name: Check
+        run: pyright . > pyright_report.txt
+        continue-on-error: true
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Pyright Report
+          path: pyright_report.txt
 
   test:
     name: Test

.gitignore

@@ -1,5 +1,6 @@
 **/__pycache__/
 **/coverage_report.txt
+test_outputs/
 *.nix
 *.log
 .venv/

comptages/comptages.py

@@ -426,8 +426,8 @@ def do_yearly_report_action(self):
                 yrb.run()
             else:
                 self.tm.allTasksFinished.connect(
-                    partial(self.all_tasks_finished, report)
-                )  # FIXME `report` is a mystery.
+                    partial(self.all_tasks_finished, "report")
+                )
 
                 # TODO: consider the chosed class too
                 self.tm.addTask(
@@ -440,6 +440,12 @@ def do_yearly_report_action(self):
                 )
             # TODO: check if there are comptages for this section and year
 
+        QgsMessageLog.logMessage(
+            "{} - Generate yearly report action ended".format(datetime.now()),
+            "Comptages",
+            Qgis.Info,
+        )
+
     def do_import_ics_action(self):
         IcsImporter(self.layers)
 

comptages/core/importer.py

@@ -61,6 +61,7 @@ def _parse_and_write(
         with open(file_path, encoding=get_file_encoding(file_path)) as f:
             for i, line in enumerate(f):
                 rows = line_parser(line, **kwargs)
+                print("i=", i)
                 if not rows:
                     continue
 
@@ -337,7 +338,7 @@ def _parse_file_header(file_path: str):
                 elif file_header["CLASS"][:5] == "FHWA ":
                     file_header["CLASS"] = "FHWA13"
                 elif file_header["CLASS"] == "CAT-Cycle_dist-empat":
-                    file_header["CLASS"] = "SPCH-MD 5C"
+                    file_header["CLASS"] = "SPCH-MD_5C"
 
     return file_header