diff options
| -rw-r--r-- | mitmproxy/addons/view.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/mitmproxy/addons/view.py b/mitmproxy/addons/view.py index 3730aa8d..25142a2c 100644 --- a/mitmproxy/addons/view.py +++ b/mitmproxy/addons/view.py @@ -447,9 +447,17 @@ class View(collections.Sequence): Load flows into the view, without processing them with addons. """ try: - dh = io.DbHandler(path) - for f in dh.load(): - self.add([f.copy()]) + if path.endswith(".sqlite"): + dh = io.DbHandler(path) + for f in dh.load(): + self.add([f.copy()]) + else: + with open(path, "rb") as f: + for i in io.FlowReader(f).stream(): + # Do this to get a new ID, so we can load the same file N times and + # get new flows each time. It would be more efficient to just have a + # .newid() method or something. + self.add([i.copy()]) except exceptions.TypeError as e: ctx.log.error(str(e)) except IOError as e: |