From 4709e431b73b16b3c646897f185e6b1899347e26 Mon Sep 17 00:00:00 2001 From: Thomas Peetz Date: Wed, 23 Apr 2025 21:21:19 +0200 Subject: [PATCH] add schema from kontor-schema --- kontor-api/requirements.txt | 11 ------- kontor-api/src/kontor_api.egg-info/PKG-INFO | 18 ----------- .../src/kontor_api.egg-info/SOURCES.txt | 31 ------------------- .../kontor_api.egg-info/dependency_links.txt | 1 - .../src/kontor_api.egg-info/requires.txt | 12 ------- .../src/kontor_api.egg-info/top_level.txt | 5 --- kontor-api/src/schema/database.py | 5 +++ kontor-spring/Dockerfile | 2 +- 8 files changed, 6 insertions(+), 79 deletions(-) delete mode 100644 kontor-api/requirements.txt delete mode 100644 kontor-api/src/kontor_api.egg-info/PKG-INFO delete mode 100644 kontor-api/src/kontor_api.egg-info/SOURCES.txt delete mode 100644 kontor-api/src/kontor_api.egg-info/dependency_links.txt delete mode 100644 kontor-api/src/kontor_api.egg-info/requires.txt delete mode 100644 kontor-api/src/kontor_api.egg-info/top_level.txt diff --git a/kontor-api/requirements.txt b/kontor-api/requirements.txt deleted file mode 100644 index 551f12f..0000000 --- a/kontor-api/requirements.txt +++ /dev/null @@ -1,11 +0,0 @@ -mariadb -sqlalchemy -pathlib -platformdirs -pyyaml -beautifulsoup4 -sqlmodel -requests -fastapi[standard] -httpx==0.24.1 -pytest==7.4.0 diff --git a/kontor-api/src/kontor_api.egg-info/PKG-INFO b/kontor-api/src/kontor_api.egg-info/PKG-INFO deleted file mode 100644 index fa32716..0000000 --- a/kontor-api/src/kontor_api.egg-info/PKG-INFO +++ /dev/null @@ -1,18 +0,0 @@ -Metadata-Version: 2.4 -Name: kontor-api -Version: 0.1.0 -Summary: Add your description here -Requires-Python: >=3.13 -Description-Content-Type: text/markdown -Requires-Dist: beautifulsoup4>=4.13.4 -Requires-Dist: fastapi[standard]>=0.115.12 -Requires-Dist: httpx==0.24.1 -Requires-Dist: mariadb>=1.1.12 -Requires-Dist: pathlib>=1.0.1 -Requires-Dist: platformdirs>=4.3.7 -Requires-Dist: pytest==7.4.0 -Requires-Dist: pytest-cov>=6.1.1 -Requires-Dist: pyyaml>=6.0.2 -Requires-Dist: requests>=2.32.3 -Requires-Dist: sqlalchemy>=2.0.40 -Requires-Dist: sqlmodel>=0.0.24 diff --git a/kontor-api/src/kontor_api.egg-info/SOURCES.txt b/kontor-api/src/kontor_api.egg-info/SOURCES.txt deleted file mode 100644 index f0db090..0000000 --- a/kontor-api/src/kontor_api.egg-info/SOURCES.txt +++ /dev/null @@ -1,31 +0,0 @@ -README.md -pyproject.toml -src/__init__.py -src/main.py -src/kontor_api.egg-info/PKG-INFO -src/kontor_api.egg-info/SOURCES.txt -src/kontor_api.egg-info/dependency_links.txt -src/kontor_api.egg-info/requires.txt -src/kontor_api.egg-info/top_level.txt -src/models/__init__.py -src/models/comics/__init__.py -src/models/comics/artist.py -src/models/comics/comic.py -src/models/media/__init__.py -src/models/media/file.py -src/models/tysc/__init__.py -src/models/tysc/sport.py -src/routers/__init__.py -src/routers/comic.py -src/routers/media.py -src/routers/tysc.py -src/schema/__init__.py -src/schema/admin.py -src/schema/base.py -src/schema/bookshelf.py -src/schema/comic.py -src/schema/database.py -src/schema/media.py -src/schema/metadata.py -src/schema/tysc.py -tests/test_main.py \ No newline at end of file diff --git a/kontor-api/src/kontor_api.egg-info/dependency_links.txt b/kontor-api/src/kontor_api.egg-info/dependency_links.txt deleted file mode 100644 index 8b13789..0000000 --- a/kontor-api/src/kontor_api.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/kontor-api/src/kontor_api.egg-info/requires.txt b/kontor-api/src/kontor_api.egg-info/requires.txt deleted file mode 100644 index a638783..0000000 --- a/kontor-api/src/kontor_api.egg-info/requires.txt +++ /dev/null @@ -1,12 +0,0 @@ -beautifulsoup4>=4.13.4 -fastapi[standard]>=0.115.12 -httpx==0.24.1 -mariadb>=1.1.12 -pathlib>=1.0.1 -platformdirs>=4.3.7 -pytest==7.4.0 -pytest-cov>=6.1.1 -pyyaml>=6.0.2 -requests>=2.32.3 -sqlalchemy>=2.0.40 -sqlmodel>=0.0.24 diff --git a/kontor-api/src/kontor_api.egg-info/top_level.txt b/kontor-api/src/kontor_api.egg-info/top_level.txt deleted file mode 100644 index db2075f..0000000 --- a/kontor-api/src/kontor_api.egg-info/top_level.txt +++ /dev/null @@ -1,5 +0,0 @@ -__init__ -main -models -routers -schema diff --git a/kontor-api/src/schema/database.py b/kontor-api/src/schema/database.py index 54d3596..6e4bf16 100644 --- a/kontor-api/src/schema/database.py +++ b/kontor-api/src/schema/database.py @@ -334,8 +334,13 @@ class KontorDB: media_file.last_modified_date = datetime.now() media_file.version = 0 media_file.url = link +<<<<<<< HEAD media_file.review = 1 media_file.should_download = 1 +======= + media_file.review = True + media_file.should_download = True +>>>>>>> d9d178f (add schema from kontor-schema) try: session.add(media_file) session.commit() diff --git a/kontor-spring/Dockerfile b/kontor-spring/Dockerfile index 1ac7138..d4f3463 100644 --- a/kontor-spring/Dockerfile +++ b/kontor-spring/Dockerfile @@ -2,4 +2,4 @@ FROM alpine/java:21-jdk WORKDIR / ADD build/libs/kontor-spring-0.1.0-SNAPSHOT.jar app.jar EXPOSE 8000 -CMD java -jar -Dspring.profiles.active=prod -Dvaadin.productionMode=true app.jar +CMD ["java", "-jar", "-Dspring.profiles.active=prod", "-Dvaadin.productionMode=true", "app.jar"]