diff --git a/.env b/.env index 6edee4dd4..311c5cd47 100644 --- a/.env +++ b/.env @@ -3,6 +3,6 @@ PLATFORMS=linux/amd64,linux/arm64,linux/armhf BUILDER_VERSION=impish_2 WHEEL_BUILDER_VERSION=python3.10.1-alpine3.15_1.0.0 RUNNABLE_BASE_VERSION=python3.10.1-alpine3.15_0_0 -PKG_VERSION=0.7.1 +PKG_VERSION=0.7.2 PUID=501 PGID=20 diff --git a/NEWS.md b/NEWS.md index 988230d65..0dd9fd4ab 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,9 @@ # 📰 Codex News +## v0.7.2 + +- Fix another integrity check bug + ## v0.7.1 - Fix and integrity check crash that happened with an older databases. diff --git a/build.Dockerfile b/build.Dockerfile index da17dcddb..bdd48dd69 100644 --- a/build.Dockerfile +++ b/build.Dockerfile @@ -13,6 +13,7 @@ WORKDIR /app COPY pyproject.toml poetry.lock /app/ RUN poetry install --no-root --remove-untracked +# hadolint ignore=DL3059 RUN echo "**** install npm app dependencies ****" COPY frontend/package.json frontend/package-lock.json /app/frontend/ WORKDIR /app/frontend diff --git a/codex/integrity.py b/codex/integrity.py index 48be81ada..8d445d310 100644 --- a/codex/integrity.py +++ b/codex/integrity.py @@ -174,9 +174,7 @@ def _find_fk_integrity_errors_with_models( inner_qs = fk_model.objects.all() exclude_filter = {f"{fk_field_name}__in": inner_qs} invalid_host_objs = host_model.objects.exclude(**exclude_filter) - if ( - host_model.__name__ == "Folder" and fk_field_name == "parent_folder" - ) or fk_field_name == "role": + if fk_field_name in ("parent_folder", "role"): # Special fields can be null # THIS IS VERY IMPORTANT TO AVOID DELETING ALL TOP LEVEL FOLDERS not_null_filter = {f"{fk_field_name}__isnull": False} diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 4d565d485..6696a0df2 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "codex", - "version": "0.7.1", + "version": "0.7.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "codex", - "version": "0.7.1", + "version": "0.7.2", "dependencies": { "axios": "^0.24.0", "core-js": "^3.19", diff --git a/frontend/package.json b/frontend/package.json index d48be81f4..c0012d6cf 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "codex", - "version": "0.7.1", + "version": "0.7.2", "private": true, "description": "ui for codex api", "scripts": { diff --git a/pyproject.toml b/pyproject.toml index 01da6bf33..1a628f43f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = ["poetry.core.masonry.api"] [tool.poetry] name = "codex" -version = "0.7.1" +version = "0.7.2" description = "A comic archive web server." license = "GPL-2.0-only" authors = ["AJ Slater "]