Applied some minor improvements

Author: dhondta

src/dsff/csv.py

@@ -13,6 +13,8 @@ def from_csv(dsff, path=None, exclude=DEFAULT_EXCL):
     features = {}
     for headers in dsff['data'].rows:
         for header in headers:
+            if header.value in exclude:
+                continue
             features[header.value] = ""
         break
     dsff.write(features=features)
@@ -24,8 +26,8 @@ def to_csv(dsff, path=None, text=False):
     dsff.logger.debug(f"extracting data from DSFF to {[path,'CSV'][text]}...")
     with (StringIO() if text else open(path, 'w+')) as f:
         writer = csvmod.writer(f, delimiter=";")
-        for cells in dsff['data'].rows:
-            writer.writerow([dsff._DSFF__eval(c.value) for c in cells])
+        for row in dsff.data:
+            writer.writerow(row)
         if text:
             return f.getvalue()
 

src/dsff/dataset.py

@@ -12,12 +12,8 @@ def from_dataset(dsff, path=None):
     if not isdir(path):
         raise BadInputData("Not a folder")
     else:
-        missing = []
-        for f in ["data.csv", "features.json", "metadata.json"]:
-            if not isfile(join(path, f)):
-                missing.append(f)
-        if len(missing) > 0:
-            raise BadInputData("Not a valid dataset folder (missing: %s)" % ", ".join(missing))
+        if len(missing := [f for f in ["data.csv", "features.json", "metadata.json"] if not isfile(join(path, f))]) > 0:
+            raise BadInputData(f"Not a valid dataset folder (missing: {', '.join(missing)})")
     dsff.write(path)