PEP8 ish cleanup for search
This commit is contained in:
Dave Dash
Родитель
bb539e239b
Коммит
9f7d4cd593
|
|
@ -36,9 +36,11 @@ log = commonware.log.getLogger('z.sphinx')
|
|||
|
||||
|
||||
def extract_filters(term, kwargs):
|
||||
"""Pulls all the filtering options out of kwargs and the term and
|
||||
returns a cleaned term without said options and a dictionary of
|
||||
filter names and filter values."""
|
||||
"""
|
||||
Pulls all the filtering options out of kwargs and the term and returns a
|
||||
cleaned term without said options and a dictionary of filter names and
|
||||
filter values.
|
||||
"""
|
||||
|
||||
# Note: even though inactive is called disabled_by_user in
|
||||
# the model, this index is based on the db column.
|
||||
|
|
@ -140,12 +142,6 @@ def extract_filters(term, kwargs):
|
|||
else:
|
||||
metas['tag'] = -1
|
||||
|
||||
# TODO:
|
||||
# In the interest of having working code sooner than later, we're
|
||||
# skipping the following... for now:
|
||||
# * GUID filter
|
||||
# * Num apps filter
|
||||
|
||||
return (term, filters, excludes, ranges, metas)
|
||||
|
||||
|
||||
|
|
@ -171,8 +167,10 @@ class ResultSet(object):
|
|||
return iter(self.queryset)
|
||||
|
||||
def __getitem__(self, k):
|
||||
"""`queryset` doesn't contain all `total` items, just the items for the
|
||||
current page, so we need to adjust `k`"""
|
||||
"""
|
||||
`queryset` doesn't contain all `total` items, just the items for the
|
||||
current page, so we need to adjust `k`.
|
||||
"""
|
||||
if isinstance(k, slice) and k.start >= self.offset:
|
||||
k = slice(k.start - self.offset, k.stop - self.offset)
|
||||
elif isinstance(k, int):
|
||||
|
|
@ -375,7 +373,7 @@ class Client(object):
|
|||
|
||||
limit: limits the number of results.
|
||||
admin: if present we are in "admin" mode which lets you find addons
|
||||
without files and overrides any 'xenophobia' settings.
|
||||
without files.
|
||||
type: specifies an addon_type by id
|
||||
sort: specifies a specific sort mode. acceptable values are 'newest',
|
||||
'updated, 'name', 'averagerating' or 'weeklydownloads'. If no
|
||||
|
|
@ -383,7 +381,6 @@ class Client(object):
|
|||
'app': specifies which application_id to limit searches by
|
||||
'version': specifies which version of an app (as specified) that
|
||||
addons need to be compatble
|
||||
'xenophobia': restricts addons to the users own locale
|
||||
'locale': restricts addons to the specified locale
|
||||
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -20,7 +20,44 @@ CHARSET_DATA = """
|
|||
charset_type = utf-8
|
||||
charset_table = 0..9, U+41..U+5a->U+61..U+7a, U+61..U+7a, U+aa, U+b5, \
|
||||
U+ba, U+c0..U+d6->U+e0..U+f6, U+d8..U+de->U+f8..U+fe, U+df..U+f6, \
|
||||
U+f8..U+ff, U+100..U+12f/2, U+130->U+69, U+131, U+132..U+137/2, U+138, U+139..U+148/2, U+149, U+14a..U+177/2, U+178->U+ff, U+179..U+17e/2, U+17f..U+180, U+181->U+253, U+182..U+185/2, U+186->U+254, U+187..U+188/2, U+189..U+18a->U+256..U+257, U+18b..U+18c/2, U+18d, U+18e->U+1dd, U+18f->U+259, U+190->U+25b, U+191..U+192/2, U+193->U+260, U+194->U+263, U+195, U+196->U+269, U+197->U+268, U+198..U+199/2, U+19a..U+19b, U+19c->U+26f, U+19d->U+272, U+19e, U+19f->U+275, U+1a0..U+1a5/2, U+1a6->U+280, U+1a7..U+1a8/2, U+1a9->U+283, U+1aa..U+1ab, U+1ac..U+1ad/2, U+1ae->U+288, U+1af..U+1b0/2, U+1b1..U+1b2->U+28a..U+28b, U+1b3..U+1b6/2, U+1b7->U+292, U+1b8..U+1b9/2, U+1ba..U+1bb, U+1bc..U+1bd/2, U+1be..U+1c3, U+1c4->U+1c6, U+1c5..U+1c6/2, U+1c7->U+1c9, U+1c8..U+1c9/2, U+1ca->U+1cc, U+1cb..U+1dc/2, U+1dd, U+1de..U+1ef/2, U+1f0, U+1f1->U+1f3, U+1f2..U+1f5/2, U+1f6->U+195, U+1f7->U+1bf, U+1f8..U+21f/2, U+220->U+19e, U+221, U+222..U+233/2, U+234..U+23a, U+23b..U+23c/2, U+23d->U+19a, U+23e..U+240, U+241->U+294, U+250..U+2c1, U+2c6..U+2d1, U+2e0..U+2e4, U+2ee, U+37a, U+386..U+389->U+3ac..U+3af, U+38c..U+38e->U+3cc..U+3ce, U+390, U+391..U+3a1->U+3b1..U+3c1, U+3a3..U+3ab->U+3c3..U+3cb, U+3ac..U+3ce, U+3d0..U+3d7, U+3d8..U+3ef/2, U+3f0..U+3f3, U+3f4->U+3b8, U+3f5, U+3f7..U+3f8/2, U+3f9->U+3f2, U+3fa..U+3fb/2, U+3fc..U+3ff, U+400..U+40f->U+450..U+45f, U+410..U+42f->U+430..U+44f, U+430..U+45f, U+460..U+481/2, U+48a..U+4bf/2, U+4c0, U+4c1..U+4ce/2, U+4d0..U+4f9/2, U+500..U+50f/2, U+531..U+556->U+561..U+586, U+559, U+561..U+587, U+5d0..U+5ea, U+5f0..U+5f2, U+621..U+63a, U+640..U+64a, U+66e..U+66f, U+671..U+6d3, U+6d5, U+6e5..U+6e6, U+6ee..U+6ef, U+6fa..U+6fc, U+6ff, U+e01..U+e30, U+e32..U+e33, U+e40..U+e46, U+e81..U+e82, U+e84, U+e87..U+e88, U+e8a, U+e8d, U+e94..U+e97, U+e99..U+e9f, U+ea1..U+ea3, U+ea5, U+ea7, U+eaa..U+eab, U+ead..U+eb0, U+eb2..U+eb3, U+ebd, U+ec0..U+ec4, U+ec6, U+edc..U+edd, U+1000..U+1021, U+1023..U+1027, U+1029..U+102a, U+1050..U+1055, U+10a0..U+10c5->U+2d00..U+2d25, U+10d0..U+10fa, U+10fc, U+2d00..U+2d25, U+1d00..U+1dbf, U+1e00..U+1e95/2, U+1e96..U+1e9b, U+1ea0..U+1ef9/2, U+3005..U+3006, U+3031..U+3035, U+303b..U+303c, U+3041..U+3096, U+309d..U+309f, U+30a1..U+30fa, U+30fc..U+30ff, U+31f0..U+31ff
|
||||
U+f8..U+ff, U+100..U+12f/2, U+130->U+69, U+131, U+132..U+137/2, \
|
||||
U+138, U+139..U+148/2, U+149, U+14a..U+177/2, U+178->U+ff, \
|
||||
U+179..U+17e/2, U+17f..U+180, U+181->U+253, U+182..U+185/2, \
|
||||
U+186->U+254, U+187..U+188/2, U+189..U+18a->U+256..U+257, \
|
||||
U+18b..U+18c/2, U+18d, U+18e->U+1dd, U+18f->U+259, U+190->U+25b, \
|
||||
U+191..U+192/2, U+193->U+260, U+194->U+263, U+195, U+196->U+269, \
|
||||
U+197->U+268, U+198..U+199/2, U+19a..U+19b, U+19c->U+26f, \
|
||||
U+19d->U+272, U+19e, U+19f->U+275, U+1a0..U+1a5/2, \
|
||||
U+1a6->U+280, U+1a7..U+1a8/2, U+1a9->U+283, U+1aa..U+1ab, \
|
||||
U+1ac..U+1ad/2, U+1ae->U+288, U+1af..U+1b0/2, \
|
||||
U+1b1..U+1b2->U+28a..U+28b, U+1b3..U+1b6/2, U+1b7->U+292, \
|
||||
U+1b8..U+1b9/2, U+1ba..U+1bb, U+1bc..U+1bd/2, U+1be..U+1c3, \
|
||||
U+1c4->U+1c6, U+1c5..U+1c6/2, U+1c7->U+1c9, U+1c8..U+1c9/2, \
|
||||
U+1ca->U+1cc, U+1cb..U+1dc/2, U+1dd, U+1de..U+1ef/2, U+1f0, \
|
||||
U+1f1->U+1f3, U+1f2..U+1f5/2, U+1f6->U+195, U+1f7->U+1bf, \
|
||||
U+1f8..U+21f/2, U+220->U+19e, U+221, U+222..U+233/2, \
|
||||
U+234..U+23a, U+23b..U+23c/2, U+23d->U+19a, U+23e..U+240, \
|
||||
U+241->U+294, U+250..U+2c1, U+2c6..U+2d1, U+2e0..U+2e4, U+2ee, \
|
||||
U+37a, U+386..U+389->U+3ac..U+3af, U+38c..U+38e->U+3cc..U+3ce, \
|
||||
U+390, U+391..U+3a1->U+3b1..U+3c1, U+3a3..U+3ab->U+3c3..U+3cb, \
|
||||
U+3ac..U+3ce, U+3d0..U+3d7, U+3d8..U+3ef/2, U+3f0..U+3f3, \
|
||||
U+3f4->U+3b8, U+3f5, U+3f7..U+3f8/2, U+3f9->U+3f2, \
|
||||
U+3fa..U+3fb/2, U+3fc..U+3ff, U+400..U+40f->U+450..U+45f, \
|
||||
U+410..U+42f->U+430..U+44f, U+430..U+45f, U+460..U+481/2, \
|
||||
U+48a..U+4bf/2, U+4c0, U+4c1..U+4ce/2, U+4d0..U+4f9/2, \
|
||||
U+500..U+50f/2, U+531..U+556->U+561..U+586, U+559, U+561..U+587, \
|
||||
U+5d0..U+5ea, U+5f0..U+5f2, U+621..U+63a, U+640..U+64a, \
|
||||
U+66e..U+66f, U+671..U+6d3, U+6d5, U+6e5..U+6e6, U+6ee..U+6ef, \
|
||||
U+6fa..U+6fc, U+6ff, U+e01..U+e30, U+e32..U+e33, U+e40..U+e46, \
|
||||
U+e81..U+e82, U+e84, U+e87..U+e88, U+e8a, U+e8d, U+e94..U+e97, \
|
||||
U+e99..U+e9f, U+ea1..U+ea3, U+ea5, U+ea7, U+eaa..U+eab, \
|
||||
U+ead..U+eb0, U+eb2..U+eb3, U+ebd, U+ec0..U+ec4, U+ec6, \
|
||||
U+edc..U+edd, U+1000..U+1021, U+1023..U+1027, U+1029..U+102a, \
|
||||
U+1050..U+1055, U+10a0..U+10c5->U+2d00..U+2d25, U+10d0..U+10fa, \
|
||||
U+10fc, U+2d00..U+2d25, U+1d00..U+1dbf, U+1e00..U+1e95/2, \
|
||||
U+1e96..U+1e9b, U+1ea0..U+1ef9/2, U+3005..U+3006, U+3031..U+3035, \
|
||||
U+303b..U+303c, U+3041..U+3096, U+309d..U+309f, U+30a1..U+30fa, \
|
||||
U+30fc..U+30ff, U+31f0..U+31ff
|
||||
ngram_chars = U+3400..U+4DB5, U+4E00..U+9FA5, U+20000..U+2A6D6
|
||||
ngram_len = 1
|
||||
"""
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче