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

Removed debug code, made AddTorrents save path and sorting column/order

Browse Source
This commit is contained in:
Asmageddon 2012-07-13 11:42:50 +02:00
parent 57b1820fd7
commit 567f4e5c3d
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
deluge/ui/console/modes/addtorrents.py
View File

@ -100,7 +100,9 @@ class AddTorrents(BaseMode, component.Component):
self.marked = set() self.marked = set()
self.last_mark = -1 self.last_mark = -1
self.path_stack = ["/"] + "/home/asmageddon/Downloads/torrents/".split("/")[1:-1] path = os.path.expanduser(self.console_config["addtorrents_last_path"])
self.path_stack = ["/"] + path.strip("/").split("/")
self.path_stack_pos = len(self.path_stack) self.path_stack_pos = len(self.path_stack)
self.listing_files = [] self.listing_files = []
self.listing_dirs = [] self.listing_dirs = []
@ -110,8 +112,8 @@ class AddTorrents(BaseMode, component.Component):
self.raw_rows_dirs = [] self.raw_rows_dirs = []
self.formatted_rows = [] self.formatted_rows = []
self.sort_column = 2 self.sort_column = self.console_config["addtorrents_sort_column"]
self.reverse_sort = True self.reverse_sort = self.console_config["addtorrents_reverse_sort"]
BaseMode.__init__(self, stdscr, encoding) BaseMode.__init__(self, stdscr, encoding)
@ -197,12 +199,15 @@ class AddTorrents(BaseMode, component.Component):
self.__sort_rows() self.__sort_rows()
def __sort_rows(self): def __sort_rows(self):
self.console_config["addtorrents_sort_column"] = self.sort_column
self.console_config["addtorrents_reverse_sort"] = self.reverse_sort
self.console_config.save()
self.raw_rows_dirs.sort(key=lambda r: r[0].lower()) self.raw_rows_dirs.sort(key=lambda r: r[0].lower())
if self.sort_column == 0: if self.sort_column == "name":
self.raw_rows_files.sort(key=lambda r: r[0].lower(), reverse=self.reverse_sort) self.raw_rows_files.sort(key=lambda r: r[0].lower(), reverse=self.reverse_sort)
else: elif self.sort_column == "date":
self.raw_rows_files.sort(key=lambda r: r[2], reverse=self.reverse_sort) self.raw_rows_files.sort(key=lambda r: r[2], reverse=self.reverse_sort)
self.raw_rows = self.raw_rows_dirs + self.raw_rows_files self.raw_rows = self.raw_rows_dirs + self.raw_rows_files
@ -222,7 +227,11 @@ class AddTorrents(BaseMode, component.Component):
self.formatted_rows.append(format_utils.format_row(cols, widths)) self.formatted_rows.append(format_utils.format_row(cols, widths))
else: else:
#Size of .torrent file itself couldn't matter less so we'll leave it out #Size of .torrent file itself couldn't matter less so we'll leave it out
cols = [filename.decode("utf8"), common.fdate(time)] try:
filename = filename.decode("utf8")
except:
pass
cols = [filename, common.fdate(time)]
widths = [self.cols - 23, 23] widths = [self.cols - 23, 23]
self.formatted_rows.append(format_utils.format_row(cols, widths)) self.formatted_rows.append(format_utils.format_row(cols, widths))
@ -314,7 +323,11 @@ class AddTorrents(BaseMode, component.Component):
widths = [self.cols - 35, 12, 23] widths = [self.cols - 35, 12, 23]
s = "" s = ""
for i, (c, w) in enumerate(zip(cols, widths)): for i, (c, w) in enumerate(zip(cols, widths)):
if i == self.sort_column: cn = ""
if i == 0: cn = "name"
elif i == 2: cn = "date"
if cn == self.sort_column:
s += "{!black,green,bold!}" + c.ljust(w - 2) s += "{!black,green,bold!}" + c.ljust(w - 2)
if self.reverse_sort: if self.reverse_sort:
s += "^ " s += "^ "
@ -389,7 +402,7 @@ class AddTorrents(BaseMode, component.Component):
self.view_offset = 0 self.view_offset = 0
self.cursel = 0 self.cursel = 0
self.last_mark = -1 self.last_mark = -1
self.marked = [] self.marked = set()
self.__refresh_listing() self.__refresh_listing()
@ -431,6 +444,9 @@ class AddTorrents(BaseMode, component.Component):
d.addCallback(success_cb, filename, ress) d.addCallback(success_cb, filename, ress)
d.addErrback(fail_cb, filename, ress) d.addErrback(fail_cb, filename, ress)
self.console_config["addtorrents_last_path"] = os.path.join(*self.path_stack[:self.path_stack_pos])
self.console_config.save()
self.back_to_overview() self.back_to_overview()
config = component.get("ConsoleUI").coreconfig config = component.get("ConsoleUI").coreconfig
@ -519,17 +535,17 @@ class AddTorrents(BaseMode, component.Component):
if chr(c) == 'h': if chr(c) == 'h':
self.popup = Popup(self,"Help",init_lines=self.__help_lines, height_req=0.75, width_req=65) self.popup = Popup(self,"Help",init_lines=self.__help_lines, height_req=0.75, width_req=65)
elif chr(c) == '>': elif chr(c) == '>':
if self.sort_column == 2: if self.sort_column == "date":
self.reverse_sort = not self.reverse_sort self.reverse_sort = not self.reverse_sort
else: else:
self.sort_column = 2 self.sort_column = "date"
self.reverse_sort = True self.reverse_sort = True
self.__sort_rows() self.__sort_rows()
elif chr(c) == '<': elif chr(c) == '<':
if self.sort_column == 0: if self.sort_column == "name":
self.reverse_sort = not self.reverse_sort self.reverse_sort = not self.reverse_sort
else: else:
self.sort_column = 0 self.sort_column = "name"
self.reverse_sort = False self.reverse_sort = False
self.__sort_rows() self.__sort_rows()
elif chr(c) == 'm': elif chr(c) == 'm':

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

@ -191,8 +191,11 @@ DEFAULT_PREFS = {
"ring_bell": False, "ring_bell": False,
"save_legacy_history": True, "save_legacy_history": True,
"first_run": True, "first_run": True,
"addtorrents_show_misc_files": False, "addtorrents_show_misc_files": False, #TODO: Showing/hiding this
"addtorrents_show_hidden_folders": False "addtorrents_show_hidden_folders": False, #TODO: Showing/hiding this
"addtorrents_sort_column": "date",
"addtorrents_reverse_sort": True,
"addtorrents_last_path": "~"
} }
column_pref_names = ["queue","name","size","state", column_pref_names = ["queue","name","size","state",