seabirdfilehandler 0.7.3__py3-none-any.whl → 0.7.5__py3-none-any.whl

seabirdfilehandler/cnvfile.py

@@ -167,7 +167,7 @@ class CnvFile(DataFile):
     def to_cnv(
         self,
         file_name: Path | str | None = None,
-        use_dataframe: bool = True,
+        use_dataframe: bool = False,
     ):
         """
         Writes the values inside of this instance as a new cnv file to disc.
@@ -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/datafiles.py

@@ -4,16 +4,6 @@ import pandas as pd
 import numpy as np
 import logging
 
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s - %(name)s - [%(levelname)s] - %(message)s",
-    datefmt="%Y-%m-%d %H:%M:%S",
-    handlers=[
-        logging.FileHandler("filehandler.log"),
-        logging.StreamHandler(),
-    ],
-)
-
 logger = logging.getLogger(__name__)
 
 
@@ -172,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/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 = "",

{seabirdfilehandler-0.7.3.dist-info → seabirdfilehandler-0.7.5.dist-info}/METADATA

@@ -1,7 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: seabirdfilehandler
-Version: 0.7.3
+Version: 0.7.5
 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.3.dist-info → seabirdfilehandler-0.7.5.dist-info}/RECORD

@@ -1,16 +1,16 @@
 seabirdfilehandler/__init__.py,sha256=PSokwgSgsmpFh-2Xv2T2d3yxmmahLnIq58WLZ51l86I,276
 seabirdfilehandler/bottlefile.py,sha256=qCh506J3MWZXM11243aw_oJRocVB0ZIipXQLEgkD5M0,6046
 seabirdfilehandler/bottlelogfile.py,sha256=MtMmEebdAktO3mk6KbmJC7dfx9sRLbV5qqDQt2qtpJE,4310
-seabirdfilehandler/cnvfile.py,sha256=DL5JimbFaznTcTzWiXcez6wviNIjq3kcGwvf3wO4zyY,10041
-seabirdfilehandler/datafiles.py,sha256=HQungz24lRw4OiTwWs_curAGhzkI1rPiCmMXXcdQFNE,9423
+seabirdfilehandler/cnvfile.py,sha256=xCkU0N9WS2Lo3OPyo2YFl-D8qvLwIpjDDO3Rco__8Mg,10248
+seabirdfilehandler/datafiles.py,sha256=riSs_IG6qruJL_M92Ii4XqBpLp34U3pwg4yFQHchq7U,9233
 seabirdfilehandler/file_collection.py,sha256=oLdjS-Q4_33T0qo_SYxkqg2bsaeg4gLVKBkOPxoTXx4,16111
 seabirdfilehandler/geomar_ctd_file_parser.py,sha256=4eCnkE0mvPKC8Dic8sXP4xpfwnk3K2MQcGFBf6loT8k,2655
 seabirdfilehandler/hexfile.py,sha256=TBplwbWHrTuJzv2qlx6xYNtoX43I2YUabDmaGZuBEDQ,2144
-seabirdfilehandler/parameter.py,sha256=r4cdqhhi8CJE3xyo_6BtKjQ5R7AZKyXHURDhFKL8mC4,16065
+seabirdfilehandler/parameter.py,sha256=ovoYt9NjUhLudCywzgEBlnSHydgSVsueHcl45769LVg,16072
 seabirdfilehandler/processing_steps.py,sha256=5v6FV5zT7K6flbYLU31fyBRwPwQi4225se8i9WYUTQQ,7101
 seabirdfilehandler/utils.py,sha256=5KXdB8Hdv65dv5tPyXxNMct1mCEOyA3S8XP54AFAnx0,1745
 seabirdfilehandler/xmlfiles.py,sha256=XqqbVNjyINySoe2ZC_qJglkAqshavZxT2-jorDOSj7Y,5084
-seabirdfilehandler-0.7.3.dist-info/LICENSE,sha256=Ifd1VPmYv32oJd2QVh3wIQP9X05vYJlcY6kONz360ws,34603
-seabirdfilehandler-0.7.3.dist-info/METADATA,sha256=TqO2WAe-otgi5fErZ1hp-YT37T67PPeULtee8WfMG8Y,2307
-seabirdfilehandler-0.7.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-seabirdfilehandler-0.7.3.dist-info/RECORD,,
+seabirdfilehandler-0.7.5.dist-info/METADATA,sha256=hLyBlSy7XXyuTFkqrC58eXAOcIVI0cqGVlYGLGwBX1M,2329
+seabirdfilehandler-0.7.5.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
+seabirdfilehandler-0.7.5.dist-info/licenses/LICENSE,sha256=Ifd1VPmYv32oJd2QVh3wIQP9X05vYJlcY6kONz360ws,34603
+seabirdfilehandler-0.7.5.dist-info/RECORD,,

{seabirdfilehandler-0.7.3.dist-info → seabirdfilehandler-0.7.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.2.0
 Root-Is-Purelib: true
 Tag: py3-none-any