Skip to content

Commit

Permalink
Merge branch 'mealie-next' into fix/better-scraper-image-parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
Kuchenpirat authored Dec 11, 2023
2 parents c07e0c3 + a6ec488 commit 695b1d5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [
3000,
9000
9000,
24678 // used by nuxt when hot-reloading using polling
],
// Use 'onCreateCommand' to run commands at the end of container creation.
// Use 'postCreateCommand' to run commands after the container is created.
Expand Down
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"webp"
],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
"source.organizeImports": false
"source.fixAll.eslint": "explicit",
"source.organizeImports": "never"
},
"editor.formatOnSave": true,
"eslint.workingDirectories": [
Expand Down
4 changes: 2 additions & 2 deletions frontend/pages/admin/site-settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ interface CheckApp extends CheckAppConfig {
}
export default defineComponent({
components: { AppLoader },
layout: "admin",
setup() {
// ==========================================================
Expand Down Expand Up @@ -465,8 +466,7 @@ export default defineComponent({
return {
title: this.$t("settings.site-settings") as string,
};
},
components: { AppLoader }
}
});
</script>

Expand Down
6 changes: 1 addition & 5 deletions mealie/services/scraper/scraper_strategies.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,6 @@ async def parse(self):


class RecipeScraperOpenGraph(ABCScraperStrategy):
"""
Abstract class for all recipe parsers.
"""

async def get_html(self, url: str) -> str:
return await safe_scrape_html(url)

Expand Down Expand Up @@ -241,7 +237,7 @@ def og_fields(properties: list[tuple[str, str]], field_name: str) -> list[str]:
"recipeIngredient": ["Could not detect ingredients"],
"recipeInstructions": [{"text": "Could not detect instructions"}],
"slug": slugify(og_field(properties, "og:title")),
"orgURL": og_field(properties, "og:url"),
"orgURL": self.url,
"categories": [],
"tags": og_fields(properties, "og:article:tag"),
"dateAdded": None,
Expand Down

0 comments on commit 695b1d5

Please sign in to comment.