diff --git a/cookbook/helper/HelperFunctions.py b/cookbook/helper/HelperFunctions.py index e2971c2ed..94f46ee8c 100644 --- a/cookbook/helper/HelperFunctions.py +++ b/cookbook/helper/HelperFunctions.py @@ -7,7 +7,7 @@ class Round(Func): def str2bool(v): - if type(v) == bool or v is None: + if isinstance(v, bool) or v is None: return v else: return v.lower() in ("yes", "true", "1") diff --git a/cookbook/helper/recipe_search.py b/cookbook/helper/recipe_search.py index 2b70808e3..e3b0b506f 100644 --- a/cookbook/helper/recipe_search.py +++ b/cookbook/helper/recipe_search.py @@ -309,7 +309,7 @@ class RecipeSearch(): def _favorite_recipes(self, times_cooked=None): if self._sort_includes('favorite') or times_cooked: - less_than = '-' in (times_cooked or []) and not self._sort_includes('-favorite') + less_than = '-' in (str(times_cooked) or []) and not self._sort_includes('-favorite') if less_than: default = 1000 else: diff --git a/cookbook/templates/system.html b/cookbook/templates/system.html index 18e56fa75..e0efc107d 100644 --- a/cookbook/templates/system.html +++ b/cookbook/templates/system.html @@ -83,22 +83,50 @@ {% trans 'Everything is fine!' %} {% endif %} -

{% trans 'Database' %} {% if postgres %} - {% trans 'Info' %}{% else %}{% trans 'Ok' %}{% endif %}

- {% if postgres %} - {% blocktrans %} - This application is not running with a Postgres database backend. This is ok but not recommended as some - features only work with postgres databases. - {% endblocktrans %} - {% else %} +

{% trans 'Database' %} + + {% if postgres_status == 'warning' %} + {% trans 'Info' %} + {% elif postgres_status == 'danger'%} + {% trans 'Warning' %} + {% else %} + {% trans 'Ok' %} + {% endif %} + +

+ {{postgres_message}} + +

+ {% trans 'Orphaned Files' %} + + + {% if orphans|length == 0 %}{% trans 'Success' %} + {% elif orphans|length <= 25 %}{% trans 'Warning' %} + {% else %}{% trans 'Danger' %} + {% endif %} + +

+ + {% if orphans|length == 0 %} {% trans 'Everything is fine!' %} + {% else %} + {% blocktrans with orphan_count=orphans|length %} + There are currently {{ orphan_count }} orphaned files. + {% endblocktrans %} +
+ + {% endif %} +

Debug



