Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2014-03-09 08:03:24 +05:30
parent 1f2aa8a55b
commit 158c33481e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/utils/matcher.py
View File

@ -111,19 +111,20 @@ class Matcher(object):
raise Exception('Failed to score items: %s' % error) raise Exception('Failed to score items: %s' % error)
items = sorted(((-scores[i], item, positions[i]) for i, item in enumerate(self.items)), items = sorted(((-scores[i], item, positions[i]) for i, item in enumerate(self.items)),
key=itemgetter(0)) key=itemgetter(0))
return OrderedDict(x[1:] for x in items) return OrderedDict(x[1:] for x in filter(itemgetter(0), items))
def get_items_from_dir(basedir): def get_items_from_dir(basedir, acceptq=lambda x: True):
if isinstance(basedir, bytes): if isinstance(basedir, bytes):
basedir = basedir.decode(filesystem_encoding) basedir = basedir.decode(filesystem_encoding)
relsep = os.sep != '/' relsep = os.sep != '/'
for dirpath, dirnames, filenames in os.walk(basedir): for dirpath, dirnames, filenames in os.walk(basedir):
for f in filenames: for f in filenames:
x = os.path.join(dirpath, f) x = os.path.join(dirpath, f)
x = os.path.relpath(x, basedir) if acceptq(x):
if relsep: x = os.path.relpath(x, basedir)
x = x.replace(os.sep, '/') if relsep:
yield x x = x.replace(os.sep, '/')
yield x
class FilesystemMatcher(Matcher): class FilesystemMatcher(Matcher):