Fix UI sync bugs introduced by flow serialization.

libmproxy/console.py

@@ -109,6 +109,8 @@ class ConnectionItem(WWrap):
 class ConnectionListView(urwid.ListWalker):
     def __init__(self, master, state):
         self.master, self.state = master, state
+        if self.state.flow_list:
+            self.set_focus(0)
 
     def get_focus(self):
         f, i = self.state.get_focus()
@@ -572,6 +574,7 @@ class ConsoleMaster(controller.Master):
         ('key', "q"), ":back ",
     ]
     def __init__(self, server, options):
+        self.conn_list_view = None
         self.set_palette()
         controller.Master.__init__(self, server)
         self.state = ConsoleState()
@@ -689,8 +692,9 @@ class ConsoleMaster(controller.Master):
             self.statusbar.message(str(v))
             return
         self.state.load_flows(data, ConsoleFlow)
-        self.conn_list_view.set_focus(0)
-        self.sync_list_view()
+        if self.conn_list_view:
+            self.conn_list_view.set_focus(0)
+            self.sync_list_view()
 
     def helptext(self):
         text = []

libmproxy/flow.py

@@ -212,7 +212,8 @@ class State:
             Replaces the matching connection object with a ReplayConnection object.
         """
         conn = self.get_connection(f)
-        del self.flow_map[conn]
+        if conn in self.flow_map:
+            del self.flow_map[conn]
         f.revert()
         self.flow_map[f.connection] = f
 

mitmproxy

@@ -78,4 +78,6 @@ if __name__ == '__main__':
     )
     server = proxy.ProxyServer(options.port)
     m = console.ConsoleMaster(server, options)
+    for i in args:
+        m.load_flows(i)
     m.run()