-{% endblock %} \ No newline at end of file +
+ {% csrf_token %} + +
+{% block script %} + +{% endblock script %} +{% endblock %} + + diff --git a/cookbook/version_info.py b/cookbook/version_info.py index 65c435815..b3617f8a8 100644 --- a/cookbook/version_info.py +++ b/cookbook/version_info.py @@ -1,3 +1,3 @@ TANDOOR_VERSION = "" -TANDOOR_REF = "" -VERSION_INFO = [] +TANDOOR_REF = "abf8f791360b2bc4a5c7d011877668679bcbb3f2" +VERSION_INFO = [{'name': 'Tandoor ', 'version': "commit abf8f791360b2bc4a5c7d011877668679bcbb3f2\nMerge: 4723a7ec fd028047\nAuthor: vabene1111 \nDate: Sun Dec 3 14:10:28 2023 +0100\n\n Merge branch 'develop'\n \n # Conflicts:\n # docs/faq.md\n", 'website': 'https://github.com/TandoorRecipes/recipes', 'commit_link': 'https://github.com/TandoorRecipes/recipes/commit/abf8f791360b2bc4a5c7d011877668679bcbb3f2', 'ref': 'abf8f791360b2bc4a5c7d011877668679bcbb3f2', 'branch': 'HEAD', 'tag': ''}] \ No newline at end of file diff --git a/cookbook/views/views.py b/cookbook/views/views.py index 92c55789e..5cffb985e 100644 --- a/cookbook/views/views.py +++ b/cookbook/views/views.py @@ -3,12 +3,14 @@ import re from datetime import datetime from uuid import UUID +from django.apps import apps from django.conf import settings from django.contrib import messages from django.contrib.auth.decorators import login_required from django.contrib.auth.models import Group from django.contrib.auth.password_validation import validate_password from django.core.exceptions import ValidationError +from django.db import models from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse, reverse_lazy @@ -18,6 +20,7 @@ from django_scopes import scopes_disabled from cookbook.forms import (CommentForm, Recipe, SearchPreferenceForm, SpaceCreateForm, SpaceJoinForm, User, UserCreateForm, UserPreference) +from cookbook.helper.HelperFunctions import str2bool from cookbook.helper.permission_helper import (group_required, has_group_permission, share_link_valid, switch_user_active_space) from cookbook.models import (Comment, CookLog, InviteLink, SearchFields, SearchPreference, @@ -225,10 +228,10 @@ def shopping_settings(request): if not sp: sp = SearchPreferenceForm(user=request.user) fields_searched = ( - len(search_form.cleaned_data['icontains']) - + len(search_form.cleaned_data['istartswith']) - + len(search_form.cleaned_data['trigram']) - + len(search_form.cleaned_data['fulltext']) + len(search_form.cleaned_data['icontains']) + + len(search_form.cleaned_data['istartswith']) + + len(search_form.cleaned_data['trigram']) + + len(search_form.cleaned_data['fulltext']) ) if search_form.cleaned_data['preset'] == 'fuzzy': sp.search = SearchPreference.SIMPLE @@ -314,17 +317,48 @@ def system(request): if not request.user.is_superuser: return HttpResponseRedirect(reverse('index')) + postgres_ver = None postgres = settings.DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql' + if postgres: + postgres_current = 16 # will need to be updated as PostgreSQL releases new major versions + from decimal import Decimal + + from django.db import connection + + postgres_ver = Decimal(str(connection.pg_version).replace('00', '.')) + if postgres_ver >= postgres_current: + database_status = 'success' + database_message = _('Everything is fine!') + elif postgres_ver < postgres_current - 2: + database_status = 'danger' + database_message = _('PostgreSQL %(v)s is deprecated. Upgrade to a fully supported version!') % {'v': postgres_ver} + else: + database_status = 'info' + database_message = _('You are running PostgreSQL %(v1)s. PostgreSQL %(v2)s is recommended') % {'v1': postgres_ver, 'v2': postgres_current} + else: + database_status = 'info' + database_message = _('This application is not running with a Postgres database backend. This is ok but not recommended as some features only work with postgres databases.') + secret_key = False if os.getenv('SECRET_KEY') else True + if request.method == "POST": + del_orphans = request.POST.get('delete_orphans') + orphans = get_orphan_files(delete_orphans=str2bool(del_orphans)) + else: + orphans = get_orphan_files() + return render(request, 'system.html', { 'gunicorn_media': settings.GUNICORN_MEDIA, 'debug': settings.DEBUG, 'postgres': postgres, + 'postgres_version': postgres_ver, + 'postgres_status': database_status, + 'postgres_message': database_message, 'version_info': VERSION_INFO, 'plugins': PLUGINS, - 'secret_key': secret_key + 'secret_key': secret_key, + 'orphans': orphans }) @@ -448,3 +482,47 @@ def test(request): def test2(request): if not settings.DEBUG: return HttpResponseRedirect(reverse('index')) + + +def get_orphan_files(delete_orphans=False): + # Get list of all image files in media folder + media_dir = settings.MEDIA_ROOT + + def find_orphans(): + image_files = [] + for root, dirs, files in os.walk(media_dir): + for file in files: + + if not file.lower().endswith(('.db')) and not root.lower().endswith(('@eadir')): + full_path = os.path.join(root, file) + relative_path = os.path.relpath(full_path, media_dir) + image_files.append((relative_path, full_path)) + + # Get list of all image fields in models + image_fields = [] + for model in apps.get_models(): + for field in model._meta.get_fields(): + if isinstance(field, models.ImageField) or isinstance(field, models.FileField): + image_fields.append((model, field.name)) + + # get all images in the database + # TODO I don't know why, but this completely bypasses scope limitations + image_paths = [] + for model, field in image_fields: + image_field_paths = model.objects.values_list(field, flat=True) + image_paths.extend(image_field_paths) + + # Check each image file against model image fields + return [img for img in image_files if img[0] not in image_paths] + orphans = find_orphans() + if delete_orphans: + for f in [img[1] for img in orphans]: + try: + os.remove(f) + except FileNotFoundError: + print(f"File not found: {f}") + except Exception as e: + print(f"Error deleting file {f}: {e}") + orphans = find_orphans() + + return [img[1] for img in orphans] diff --git a/recipes/settings.py b/recipes/settings.py index 86739628f..273788eb4 100644 --- a/recipes/settings.py +++ b/recipes/settings.py @@ -438,7 +438,7 @@ for p in PLUGINS: if p['bundle_name'] != '': WEBPACK_LOADER[p['bundle_name']] = { 'CACHE': not DEBUG, - 'BUNDLE_DIR_NAME': f'vue/', # must end with slash + 'BUNDLE_DIR_NAME': 'vue/', # must end with slash 'STATS_FILE': os.path.join(p["base_path"], 'vue', 'webpack-stats.json'), 'POLL_INTERVAL': 0.1, 'TIMEOUT': None, diff --git a/version.py b/version.py index ae46b42eb..037e84d2d 100644 --- a/version.py +++ b/version.py @@ -13,12 +13,11 @@ tandoor_hash = '' try: print('getting tandoor version') r = subprocess.check_output(['git', 'show', '-s'], cwd=BASE_DIR).decode() - tandoor_branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], cwd=BASE_DIR).decode() + tandoor_branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], cwd=BASE_DIR).decode().replace('\n', '') tandoor_hash = r.split('\n')[0].split(' ')[1] try: - tandoor_tag = subprocess.check_output(['git', 'describe', '--exact-match', tandoor_hash], cwd=BASE_DIR).decode().replace('\n', '') - except: - + tandoor_tag = subprocess.check_output(['git', 'describe', '--exact-match', '--tags', tandoor_hash], cwd=BASE_DIR).decode().replace('\n', '') + except BaseException: pass version_info.append({ @@ -47,8 +46,9 @@ try: commit_hash = r.split('\n')[0].split(' ')[1] try: print('running describe') - tag = subprocess.check_output(['git', 'describe', '--exact-match', commit_hash], cwd=os.path.join(BASE_DIR, 'recipes', 'plugins', d)).decode().replace('\n', '') - except: + tag = subprocess.check_output(['git', 'describe', '--exact-match', commit_hash], + cwd=os.path.join(BASE_DIR, 'recipes', 'plugins', d)).decode().replace('\n', '') + except BaseException: tag = '' version_info.append({ @@ -66,7 +66,7 @@ try: traceback.print_exc() except subprocess.CalledProcessError as e: print("command '{}' return with error (code {}): {}".format(e.cmd, e.returncode, e.output)) -except: +except BaseException: traceback.print_exc() with open('cookbook/version_info.py', 'w+', encoding='UTF-8') as f: diff --git a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue index 6f0a901b7..2705b5e3d 100644 --- a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue +++ b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue @@ -1,6 +1,6 @@ @@ -642,38 +652,38 @@ contain anyall of the following books: {{ k.items.flatMap((x) => x.name).join(", ") }} -
+
- and you can make right now (based on the on hand flag)
+ and you can make right now (based on the on hand flag)
and contain anyall of the following units: {{ search.search_units.flatMap((x) => x.name).join(", ") }}
+ >
 and have a rating or equal to {{ search.search_rating }}
+ > or equal to {{ search.search_rating }}
 and have been last cooked {{ search.lastcooked }}
+ > {{ search.lastcooked }}
 and have been cooked or equal to{{ search.timescooked }} times
+ > or equal to{{ search.timescooked }} times
order by {{ search.sort_order.flatMap((x) => x.text).join(", ") }} -
+
@@ -709,19 +719,19 @@ {{ search.pagination_page }}/{{ Math.ceil(pagination_count / ui.page_size) }} {{ $t("Reset") }} + > {{ search.pagination_page }}/{{ Math.ceil(pagination_count / ui.page_size) }} {{ $t("Reset") }} {{ $t("Random") }} + > {{ $t("Random") }}
@@ -853,24 +863,23 @@