ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server/posts: fix search by aspect ratio

Browse source 
It was being rounded to nearest integer because of the width/height
columns' data type.
This commit is contained in:
rr- 2017-02-05 23:20:00 +01:00
parent 49e5975254
commit ee6b66329b
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/szurubooru/model/post.py
View file

@ -205,7 +205,9 @@ class Post(Base):
.correlate_except(PostTag))
canvas_area = sa.orm.column_property(canvas_width * canvas_height)
canvas_aspect_ratio = sa.orm.column_property(canvas_width / canvas_height)
canvas_aspect_ratio = sa.orm.column_property(
sa.sql.expression.func.cast(canvas_width, sa.Float) /
sa.sql.expression.func.cast(canvas_height, sa.Float))
@property
def is_featured(self) -> bool:

8
server/szurubooru/tests/search/configs/test_post_search_config.py
View file

@ -431,23 +431,27 @@ def test_filter_by_file_size(
('image-area:90000', [3]),
('image-area:20000,90000', [1, 2, 3]),
('image-ar:1', [3]),
('image-ar:..0.9', [1]),
('image-ar:..0.9', [1, 4]),
('image-ar:1.1..', [2]),
('image-ar:1/1..1/1', [3]),
('image-ar:1:1..1:1', [3]),
('image-ar:0.62..0.63', [4]),
])
def test_filter_by_image_size(
verify_unpaged, post_factory, input, expected_post_ids):
post1 = post_factory(id=1)
post2 = post_factory(id=2)
post3 = post_factory(id=3)
post4 = post_factory(id=4)
post1.canvas_width = 100
post1.canvas_height = 200
post2.canvas_width = 200
post2.canvas_height = 100
post3.canvas_width = 300
post3.canvas_height = 300
db.session.add_all([post1, post2, post3])
post4.canvas_width = 480
post4.canvas_height = 767
db.session.add_all([post1, post2, post3, post4])
db.session.flush()
verify_unpaged(input, expected_post_ids)