Magic-Mirror/mitmproxy
1
0
Fork 0
mirror of https://github.com/mitmproxy/mitmproxy.git synced 2024-12-04 19:46:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

add helpful messages on wrap

Browse Source
This commit is contained in:
Pedro Worcel 2014-02-22 18:04:56 +13:00
parent 3e50034428
commit cffae49e34
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libmproxy/console/flowview.py
View File

@ -256,7 +256,7 @@ class FlowView(common.WWrap):
)
return f
def search_wrapped_around(self, last_find_line, last_search_index):
def search_wrapped_around(self, last_find_line, last_search_index, backwards):
"""
returns true if search wrapped around the bottom.
"""
@ -266,13 +266,22 @@ class FlowView(common.WWrap):
current_search_index = self.state.get_flow_setting(self.flow,
"last_search_index")
if current_find_line <= last_find_line:
return True
elif current_find_line == last_find_line:
if current_search_index <= last_search_index:
return True
if not backwards:
message = "search hit BOTTOM, continuing at TOP"
if current_find_line <= last_find_line:
return True, message
elif current_find_line == last_find_line:
if current_search_index <= last_search_index:
return True, message
else:
message = "search hit TOP, continuing at BOTTOM"
if current_find_line >= last_find_line:
return True, message
elif current_find_line == last_find_line:
if current_search_index >= last_search_index:
return True, message
return False
return False, ""
def search_again(self, backwards=False):
"""
@ -284,7 +293,10 @@ class FlowView(common.WWrap):
if message:
self.master.statusbar.message(message)
else:
self.master.statusbar.message("no previous searches have been made")
message = "no previous searches have been made"
self.master.statusbar.message(message)
return message
def search(self, search_string, backwards=False):
"""
@ -331,8 +343,11 @@ class FlowView(common.WWrap):
self.last_displayed_body = list_box
if not backwards and self.search_wrapped_around(last_find_line, last_search_index):
return "search hit BOTTOM, continuing at TOP"
wrapped, wrapped_message = self.search_wrapped_around(last_find_line, last_search_index, backwards)
if wrapped:
print(wrapped, wrapped_message)
return wrapped_message
def search_get_start(self, search_string):
start_line = 0
@ -409,7 +424,6 @@ class FlowView(common.WWrap):
break
# handle search WRAP
if found:
focus_pos = i

2
test/test_console_search.py
View File

@ -170,7 +170,7 @@ def test_search_backwards_wraps():
# should be on third now.
f.search_again(backwards=True)
message = f.search_again(backwards=True)
text_object = tutils.get_body_line(f.last_displayed_body, 2)
assert text_object.get_text() == ('this is string', [(None, 8), (f.highlight_color, 6)])
assert message == "search hit TOP, continuing at BOTTOM"