From e76b7ebe52f74dac95b5423de3243eca0891da76 Mon Sep 17 00:00:00 2001 From: Johnny Irvin Date: Wed, 14 Sep 2022 20:18:33 -0400 Subject: [PATCH 1/3] Use triple '.' not pass for protocols. --- website/models/entity.py | 2 +- website/repositories/repository.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/website/models/entity.py b/website/models/entity.py index 8741cf2..0433eac 100644 --- a/website/models/entity.py +++ b/website/models/entity.py @@ -29,4 +29,4 @@ def get_identifier(self) -> str | int: Returns: str | int: The identifier of the entity. """ - pass + ... diff --git a/website/repositories/repository.py b/website/repositories/repository.py index 2fb3db7..28ac98c 100644 --- a/website/repositories/repository.py +++ b/website/repositories/repository.py @@ -34,7 +34,7 @@ def create(self, model: Entity) -> Entity: Returns: Entity: The created entity. """ - pass + ... def update(self, identifier: str | int, model: Entity) -> Entity: """ @@ -47,7 +47,7 @@ def update(self, identifier: str | int, model: Entity) -> Entity: Returns: Entity: The updated entity. """ - pass + ... def delete(self, identifier: str | int) -> Entity: """ @@ -59,7 +59,7 @@ def delete(self, identifier: str | int) -> Entity: Returns: Entity: The deleted entity. """ - pass + ... def get(self, identifier: str | int) -> Entity: """ @@ -71,7 +71,7 @@ def get(self, identifier: str | int) -> Entity: Returns: Entity: The entity. """ - pass + ... def get_all(self) -> list: """ @@ -80,4 +80,4 @@ def get_all(self) -> list: Returns: list: The entities. """ - pass \ No newline at end of file + ... \ No newline at end of file From dcbdadb3d311a4d62132d8c7afa2780e98692a43 Mon Sep 17 00:00:00 2001 From: Johnny Irvin Date: Wed, 14 Sep 2022 20:28:34 -0400 Subject: [PATCH 2/3] Store image created time from filesystem. - Relates to #75 --- website/models/image.py | 5 ++++- website/repositories/image_repositories.py | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/website/models/image.py b/website/models/image.py index 5e0ab98..0a7bda8 100644 --- a/website/models/image.py +++ b/website/models/image.py @@ -18,14 +18,17 @@ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +import datetime +import io from dataclasses import dataclass import PIL.Image -import io + @dataclass class Image: title: str + created: datetime.datetime content: bytes @property diff --git a/website/repositories/image_repositories.py b/website/repositories/image_repositories.py index 2d9a3b7..5c3511f 100644 --- a/website/repositories/image_repositories.py +++ b/website/repositories/image_repositories.py @@ -18,6 +18,7 @@ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +import datetime import os import website.repositories.errors as errors @@ -59,8 +60,10 @@ def _load_images(self, directory: str) -> dict[str, Image]: with open(os.path.join(directory, file), 'rb') as f: content = f.read() + created = os.path.getctime(os.path.join(directory, file)) image = Image( title=file, + created=datetime.datetime.fromtimestamp(created), content=content, ) posts[image.get_identifier()] = image From af18cc2fdd3c59c4717a198c41173d8012527a0c Mon Sep 17 00:00:00 2001 From: Johnny Irvin Date: Wed, 14 Sep 2022 20:29:06 -0400 Subject: [PATCH 3/3] Sorts images by created time. - Closes #75 --- website/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/website/__init__.py b/website/__init__.py index 0072da2..6a54bf8 100644 --- a/website/__init__.py +++ b/website/__init__.py @@ -76,7 +76,10 @@ def images() -> str: """ return flask.render_template( 'images.pug', - images=image_repo.get_all() + images=sorted( + image_repo.get_all(), + key=lambda image: image.created + ) ) @app.route('/images/')