summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2014-12-17 21:20:55 +0100
committermathieui <mathieui@mathieui.net>2014-12-17 21:20:55 +0100
commit2bb4f45ed4b4e785c2843012e8fb2f9c62476402 (patch)
treee8b1308c3f649848f9c81115d4c899f0e16929ae /src
parent64ef02d5869fda37c8c2f133e6486f4b4988b798 (diff)
downloadpoezio-2bb4f45ed4b4e785c2843012e8fb2f9c62476402.tar.gz
poezio-2bb4f45ed4b4e785c2843012e8fb2f9c62476402.tar.bz2
poezio-2bb4f45ed4b4e785c2843012e8fb2f9c62476402.tar.xz
poezio-2bb4f45ed4b4e785c2843012e8fb2f9c62476402.zip
Fix the file (/import & /export) completion on the roster tab
Diffstat (limited to 'src')
-rw-r--r--src/tabs/rostertab.py44
1 files changed, 29 insertions, 15 deletions
diff --git a/src/tabs/rostertab.py b/src/tabs/rostertab.py
index 846ba327..084df3fd 100644
--- a/src/tabs/rostertab.py
+++ b/src/tabs/rostertab.py
@@ -16,6 +16,7 @@ import difflib
import os
import ssl
from os import getenv, path
+from functools import partial
from . import Tab
@@ -112,12 +113,12 @@ class RosterInfoTab(Tab):
usage=_('[/path/to/file]'),
desc=_('Export your contacts into /path/to/file if specified, or $HOME/poezio_contacts if not.'),
shortdesc=_('Export your roster to a file.'),
- completion=self.completion_file)
+ completion=partial(self.completion_file, 1))
self.register_command('import', self.command_import,
usage=_('[/path/to/file]'),
desc=_('Import your contacts from /path/to/file if specified, or $HOME/poezio_contacts if not.'),
shortdesc=_('Import your roster from a file.'),
- completion=self.completion_file)
+ completion=partial(self.completion_file, 1))
self.register_command('clear', self.command_clear,
shortdesc=_('Clear the info buffer.'))
self.register_command('last_activity', self.command_last_activity,
@@ -484,29 +485,42 @@ class RosterInfoTab(Tab):
not self.input.help_message:
self.complete_commands(self.input)
- def completion_file(self, the_input):
+ def completion_file(self, complete_number, the_input):
"""
- Completion for /import and /export
+ Generic quoted completion for files/paths
+ (use functools.partial to use directly as a completion
+ for a command)
"""
text = the_input.get_text()
- args = text.split()
- n = len(args)
- if n == 1:
- home = os.getenv('HOME') or '/'
- return the_input.auto_completion([home, '/tmp'], '')
- else:
- the_path = text[text.index(' ')+1:]
+ args = common.shell_split(text)
+ n = the_input.get_argument_position()
+ if n == complete_number:
+ if args[n-1] == '' or len(args) < n+1:
+ home = os.getenv('HOME') or '/'
+ return the_input.new_completion([home, '/tmp'], n, quotify=True)
+ path_ = args[n]
+ if path.isdir(path_):
+ dir_ = path_
+ base = ''
+ else:
+ dir_ = path.dirname(path_)
+ base = path.basename(path_)
try:
- names = os.listdir(the_path)
- except:
+ names = os.listdir(dir_)
+ except OSError:
names = []
+ names_filtered = [name for name in names if name.startswith(base)]
+ if names_filtered:
+ names = names_filtered
+ if not names:
+ names = [path_]
end_list = []
for name in names:
- value = os.path.join(the_path, name)
+ value = os.path.join(dir_, name)
if not name.startswith('.'):
end_list.append(value)
- return the_input.auto_completion(end_list, '')
+ return the_input.new_completion(end_list, n, quotify=True)
@command_args_parser.ignored
def command_clear(self):