Use unicode elipsis & make extra params a part of dict

2 files changed, 16 insertions, 16 deletions

diff --git a/mitmproxy/console/common.py b/mitmproxy/console/common.py
index e9359109..25181cb7 100644
--- a/mitmproxy/console/common.py
+++ b/mitmproxy/console/common.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 from __future__ import absolute_import, print_function, division
 
 import os
@@ -328,11 +330,11 @@ def export_to_clip_or_file(key, scope, flow, writer):
 flowcache = utils.LRUCache(800)
 
 
-def raw_format_flow(f, focus, extended, truncate_urls):
+def raw_format_flow(f):
     f = dict(f)
     pile = []
     req = []
-    if extended:
+    if f["extended"]:
         req.append(
             fcol(
                 human.format_timestamp(f["req_timestamp"]),
@@ -340,7 +342,7 @@ def raw_format_flow(f, focus, extended, truncate_urls):
             )
         )
     else:
-        req.append(fcol(">>" if focus else "  ", "focus"))
+        req.append(fcol(">>" if f["focus"] else "  ", "focus"))
 
     if f["marked"]:
         req.append(fcol(SYMBOL_MARK, "mark"))
@@ -360,9 +362,8 @@ def raw_format_flow(f, focus, extended, truncate_urls):
 
     url = f["req_url"]
 
-    # TODO: Add a configuration setting that disables this behaviour?
-    if truncate_urls and len(url) > truncate_urls:
-        url = url[:truncate_urls] + "..."
+    if f["max_url_len"] and len(url) > f["max_url_len"]:
+        url = url[:f["max_url_len"]] + "…"
 
     if f["req_http_version"] not in ("HTTP/1.0", "HTTP/1.1"):
         url += " " + f["req_http_version"]
@@ -389,7 +390,7 @@ def raw_format_flow(f, focus, extended, truncate_urls):
         if f["resp_is_replay"]:
             resp.append(fcol(SYMBOL_REPLAY, "replay"))
         resp.append(fcol(f["resp_code"], ccol))
-        if extended:
+        if f["extended"]:
             resp.append(fcol(f["resp_reason"], ccol))
         if f["intercepted"] and f["resp_code"] and not f["acked"]:
             rc = "intercept"
@@ -415,8 +416,12 @@ def raw_format_flow(f, focus, extended, truncate_urls):
     return urwid.Pile(pile)
 
 
-def format_flow(f, focus, extended=False, hostheader=False, truncate_urls=False):
+def format_flow(f, focus, extended=False, hostheader=False, max_url_len=False):
     d = dict(
+        focus=focus,
+        extended=extended,
+        max_url_len=max_url_len,
+
         intercepted = f.intercepted,
         acked = f.reply.state == "committed",
 
@@ -454,10 +459,5 @@ def format_flow(f, focus, extended=False, hostheader=False, truncate_urls=False)
             d["resp_ctype"] = t.split(";")[0]
         else:
             d["resp_ctype"] = ""
-    return flowcache.get(
-        raw_format_flow,
-        tuple(sorted(d.items())),
-        focus,
-        extended,
-        truncate_urls,
-    )
+
+    return flowcache.get(raw_format_flow, tuple(sorted(d.items())))
diff --git a/mitmproxy/console/flowlist.py b/mitmproxy/console/flowlist.py
index 6e6f989f..11e8fc99 100644
--- a/mitmproxy/console/flowlist.py
+++ b/mitmproxy/console/flowlist.py
@@ -121,7 +121,7 @@ class ConnectionItem(urwid.WidgetWrap):
             self.flow,
             self.f,
             hostheader=self.master.options.showhost,
-            truncate_urls=cols,
+            max_url_len=cols,
         )
 
     def selectable(self):