codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-02-14 12:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed another search scrolling bug. New search is now only not performed if the same part of torrent name matches after entering a new character

Browse Source
This commit is contained in:
Asmageddon 2012-05-26 23:38:28 +02:00
parent c2f97356c6
commit 5a096768e0
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deluge/ui/console/modes/alltorrents.py
View File

@ -829,6 +829,8 @@ class AllTorrents(BaseMode, component.Component):
self.cursel = (i+1) self.cursel = (i+1)
if ((self.curoff + self.rows - 5) < self.cursel): if ((self.curoff + self.rows - 5) < self.cursel):
self.curoff = self.cursel - self.rows + 5 self.curoff = self.cursel - self.rows + 5
elif ((self.curoff - 4) > self.cursel):
self.curoff = max(1, self.cursel - 4)
self.search_state = SEARCH_SUCCESS self.search_state = SEARCH_SUCCESS
return return
self.search_state = SEARCH_FAILING self.search_state = SEARCH_FAILING
@ -896,6 +898,7 @@ class AllTorrents(BaseMode, component.Component):
self.search_string = "" self.search_string = ""
self.search_state = SEARCH_EMPTY self.search_state = SEARCH_EMPTY
elif c > 31 and c < 256: elif c > 31 and c < 256:
old_search_string = self.search_string
stroke = chr(c) stroke = chr(c)
uchar = "" uchar = ""
while not uchar: while not uchar:
@ -912,8 +915,17 @@ class AllTorrents(BaseMode, component.Component):
self.search_string = self.search_string[:self.cursor] + uchar + self.search_string[self.cursor:] self.search_string = self.search_string[:self.cursor] + uchar + self.search_string[self.cursor:]
# Move the cursor forward # Move the cursor forward
self.cursor+=1 self.cursor+=1
if self.search_string and cname.lower().find(self.search_string.lower()) == -1: still_matching = (
cname.lower().find(self.search_string.lower())
==
cname.lower().find(old_search_string.lower())
and
cname.lower().find(self.search_string.lower()) != -1
)
if self.search_string and not still_matching:
self.__do_search() self.__do_search()
elif self.search_string:
self.search_state = SEARCH_SUCCESS
if not self.search_string: if not self.search_string:
self.search_state = SEARCH_EMPTY self.search_state = SEARCH_EMPTY