This commit is contained in:
hay-kot 2021-04-29 18:07:08 -08:00
commit fa14c1f24b
13 changed files with 13 additions and 21 deletions

View file

@ -1,6 +1,6 @@
[flake8] [flake8]
ignore = [ ignore = [
E501 # Line Length - See Black Config in pyproject.toml E501 # Line Length - See Black Config in pyproject.toml
E722 # Bare Exception | Temporary E402 # Import Not at Top of File
] ]
exclude = _all_models.py exclude = _all_models.py

View file

@ -1,17 +1,15 @@
import operator import operator
import shutil import shutil
from typing import Optional
from fastapi import APIRouter, Depends, File, HTTPException, UploadFile, status from fastapi import APIRouter, Depends, File, HTTPException, UploadFile, status
from mealie.core.config import app_dirs from mealie.core.config import app_dirs
from mealie.core.security import create_file_token from mealie.core.security import create_file_token
from mealie.db.db_setup import generate_session from mealie.db.db_setup import generate_session
from mealie.routes.deps import get_current_user, validate_file_token from mealie.routes.deps import get_current_user
from mealie.schema.backup import BackupJob, ImportJob, Imports, LocalBackup from mealie.schema.backup import BackupJob, ImportJob, Imports, LocalBackup
from mealie.services.backups import imports from mealie.services.backups import imports
from mealie.services.backups.exports import backup_all from mealie.services.backups.exports import backup_all
from sqlalchemy.orm.session import Session from sqlalchemy.orm.session import Session
from starlette.responses import FileResponse
router = APIRouter(prefix="/api/backups", tags=["Backups"], dependencies=[Depends(get_current_user)]) router = APIRouter(prefix="/api/backups", tags=["Backups"], dependencies=[Depends(get_current_user)])

View file

@ -1,5 +1,3 @@
import json
from fastapi import APIRouter, Depends from fastapi import APIRouter, Depends
from mealie.core.config import APP_VERSION, app_dirs, settings from mealie.core.config import APP_VERSION, app_dirs, settings
from mealie.core.root_logger import LOGGER_FILE from mealie.core.root_logger import LOGGER_FILE

View file

@ -9,6 +9,7 @@ from mealie.routes.deps import get_current_user
from mealie.schema.migration import MigrationFile, Migrations from mealie.schema.migration import MigrationFile, Migrations
from mealie.services.migrations import migration from mealie.services.migrations import migration
from sqlalchemy.orm.session import Session from sqlalchemy.orm.session import Session
from fastapi import HTTPException
router = APIRouter(prefix="/api/migrations", tags=["Migration"], dependencies=[Depends(get_current_user)]) router = APIRouter(prefix="/api/migrations", tags=["Migration"], dependencies=[Depends(get_current_user)])

View file

@ -1,14 +1,10 @@
from enum import Enum
from fastapi import APIRouter, Depends, File, Form, HTTPException, status from fastapi import APIRouter, Depends, File, Form, HTTPException, status
from fastapi.responses import FileResponse
from mealie.core.config import app_dirs
from mealie.core.root_logger import get_logger from mealie.core.root_logger import get_logger
from mealie.db.database import db from mealie.db.database import db
from mealie.db.db_setup import generate_session from mealie.db.db_setup import generate_session
from mealie.routes.deps import get_current_user from mealie.routes.deps import get_current_user
from mealie.schema.recipe import Recipe, RecipeURLIn from mealie.schema.recipe import Recipe, RecipeURLIn
from mealie.services.image.image import IMG_OPTIONS, delete_image, read_image, rename_image, scrape_image, write_image from mealie.services.image.image import delete_image, rename_image, scrape_image, write_image
from mealie.services.scraper.scraper import create_from_url from mealie.services.scraper.scraper import create_from_url
from sqlalchemy.orm.session import Session from sqlalchemy.orm.session import Session

View file

@ -1,4 +1,4 @@
from fastapi import APIRouter, Depends from fastapi import APIRouter, Depends, HTTPException, status
from mealie.db.database import db from mealie.db.database import db
from mealie.db.db_setup import generate_session from mealie.db.db_setup import generate_session
from mealie.routes.deps import get_current_user from mealie.routes.deps import get_current_user

