Minor updates to be less strict on local log file names, as well as handling devices with no log files in them.

Author: MatinF

canedge_datasource/CanedgeFileSystem.py

@@ -42,7 +42,7 @@ def get_device_log_files(self, device, reverse: bool = False):
 
     def path_to_pars(self, path):
         """Matches as much as possible of path to CANedge pars (device id, session, split, extension)"""
-        pattern = r"^(?P<device_id>[0-9A-F]{8})?((/)(?P<session_no>\d{8}))?((/)(?P<split_no>\d{8})(?:-[0-9A-F]{8}){0,1}(?P<ext>\.(MF4|MFC|MFM|MFE)))?$"
+        pattern = r"^(?P<device_id>[0-9A-F]{8})?((/)(?P<session_no>\d{8}))?((/)(?P<split_no>\d{8})(?:-[0-9A-F]{8}){0,1}(\S*)(?P<ext>\.(MF4|MFC|MFM|MFE)))?$"
         match = re.match(pattern, path, re.IGNORECASE)
         if match:
             return match.group("device_id"), match.group("session_no"), match.group("split_no"), match.group("ext")

canedge_datasource/search.py

@@ -50,12 +50,17 @@ def get_logfile_comment(log_file):
                 # Return list of device ids and meta comments (slow)
                 for device in app.fs.get_device_ids():
                     # Get most recent log file
-                    log_file, _, _ = next(app.fs.get_device_log_files(device=device, reverse=True), None)
-                    # Get log file comment
-                    if log_file is not None:
-                        comment = " " + get_logfile_comment(log_file)
-                    else:
+                    try:
+                        log_file, _, _ = next(app.fs.get_device_log_files(device=device, reverse=True), None)
+                        # Get log file comment
+                        if log_file is not None:
+                            comment = " " + get_logfile_comment(log_file)
+                        else:
+                            comment = ""
+                    except:
+                        print(f"Unable to list log files for {device} - review folder structure and log file names")
                         comment = ""
+
                     res.append({"text": f"{device}{comment}", "value": device})
             elif req["search"] == "itf":
                 # Return list of interfaces