QOL fixes for plugin architecture

Author: ptooley

pypop/config.py

@@ -28,7 +28,8 @@ def set_paramedir_path(path):
         raise ValueError("path must be a string")
 
     _paramedir_path = normpath(expanduser(path))
-    
+
+
 def set_tmpdir_path(path):
     global _tmpdir_path
     if not isinstance(path, str):

pypop/trace/prvtrace.py

@@ -13,6 +13,7 @@
 from .trace import Trace
 
 from ..utils.io import zipopen
+from ..utils.exceptions import WrongLoaderError
 
 from ..dimemas import dimemas_idealise
 from ..extrae import paramedir_analyze_any_of, chop_prv_to_roi, remove_trace
@@ -56,8 +57,14 @@
 class PRVTrace(Trace):
     def _gather_metadata(self):
 
-        with zipopen(self._tracefile, "rt") as fh:
-            headerline = fh.readline().strip()
+        try:
+            with zipopen(self._tracefile, "rt") as fh:
+                headerline = fh.readline().strip()
+        except IsADirectoryError:
+            raise WrongLoaderError("Not a valid prv file")
+
+        if not headerline.startswith("#Paraver"):
+            raise WrongLoaderError("Not a valid prv file")
 
         elem = headerline.replace(":", ";", 1).split(":", 4)
 

pypop/utils/pandas.py

@@ -21,7 +21,7 @@ def __enter__(self):
             # despatcher
             if "does not exist" in str(err):
                 raise FileNotFoundError('"{}" does not exist'.format(self._filename))
-            if "HDF5 error" in str(err):
+            if "HDF5 error" in str(err) or "not a regular file" in str(err):
                 raise ValueError('"{}" is not a valid HDF5 file'.format(self._filename))
             # Reraise anything we don't catch explicitly
             raise