From a9238995ce64a3b55e4a7cf6a4922cad45ed9cdd Mon Sep 17 00:00:00 2001 From: Martijn Voncken Date: Mon, 24 Mar 2008 22:02:27 +0000 Subject: [PATCH] reduce code in /index --- deluge/ui/webui/pages.py | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/deluge/ui/webui/pages.py b/deluge/ui/webui/pages.py index 8588ad696..a4b90f259 100644 --- a/deluge/ui/webui/pages.py +++ b/deluge/ui/webui/pages.py @@ -127,31 +127,22 @@ class index: @deco.deluge_page @deco.auto_refreshed def GET(self, name): - vars = web.input(sort=None, order=None ,state=None , tracker=None,keyword=None) + vars = web.input(sort=None, order=None) organize_filters = {} if 'Organize' in proxy.get_enabled_plugins(): filter_dict = {} + #organize-filters - #todo: DRY (in less lines of code) - if vars.state: - filter_dict['state'] = vars.state - setcookie("state", vars.state) - else: - setcookie("filter", "") - - if vars.tracker: - filter_dict['tracker'] = vars.tracker - setcookie("tracker", vars.tracker) - else: - setcookie("tracker", "") - - if vars.keyword: - filter_dict['keyword'] = vars.keyword - setcookie("keyword", vars.keyword) - else: - setcookie("keyword", "") + for filter_name in ["state","tracker","keyword"]: + value = getattr(web.input(**{filter_name:None}), filter_name) + if value and value <> "All": + filter_dict[filter_name] = value + setcookie(filter_name, vars.state) + else: + setcookie(filter_name, "") + log.debug(filter_dict) torrent_ids = proxy.organize_get_session_state(filter_dict) organize_filters = Storage(proxy.organize_all_filter_items()) @@ -174,6 +165,7 @@ class index: setcookie("sort", vars.sort) return render.index(torrent_list, organize_filters) + class torrent_info: @deco.deluge_page @deco.auto_refreshed