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

Fixed sorting by some of the keys, reversed sorting order where appropriate

Browse Source
This commit is contained in:
Asmageddon 2012-05-27 23:55:40 +02:00
parent 864785752f
commit f5f1f11f61
1 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,6 +235,34 @@ torrent_options_to_names = {
"move_on_completed_path": "Path to move the torrent to" "move_on_completed_path": "Path to move the torrent to"
} }
column_names_to_state_keys = {
"size": "total_wanted",
"downspeed": "download_payload_rate",
"upspeed": "upload_payload_rate",
"seeders": "num_seeds",
"peers": "num_peers",
"avail": "distributed_copies",
"added": "time_added",
"tracker": "tracker_host",
"savepath": "save_path",
"uploaded": "total_uploaded",
"downloaded": "all_time_download"
}
reverse_sort_fields = [
"total_wanted",
"download_payload_rate",
"upload_payload_rate",
"num_seeds",
"num_peers",
"distributed_copies",
"time_added",
"total_uploaded",
"all_time_download",
"progress",
"ratio"
]
SEARCH_EMPTY = 0 SEARCH_EMPTY = 0
SEARCH_FAILING = 1 SEARCH_FAILING = 1
SEARCH_SUCCESS = 2 SEARCH_SUCCESS = 2
@ -338,7 +366,6 @@ class AllTorrents(BaseMode, component.Component):
if s_secondary and (s_secondary not in self.__status_fields): if s_secondary and (s_secondary not in self.__status_fields):
self.__status_fields.append(s_secondary) self.__status_fields.append(s_secondary)
self.__update_columns() self.__update_columns()
def __split_help(self): def __split_help(self):
@ -495,6 +522,7 @@ class AllTorrents(BaseMode, component.Component):
def _sort_torrents(self, state): def _sort_torrents(self, state):
"sorts by primary and secondary sort fields" "sorts by primary and secondary sort fields"
s_primary = self.config["sort_primary"] s_primary = self.config["sort_primary"]
s_secondary = self.config["sort_secondary"] s_secondary = self.config["sort_secondary"]
@ -503,22 +531,31 @@ class AllTorrents(BaseMode, component.Component):
#Sort first by secondary sort field and then primary sort field #Sort first by secondary sort field and then primary sort field
# so it all works out # so it all works out
cmp_func = self._queue_sort
def sort_by_field(state, result, field): def sort_by_field(state, result, field):
if field in column_names_to_state_keys:
field = column_names_to_state_keys[field]
reverse = field in reverse_sort_fields
cmp_func = self._queue_sort
#Get first element so we can check if it has given field #Get first element so we can check if it has given field
# and if it's a string # and if it's a string
first_element = state[state.keys()[0]] first_element = state[state.keys()[0]]
if field in first_element: if field in first_element:
is_string = isinstance( first_element[field], basestring) is_string = isinstance( first_element[field], basestring)
sort_key = lambda s:state.get(s)[field] sort_key = lambda s:state.get(s)[field]
sort_key2 = lambda s:state.get(s)[field].lower() sort_key2 = lambda s:state.get(s)[field].lower()
#If it's a string, sort case-insensitively but preserve A>a order #If it's a string, sort case-insensitively but preserve A>a order
if is_string: if is_string:
result = sorted(result, cmp_func, sort_key) result = sorted(result, cmp_func, sort_key, reverse)
result = sorted(result, cmp_func, sort_key2) result = sorted(result, cmp_func, sort_key2, reverse)
else: else:
result = sorted(result, cmp_func, sort_key) result = sorted(result, cmp_func, sort_key, reverse)
return result return result
#Just in case primary and secondary fields are empty and/or #Just in case primary and secondary fields are empty and/or