Iterate through files also if only metadata is requested

dasscripts/dasconv.py

@@ -373,10 +373,19 @@ class TDMS(object):
 
     def __iter_metadata__(self):
         # Metadata
-        logs = logging.getLogger('Iterate Metadata')
+        # logs = logging.getLogger('Iterate Metadata')
+
+        while (self.__twend is None) or (self.__twstart < self.__twend):
             for ch in self.metadata:
                 yield self.metadata[ch]
 
+            # No more data in this file. Skip to the next one.
+            self.__currentfile += 1
+            try:
+                self.__select_file()
+            except IndexError:
+                break
+
     def __readstring(self):
         # logs = logging.getLogger('readstring')
         strlen = struct.unpack('%cI' % self.__endian, self.__fi.read(4))
@@ -524,6 +533,9 @@ def main():
                         help='Experiment to read and process. It is usually the first part of the filenames.')
 
     args = parser.parse_args()
+    if args.metadata:
+        logging.basicConfig(level=args.loglevel, stream=sys.stdout)
+    else:
         logging.basicConfig(level=args.loglevel)
 
     logs = logging.getLogger('OpenFile')