paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvements for quality of life

Browse Source
This commit is contained in:
Trenton Holmes 2022-05-09 12:05:29 -07:00
parent a789649d97
commit 7cbb73be7a
No known key found for this signature in database
GPG Key ID: 4815A6E23A56B8D1
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-prepare.sh
View File

@ -52,7 +52,7 @@ search_index() {
if [[ (! -f "$index_version_file") || $(<$index_version_file) != "$index_version" ]]; then if [[ (! -f "$index_version_file") || $(<$index_version_file) != "$index_version" ]]; then
echo "Search index out of date. Updating..." echo "Search index out of date. Updating..."
python3 manage.py document_index reindex python3 manage.py document_index reindex --no-progress-bar
echo $index_version | tee $index_version_file >/dev/null echo $index_version | tee $index_version_file >/dev/null
fi fi
} }

12
src/documents/management/commands/document_consumer.py
View File

@ -28,8 +28,11 @@ def _tags_from_path(filepath):
"""Walk up the directory tree from filepath to CONSUMPTION_DIR """Walk up the directory tree from filepath to CONSUMPTION_DIR
and get or create Tag IDs for every directory. and get or create Tag IDs for every directory.
""" """
normalized_consumption_dir = os.path.abspath(
os.path.normpath(settings.CONSUMPTION_DIR),
)
tag_ids = set() tag_ids = set()
path_parts = Path(filepath).relative_to(settings.CONSUMPTION_DIR).parent.parts path_parts = Path(filepath).relative_to(normalized_consumption_dir).parent.parts
for part in path_parts: for part in path_parts:
tag_ids.add( tag_ids.add(
Tag.objects.get_or_create(name__iexact=part, defaults={"name": part})[0].pk, Tag.objects.get_or_create(name__iexact=part, defaults={"name": part})[0].pk,
@ -39,7 +42,10 @@ def _tags_from_path(filepath):
def _is_ignored(filepath: str) -> bool: def _is_ignored(filepath: str) -> bool:
filepath_relative = PurePath(filepath).relative_to(settings.CONSUMPTION_DIR) normalized_consumption_dir = os.path.abspath(
os.path.normpath(settings.CONSUMPTION_DIR),
)
filepath_relative = PurePath(filepath).relative_to(normalized_consumption_dir)
return any(filepath_relative.match(p) for p in settings.CONSUMER_IGNORE_PATTERNS) return any(filepath_relative.match(p) for p in settings.CONSUMER_IGNORE_PATTERNS)
@ -160,6 +166,8 @@ class Command(BaseCommand):
if not directory: if not directory:
raise CommandError("CONSUMPTION_DIR does not appear to be set.") raise CommandError("CONSUMPTION_DIR does not appear to be set.")
directory = os.path.abspath(directory)
if not os.path.isdir(directory): if not os.path.isdir(directory):
raise CommandError(f"Consumption directory {directory} does not exist") raise CommandError(f"Consumption directory {directory} does not exist")