rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Filter installed dictionaries using a regex to ensure correct name

Browse Source
This commit is contained in:
Michal Siedlaczek 2018-03-11 17:47:18 -04:00
parent 27c2650245
commit 29eadf7141
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qutebrowser/browser/webengine/spell.py
View File

@ -24,16 +24,14 @@ import os
import re import re
from PyQt5.QtCore import QLibraryInfo from PyQt5.QtCore import QLibraryInfo
from qutebrowser.utils import log from qutebrowser.utils import log, message
dict_version_re = re.compile(r".+-(?P<version>[0-9]+-[0-9]+?)\.bdic")
def version(filename): def version(filename):
"""Extract the version number from the dictionary file name.""" """Extract the version number from the dictionary file name."""
version_re = re.compile(r".+-(?P<version>[0-9]+-[0-9]+?)\.bdic") match = dict_version_re.match(filename)
match = version_re.fullmatch(filename)
if match is None:
raise ValueError('the given dictionary file name is malformed: {}'
.format(filename))
return tuple(int(n) for n in match.group('version').split('-')) return tuple(int(n) for n in match.group('version').split('-'))
@ -46,7 +44,7 @@ def dictionary_dir():
def local_files(code): def local_files(code):
"""Return all installed dictionaries for the given code.""" """Return all installed dictionaries for the given code."""
pathname = os.path.join(dictionary_dir(), '{}*.bdic'.format(code)) pathname = os.path.join(dictionary_dir(), '{}*.bdic'.format(code))
matching_dicts = glob.glob(pathname) matching_dicts = filter(dict_version_re.match, glob.glob(pathname))
files = [] files = []
for matching_dict in sorted(matching_dicts, key=version, reverse=True): for matching_dict in sorted(matching_dicts, key=version, reverse=True):
filename = os.path.basename(matching_dict) filename = os.path.basename(matching_dict)