Author: andar
Revision: 5186
Log:
Remove mapping.py
Diff:
Deleted: trunk/deluge/ui/console/mapping.py
===================================================================
--- trunk/deluge/ui/console/mapping.py 2009-04-27 17:43:42 UTC (rev 5185)
+++ trunk/deluge/ui/console/mapping.py 2009-04-27 18:04:20 UTC (rev 5186)
@@ -1,77 +0,0 @@
-#!/usr/bin/env python
-#
-# mapping.py
-#
-# Copyright (C) 2008-2009 Ido Abramovich <[email protected]>
-#
-# Deluge is free software.
-#
-# You may redistribute it and/or modify it under the terms of the
-# GNU General Public License, as published by the Free Software
-# Foundation; either version 3 of the License, or (at your option)
-# any later version.
-#
-# deluge is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with deluge. If not, write to:
-# The Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor
-# Boston, MA 02110-1301, USA.
-#
-from deluge.ui.client import client
-from deluge.ui.console.main import match_torrents
-import re
-import logging
-from twisted.internet import defer
-
-_idregex = re.compile(r'^[0-9a-f]{40}$')
-
-_mapping = {}
-
-def _arg_is_id(arg):
- return bool(_idregex.match(arg))
-
-def get_names(torrents):
- d = defer.Deferred()
- def _got_torrents_status(states):
- try:
- d.callback(list([ (tid, state['name']) for (tid, state) in
states.items() ]))
- except Exception, e:
- print e
- d.errback(e)
-
- client.core.get_torrents_status({'id':torrents},
['name']).addCallback(_got_torrents_status)
- return d
-
-def rehash():
- global _mapping
- d = defer.Deferred()
- def on_match_torrents(torrents):
- def on_get_names(names):
- _mapping = dict([(x[1],x[0]) for x in names])
- d.callback()
- get_names(torrents).addCallback(on_get_names)
- match_torrents().addCallback(on_match_torrents)
- return d
-
-def to_ids(args):
- d = defer.Deferred()
- def on_rehash(result):
- res = []
- for i in args:
- if _arg_is_id(i):
- res.append(i)
- else:
- if i in _mapping:
- res.append(_mapping[i])
- d.callback(res)
- rehash().addCallback(on_rehash)
-
- return d
-
-def names():
- return _mapping.keys()
Modified: trunk/deluge/ui/console/screen.py
===================================================================
--- trunk/deluge/ui/console/screen.py 2009-04-27 17:43:42 UTC (rev 5185)
+++ trunk/deluge/ui/console/screen.py 2009-04-27 18:04:20 UTC (rev 5186)
@@ -327,8 +327,9 @@
# Scrolling through buffer
elif c == curses.KEY_PPAGE:
self.display_lines_offset += self.rows - 3
- if self.display_lines_offset > (len(self.lines) - 1 - self.rows -
3):
- self.display_lines_offset = len(self.lines) - 1 - self.rows - 3
+ # We substract 3 for the unavailable lines and 1 extra due to
len(self.lines)
+ if self.display_lines_offset > (len(self.lines) - 4 - self.rows):
+ self.display_lines_offset = len(self.lines) - 4 - self.rows
self.refresh()
elif c == curses.KEY_NPAGE:
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
