scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

server/search: prefer hyphens to underscores

Browse Source
This commit is contained in:
rr-
2016-04-09 08:58:06 +02:00
parent 3234da76ad
commit b6df2ed903
3 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/szurubooru/search/user_search_config.py
View File

@ -20,12 +20,12 @@ class UserSearchConfig(BaseSearchConfig):
def named_filters(self):
return {
'name': self._create_basic_filter(db.User.name, allow_ranged=False),
'creation_date': self._create_date_filter(db.User.creation_time),
'creation_time': self._create_date_filter(db.User.creation_time),
'last_login_date': self._create_date_filter(db.User.last_login_time),
'last_login_time': self._create_date_filter(db.User.last_login_time),
'login_date': self._create_date_filter(db.User.last_login_time),
'login_time': self._create_date_filter(db.User.last_login_time),
'creation-date': self._create_date_filter(db.User.creation_time),
'creation-time': self._create_date_filter(db.User.creation_time),
'last-login-date': self._create_date_filter(db.User.last_login_time),
'last-login-time': self._create_date_filter(db.User.last_login_time),
'login-date': self._create_date_filter(db.User.last_login_time),
'login-time': self._create_date_filter(db.User.last_login_time),
}
@property
@ -33,10 +33,10 @@ class UserSearchConfig(BaseSearchConfig):
return {
'random': func.random(),
'name': db.User.name,
'creation_date': db.User.creation_time,
'creation_time': db.User.creation_time,
'last_login_date': db.User.last_login_time,
'last_login_time': db.User.last_login_time,
'login_date': db.User.last_login_time,
'login_time': db.User.last_login_time,
'creation-date': db.User.creation_time,
'creation-time': db.User.creation_time,
'last-login-date': db.User.last_login_time,
'last-login-time': db.User.last_login_time,
'login-date': db.User.last_login_time,
'login-time': db.User.last_login_time,
}

18
server/szurubooru/tests/search/test_user_search_config.py
View File

@ -20,7 +20,7 @@ class TestUserSearchExecutor(DatabaseTestCase):
user1.creation_time = datetime(2014, 1, 1)
user2.creation_time = datetime(2015, 1, 1)
self.session.add_all([user1, user2])
for alias in ['creation_time', 'creation_date']:
for alias in ['creation-time', 'creation-date']:
self._test('%s:2014' % alias, 1, 1, ['u1'])
def test_filter_by_negated_creation_time(self):
@ -29,7 +29,7 @@ class TestUserSearchExecutor(DatabaseTestCase):
user1.creation_time = datetime(2014, 1, 1)
user2.creation_time = datetime(2015, 1, 1)
self.session.add_all([user1, user2])
for alias in ['creation_time', 'creation_date']:
for alias in ['creation-time', 'creation-date']:
self._test('-%s:2014' % alias, 1, 1, ['u2'])
def test_filter_by_ranged_creation_time(self):
@ -40,7 +40,7 @@ class TestUserSearchExecutor(DatabaseTestCase):
user2.creation_time = datetime(2014, 6, 1)
user3.creation_time = datetime(2015, 1, 1)
self.session.add_all([user1, user2, user3])
for alias in ['creation_time', 'creation_date']:
for alias in ['creation-time', 'creation-date']:
self._test('%s:2014..2014-06' % alias, 1, 2, ['u1', 'u2'])
self._test('%s:2014-06..2015-01-01' % alias, 1, 2, ['u2', 'u3'])
self._test('%s:2014-06..' % alias, 1, 2, ['u2', 'u3'])
@ -56,7 +56,7 @@ class TestUserSearchExecutor(DatabaseTestCase):
user2.creation_time = datetime(2014, 6, 1)
user3.creation_time = datetime(2015, 1, 1)
self.session.add_all([user1, user2, user3])
for alias in ['creation_time', 'creation_date']:
for alias in ['creation-time', 'creation-date']:
self._test('-%s:2014..2014-06' % alias, 1, 1, ['u3'])
self._test('-%s:2014-06..2015-01-01' % alias, 1, 1, ['u1'])
@ -68,7 +68,7 @@ class TestUserSearchExecutor(DatabaseTestCase):
user2.creation_time = datetime(2014, 6, 1)
user3.creation_time = datetime(2015, 1, 1)
self.session.add_all([user1, user2, user3])
for alias in ['creation_time', 'creation_date']:
for alias in ['creation-time', 'creation-date']:
self._test('%s:2014-01,2015' % alias, 1, 2, ['u1', 'u3'])
def test_filter_by_negated_composite_creation_time(self):
@ -79,7 +79,7 @@ class TestUserSearchExecutor(DatabaseTestCase):
user2.creation_time = datetime(2014, 6, 1)
user3.creation_time = datetime(2015, 1, 1)
self.session.add_all([user1, user2, user3])
for alias in ['creation_time', 'creation_date']:
for alias in ['creation-time', 'creation-date']:
self._test('-%s:2014-01,2015' % alias, 1, 1, ['u2'])
def test_filter_by_name(self):
@ -158,9 +158,9 @@ class TestUserSearchExecutor(DatabaseTestCase):
user2.creation_time = datetime(2014, 6, 1)
user3.creation_time = datetime(2015, 1, 1)
self.session.add_all([user1, user2, user3])
self._test('creation_time:2014 u1', 1, 1, ['u1'])
self._test('creation_time:2014 u2', 1, 1, ['u2'])
self._test('creation_time:2016 u2', 1, 0, [])
self._test('creation-time:2014 u1', 1, 1, ['u1'])
self._test('creation-time:2014 u2', 1, 1, ['u2'])
self._test('creation-time:2016 u2', 1, 0, [])
def test_special(self):
self.assertRaises(