View file

@ -1,5 +1,3 @@
from datetime import timedelta
from fastapi import APIRouter, Depends, status from fastapi import APIRouter, Depends, status
from fastapi.exceptions import HTTPException from fastapi.exceptions import HTTPException
from fastapi.security import OAuth2PasswordRequestForm from fastapi.security import OAuth2PasswordRequestForm

View file

@ -1,5 +1,4 @@
import shutil import shutil
from datetime import timedelta
from fastapi import APIRouter, Depends, File, UploadFile, status, HTTPException from fastapi import APIRouter, Depends, File, UploadFile, status, HTTPException
from fastapi.responses import FileResponse from fastapi.responses import FileResponse

View file

@ -8,6 +8,7 @@ from mealie.routes.deps import get_current_user
from mealie.schema.sign_up import SignUpIn, SignUpOut, SignUpToken from mealie.schema.sign_up import SignUpIn, SignUpOut, SignUpToken
from mealie.schema.user import UserIn, UserInDB from mealie.schema.user import UserIn, UserInDB
from sqlalchemy.orm.session import Session from sqlalchemy.orm.session import Session
from fastapi import HTTPException, status
router = APIRouter(prefix="/api/users/sign-ups", tags=["User Signup"]) router = APIRouter(prefix="/api/users/sign-ups", tags=["User Signup"])
@ -59,7 +60,7 @@ async def create_user_with_token(
# Create User # Create User
new_user.admin = db_entry.admin new_user.admin = db_entry.admin
new_user.password = get_password_hash(new_user.password) new_user.password = get_password_hash(new_user.password)
data = db.users.create(session, new_user.dict()) db.users.create(session, new_user.dict())
# DeleteToken # DeleteToken
db.sign_ups.delete(session, token) db.sign_ups.delete(session, token)

View file

@ -4,6 +4,7 @@ from typing import Optional
from fastapi import APIRouter, Depends from fastapi import APIRouter, Depends
from mealie.routes.deps import validate_file_token from mealie.routes.deps import validate_file_token
from starlette.responses import FileResponse from starlette.responses import FileResponse
from fastapi import HTTPException, status
router = APIRouter(prefix="/api/utils", tags=["Utils"], include_in_schema=True) router = APIRouter(prefix="/api/utils", tags=["Utils"], include_in_schema=True)

View file

@ -41,9 +41,9 @@ def minify_image(image_file: Path) -> ImageSizes:
if file.suffix != ".webp": if file.suffix != ".webp":
file.unlink() file.unlink()
org_dest = image_file.parent.joinpath(f"original.webp") org_dest = image_file.parent.joinpath("original.webp")
min_dest = image_file.parent.joinpath(f"min-original.webp") min_dest = image_file.parent.joinpath("min-original.webp")
tiny_dest = image_file.parent.joinpath(f"tiny-original.webp") tiny_dest = image_file.parent.joinpath("tiny-original.webp")
if min_dest.exists() and tiny_dest.exists() and org_dest.exists(): if min_dest.exists() and tiny_dest.exists() and org_dest.exists():
return return

View file

@ -8,7 +8,7 @@ from mealie.core import root_logger
from mealie.db.database import db from mealie.db.database import db
from mealie.schema.migration import MigrationImport from mealie.schema.migration import MigrationImport
from mealie.schema.recipe import Recipe from mealie.schema.recipe import Recipe
from mealie.services.image import image, minify from mealie.services.image import image
from mealie.services.scraper.cleaner import Cleaner from mealie.services.scraper.cleaner import Cleaner
from mealie.utils.unzip import unpack_zip from mealie.utils.unzip import unpack_zip
from pydantic import BaseModel from pydantic import BaseModel

View file

@ -1,6 +1,6 @@
from mealie.core.config import app_dirs, settings from mealie.core.config import app_dirs, settings
#! I don't like it either! # ! I don't like it either!
SQLITE_FILE = app_dirs.SQLITE_DIR.joinpath("test.db") SQLITE_FILE = app_dirs.SQLITE_DIR.joinpath("test.db")
SQLITE_FILE.unlink(missing_ok=True) SQLITE_FILE.unlink(missing_ok=True)