pre-commit stuff and and pytest updates

This commit is contained in:
Luxray5474 2020-08-23 23:25:09 -04:00
parent bb6f9bde68
commit 82bb9c63c8
7 changed files with 15 additions and 6 deletions

View file

@ -147,7 +147,7 @@ class Post extends events.EventTarget {
}
set fileLastModifiedTime(value) {
this._fileLastModifiedTime = value;
this._fileLastModifiedTime = value;
}
set flags(value) {

View file

@ -220,7 +220,6 @@ class PostUploadView extends events.EventTarget {
duplicatesFound++;
continue;
}
console.log(uploadable)
this._uploadables.push(uploadable);
this._emit("change");
this._renderRowNode(uploadable);

View file

@ -76,7 +76,6 @@ def create_post(
flags = ctx.get_param_as_string_list(
"flags", default=posts.get_default_flags(content)
)
file_last_modified_time = ctx.get_param_as_int("fileLastModifiedTime")
post, new_tags = posts.create_post(
content, tag_names, None if anonymous else ctx.user
@ -88,7 +87,10 @@ def create_post(
posts.update_post_relations(post, relations)
posts.update_post_notes(post, notes)
posts.update_post_flags(post, flags)
posts.update_post_file_last_modified_time(post, file_last_modified_time)
if ctx.has_param("fileLastModifiedTime"):
posts.update_post_file_last_modified_time(
post, ctx.get_as_param("file_last_modified_time")
)
if ctx.has_file("thumbnail"):
posts.update_post_thumbnail(post, ctx.get_file("thumbnail"))
ctx.session.add(post)

View file

@ -426,12 +426,15 @@ def create_post(
return post, new_tags
def update_post_file_last_modified_time(post: model.Post, timestamp: int) -> None:
def update_post_file_last_modified_time(
post: model.Post, timestamp: int
) -> None:
assert post
# Timestamp is in ms, so it must be divided by 1000 otherwise out of range
post.file_last_modified_time = datetime.fromtimestamp(timestamp / 1000)
def update_post_safety(post: model.Post, safety: str) -> None:
assert post
safety = util.flip(SAFETY_MAP).get(safety, None)

View file

@ -168,6 +168,7 @@ def post_factory():
post.flags = []
post.mime_type = "application/octet-stream"
post.creation_time = datetime(1996, 1, 1)
post.file_last_modified_time = datetime(1997, 1, 1)
return post
return factory

View file

@ -122,6 +122,7 @@ def test_serialize_post(
post.post_id = 1
post.creation_time = datetime(1997, 1, 1)
post.last_edit_time = datetime(1998, 1, 1)
post.file_last_modified_time = datetime(1999, 1, 1)
post.tags = [
tag_factory(
names=["tag1", "tag2"],
@ -215,6 +216,7 @@ def test_serialize_post(
"version": 1,
"creationTime": datetime(1997, 1, 1),
"lastEditTime": datetime(1998, 1, 1),
"fileLastModifiedTime": datetime(1999, 1, 1),
"safety": "safe",
"source": "4gag",
"type": "image",

View file

@ -24,6 +24,7 @@ def test_saving_post(post_factory, user_factory, tag_factory):
post.checksum = "deadbeef"
post.creation_time = datetime(1997, 1, 1)
post.last_edit_time = datetime(1998, 1, 1)
post.file_last_modified_time = datetime(1999, 1, 1)
post.mime_type = "application/whatever"
db.session.add_all([user, tag1, tag2, related_post1, related_post2, post])
@ -44,6 +45,7 @@ def test_saving_post(post_factory, user_factory, tag_factory):
assert post.checksum == "deadbeef"
assert post.creation_time == datetime(1997, 1, 1)
assert post.last_edit_time == datetime(1998, 1, 1)
assert post.file_last_modified_time == datetime(1999, 1, 1)
assert len(post.relations) == 2
# relation bidirectionality is realized on business level in func.posts
assert len(related_post1.relations) == 0