Frames read only, remove metadata printing

Enteee · Nov 24, 2018 · dac77ec · dac77ec
1 parent 444502d
commit dac77ec
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 93 deletions.
diff --git a/pdml2flow/cli.py b/pdml2flow/cli.py
@@ -65,14 +65,6 @@ def add_arguments_cb(argparser):
                 Conf.FRAMES_ARRAY
             )
         )
-        argparser.add_argument(
-            '-m',
-            dest='METADATA',
-            action='store_true',
-            help='Appends flow metadata [default: {}]'.format(
-                Conf.METADATA
-            )
-        )
         argparser.add_argument(
             '-d',
             dest='DEBUG',

diff --git a/pdml2flow/conf.py b/pdml2flow/conf.py
@@ -58,7 +58,6 @@ def get_version():
     FRAMES_ARRAY = False
     FRAME_TIME = ['frame', 'time_epoch', 'raw', 0]
     DEBUG = False
-    METADATA = False
     PARSE_SOURCE = sys.stdin
     SUPPORTED_PLUGIN_INTERFACES = [Plugin2]
     PLUGINS = []

diff --git a/pdml2flow/flow.py b/pdml2flow/flow.py
@@ -52,13 +52,19 @@ def __eq__(self, other):
     def frames(self):
         # clean the frame data
         if Conf.FRAMES_ARRAY:
-            self.__frames = [ f.clean_empty() for f in self.__frames ]
+            self.__frames = [
+                f.clean_empty()
+                for f in self.__frames
+            ]
+            ret = [
+                f.cast_dicts(dict)
+                for f in self.__frames
+            ]
         else:
             self.__frames = self.__frames.clean_empty()
+            ret = self.__frames.cast_dicts(dict)
 
-        if Conf.METADATA:
-            return self.__dict__
-        return self.__frames
+        return ret
 
     @property
     def first_frame_time(self):

diff --git a/test/flow_test.py b/test/flow_test.py
@@ -117,6 +117,33 @@ def test_frames(self):
             f0.merge(f1)
         )
 
+    def test_frames_returns_copy(self):
+        Conf.FRAME_TIME = [ 't' ]
+        Conf.FLOW_DEF = [ ['def1'] ]
+        f = Flow(
+            AutoVivification({
+                't' : 0,
+                'def1': 1,
+                'unimportant': 1,
+            })
+        )
+        f.add_frame(
+            AutoVivification({
+                't' : 0,
+                'def1': 1,
+                'unimportant': 1,
+            })
+        )
+
+        frames_before_add = f.frames
+        f.frames['add'] = 'something'
+
+        self.assertEqual(
+            frames_before_add,
+            f.frames,
+        )
+
+
     def test_first_frame_time(self):
         Conf.FRAME_TIME = [ 't' ]
         Conf.FLOW_DEF = [ ['def1'] ]

diff --git a/test/pdml2flow_tests/base_meta/args b/test/pdml2flow_tests/base_meta/args
diff --git a/test/pdml2flow_tests/base_meta/stdin b/test/pdml2flow_tests/base_meta/stdin
diff --git a/test/pdml2flow_tests/base_meta/stdout b/test/pdml2flow_tests/base_meta/stdout