code refactor

related to #8 (closed):

• I kept changes per commit small, so the number of commits got kind of numerous...

src/icartt/dataset.py

@@ -208,10 +208,11 @@ class KeywordComment:
 class StandardNormalComments(collections.UserList):
     @property
     def nlines(self):
-        # "+ 1" -> shortnames line, and keywords might be multiline...
-        return (
-            len(self.freeform) + 1 + sum([len(k.data) for k in self.keywords.values()])
-        )
+        n = 1 # shortnames line, and keywords might be multiline...
+        n += len(self.freeform)
+        n += sum(len(k.data) or 1 for k in self.keywords.values())
+        # was: len(self.freeform) + 1 + sum([len(k.data) for k in self.keywords.values()])
+        return n
 
     @property
     def data(self):
@@ -533,8 +534,8 @@ class Dataset:
         # here that the independent variable should monotonically increase even when
         # crossing over to a second day.
 
-        def extractVardesc(dmp):
-            shortname = dmp[0]
+        def extractVardesc(dmp): # TODO: could be a 'utils' function or one line,
+            shortname = dmp[0]   # shortname, units, standardname, longname, *_ = dmp + [None] * 3
             units = dmp[1]
             standardname = dmp[2] if len(dmp) > 2 else None
             longname = dmp[3] if len(dmp) > 3 else None
@@ -652,7 +653,7 @@ class Dataset:
         # this section of the header along with the relevant data listed after the
         # colon. For key words where information is not needed or applicable, simply
         # enter N/A.).
-        rawNcom = [f.readline(doSplit=False) for i in range(0, nncom)]
+        rawNcom = [f.readline(doSplit=False) for _ in range(nncom)]
         self.normalComments.ingest(rawNcom)
 
         self.nHeaderFile = f.line
@@ -786,6 +787,7 @@ class Dataset:
         # Variable names and units (Short variable name and units are required, and optional long descriptive name, in that order, and separated by commas. If the variable is unitless, enter the keyword "none" for its units. Each short variable name and units (and optional long name) are entered on one line. The short variable name must correspond exactly to the name used for that variable as a column header, i.e., the last header line prior to start of data.).
         for DVAR in self.dependentVariables.values():
             write_to_file(DVAR.desc(delimiter))
+
         if self.format == Formats.FFI2110:
             # Number of variables (Integer value showing the number of dependent variables: the total number of columns of data is this value plus one.).
             write_to_file(len(self.auxiliaryVariables))
@@ -805,7 +807,6 @@ class Dataset:
             for AUXVAR in self.auxiliaryVariables.values():
                 write_to_file(AUXVAR.desc(delimiter))
 
-
         # Number of SPECIAL comment lines (Integer value indicating the number of lines of special comments, NOT including this line.).
         write_to_file(f"{len(self.specialComments)}")
         # Special comments (Notes of problems or special circumstances unique to this file. An example would be comments/problems associated with a particular flight.).