seabirdfilehandler 0.7.4__tar.gz → 0.7.6__tar.gz

{seabirdfilehandler-0.7.4 → seabirdfilehandler-0.7.6}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: seabirdfilehandler
-Version: 0.7.4
+Version: 0.7.6
 Summary: Library of parsers to interact with SeaBird CTD files.
+License-File: LICENSE
 Keywords: CTD,parser,seabird,data
 Author: Emil Michels
 Author-email: <emil.michels@io-warnemuende.de>

{seabirdfilehandler-0.7.4 → seabirdfilehandler-0.7.6}/pyproject.toml

@@ -20,7 +20,7 @@ urls.homepage = "https://ctd-software.pages.io-warnemuende.de/seabirdfilehandler
 urls.repository = "https://git.io-warnemuende.de/CTD-Software/SeabirdFileHandler"
 urls.documentation = "https://ctd-software.pages.io-warnemuende.de/seabirdfilehandler"
 dynamic = []
-version = "0.7.4"
+version = "0.7.6"
 
 [tool.poetry]
 

{seabirdfilehandler-0.7.4 → seabirdfilehandler-0.7.6}/src/seabirdfilehandler/cnvfile.py

@@ -207,7 +207,10 @@ class CnvFile(DataFile):
         self.processing_info = self.processing_steps._form_processing_info()
         self.header = [
             *[f"* {data}" for data in self.sbe9_data[:-1]],
-            *[f"** {data}" for data in self.metadata_list],
+            *[
+                f"** {key} = {value}\n" if value else f"** {key}\n"
+                for key, value in self.metadata.items()
+            ],
             f"* {self.sbe9_data[-1]}",
             *[f"# {data}" for data in self.data_table_description],
             *[f"# {data}" for data in self.sensor_data],
@@ -241,12 +244,16 @@ class CnvFile(DataFile):
 
         """
         if "Station" in self.metadata:
-            self.parameters.create_parameter(
-                data=self.metadata["Station"],
-                name="Event",
-            )
-            return True
-        return False
+            data_value = self.metadata["Station"]
+            return_value = True
+        else:
+            data_value = None
+            return_value = False
+        self.parameters.create_parameter(
+            data=data_value,
+            name="Event",
+        )
+        return return_value
 
     def add_position_columns(self) -> bool:
         """

{seabirdfilehandler-0.7.4 → seabirdfilehandler-0.7.6}/src/seabirdfilehandler/datafiles.py

@@ -162,12 +162,14 @@ class DataFile:
         """
         out_dict = {}
         for line in metadata_list:
-            try:
+            if "=" in line:
                 (key, val) = line.split("=")
-            except ValueError:
-                out_dict["text"] = line
+            elif ":" in line:
+                (key, val) = line.split(":")
             else:
-                out_dict[key.strip()] = val.strip()
+                key = line
+                val = ""
+            out_dict[key.strip()] = val.strip()
         return out_dict
 
     def define_output_path(

{seabirdfilehandler-0.7.4 → seabirdfilehandler-0.7.6}/src/seabirdfilehandler/file_collection.py

@@ -157,10 +157,13 @@ class FileCollection(UserList):
         -------
         A list of all paths found.
         """
-        return sorted(
-            self.path_to_files.rglob(f"*{pattern}*{self.file_suffix}"),
-            key=sorting_key,
-        )
+        if self.path_to_files.is_file():
+            return [self.path_to_files]
+        else:
+            return sorted(
+                self.path_to_files.rglob(f"*{pattern}*{self.file_suffix}"),
+                key=sorting_key,
+            )
 
     def load_files(self, only_metadata: bool = False) -> list[DataFile]:
         """

{seabirdfilehandler-0.7.4 → seabirdfilehandler-0.7.6}/src/seabirdfilehandler/parameter.py

@@ -213,7 +213,7 @@ class Parameters(UserDict):
 
     def create_parameter(
         self,
-        data: np.ndarray | int | float | str,
+        data: np.ndarray | int | float | str | None,
         metadata: dict = {},
         name: str = "",
         position: str = "",