Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 18:18:25 +00:00
Code Issues Projects Releases Wiki Activity

view can load from both io interfaces

Browse Source
This commit is contained in:
madt1m 2018-06-30 12:20:27 +02:00
parent 85da4694f1
commit 66aff8d2a4
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mitmproxy/addons/view.py
View File

@ -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: