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/info: add serverTime field

Browse Source
This commit is contained in:
rr-
2016-06-12 14:26:52 +02:00
parent 40565e82ae
commit 162904bfc3
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/szurubooru/api/info_api.py
View File

@ -20,6 +20,7 @@ class InfoApi(BaseApi):
'featuringTime': post_feature.time if post_feature else None,
'featuringUser': users.serialize_user(post_feature.user, ctx.user) \
if post_feature else None,
'serverTime': datetime.datetime.now(),
}
def _get_disk_usage(self):

10
server/szurubooru/tests/api/test_info.py
View File

@ -1,3 +1,4 @@
from datetime import datetime
from szurubooru import api, db
def test_info_api(
@ -7,28 +8,31 @@ def test_info_api(
config_injector({'data_dir': str(directory)})
db.session.add_all([post_factory(), post_factory()])
info_api = api.InfoApi()
with fake_datetime('13:00'):
with fake_datetime('2016-01-01 13:00'):
assert info_api.get(context_factory()) == {
'postCount': 2,
'diskUsage': 3,
'featuredPost': None,
'featuringTime': None,
'featuringUser': None,
'serverTime': datetime(2016, 1, 1, 13, 0),
}
directory.join('test2.txt').write('abc')
with fake_datetime('13:59'):
with fake_datetime('2016-01-01 13:59'):
assert info_api.get(context_factory()) == {
'postCount': 2,
'diskUsage': 3, # still 3 - it's cached
'featuredPost': None,
'featuringTime': None,
'featuringUser': None,
'serverTime': datetime(2016, 1, 1, 13, 59),
}
with fake_datetime('14:01'):
with fake_datetime('2016-01-01 14:01'):
assert info_api.get(context_factory()) == {
'postCount': 2,
'diskUsage': 6, # cache expired
'featuredPost': None,
'featuringTime': None,
'featuringUser': None,
'serverTime': datetime(2016, 1, 1, 14, 1),
}