add url param

This commit is contained in:
hay-kot 2021-05-08 17:23:14 -08:00
commit 34fd57d576
2 changed files with 6 additions and 3 deletions

View file

@ -95,6 +95,7 @@ def determine_sqlite_path(path=False, suffix=DB_VERSION) -> str:
class AppSettings(BaseSettings): class AppSettings(BaseSettings):
global DATA_DIR global DATA_DIR
PRODUCTION: bool = Field(True, env="PRODUCTION") PRODUCTION: bool = Field(True, env="PRODUCTION")
BASE_URL: str = "http://localhost:8080"
IS_DEMO: bool = False IS_DEMO: bool = False
API_PORT: int = 9000 API_PORT: int = 9000
API_DOCS: bool = True API_DOCS: bool = True

View file

@ -2,11 +2,13 @@ from shutil import copyfileobj
from fastapi import APIRouter, BackgroundTasks, Depends, File, Form, HTTPException, status from fastapi import APIRouter, BackgroundTasks, Depends, File, Form, HTTPException, status
from fastapi.datastructures import UploadFile from fastapi.datastructures import UploadFile
from mealie.core.config import settings
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, RecipeAsset, RecipeURLIn from mealie.schema.recipe import Recipe, RecipeAsset, RecipeURLIn
from mealie.schema.user import UserInDB
from mealie.services.events import create_recipe_event from mealie.services.events import create_recipe_event
from mealie.services.image.image import scrape_image, write_image from mealie.services.image.image import scrape_image, write_image
from mealie.services.recipe.media import check_assets, delete_assets from mealie.services.recipe.media import check_assets, delete_assets
@ -31,7 +33,7 @@ def create_from_json(
background_tasks.add_task( background_tasks.add_task(
create_recipe_event, create_recipe_event,
"Recipe Created (URL)", "Recipe Created (URL)",
f"'{recipe.name}' by {current_user.full_name}", f"'{recipe.name}' by {current_user.full_name} \n {settings.BASE_URL}/recipe/{recipe.slug}",
session=session, session=session,
attachment=recipe.image_dir.joinpath("min-original.webp"), attachment=recipe.image_dir.joinpath("min-original.webp"),
) )
@ -44,7 +46,7 @@ def parse_recipe_url(
background_tasks: BackgroundTasks, background_tasks: BackgroundTasks,
url: RecipeURLIn, url: RecipeURLIn,
session: Session = Depends(generate_session), session: Session = Depends(generate_session),
current_user=Depends(get_current_user), current_user: UserInDB = Depends(get_current_user),
): ):
""" Takes in a URL and attempts to scrape data and load it into the database """ """ Takes in a URL and attempts to scrape data and load it into the database """
@ -54,7 +56,7 @@ def parse_recipe_url(
background_tasks.add_task( background_tasks.add_task(
create_recipe_event, create_recipe_event,
"Recipe Created (URL)", "Recipe Created (URL)",
f"'{recipe.name}' by {current_user.full_name}", f"'{recipe.name}' by {current_user.full_name} \n {settings.BASE_URL}/recipe/{recipe.slug}",
session=session, session=session,
attachment=recipe.image_dir.joinpath("min-original.webp"), attachment=recipe.image_dir.joinpath("min-original.webp"),
) )