Merge remote-tracking branch 'origin/dev' into feature-devcontainer
This commit is contained in:
commit
bee785316f
@ -364,7 +364,7 @@
|
|||||||
</pdf-viewer>
|
</pdf-viewer>
|
||||||
</div>
|
</div>
|
||||||
} @else {
|
} @else {
|
||||||
<object [data]="previewUrl | safeUrl" type="application/pdf" class="preview-sticky" width="100%"></object>
|
<object [data]="previewUrl | safeUrl" class="preview-sticky" width="100%"></object>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@case (ContentRenderType.Text) {
|
@case (ContentRenderType.Text) {
|
||||||
|
@ -166,10 +166,7 @@ class Command(CryptMixin, BaseCommand):
|
|||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
if version_path.exists():
|
if metadata_path.exists():
|
||||||
with version_path.open() as infile:
|
|
||||||
self.version = json.load(infile)["version"]
|
|
||||||
elif metadata_path.exists():
|
|
||||||
with metadata_path.open() as infile:
|
with metadata_path.open() as infile:
|
||||||
data = json.load(infile)
|
data = json.load(infile)
|
||||||
self.version = data["version"]
|
self.version = data["version"]
|
||||||
@ -179,6 +176,9 @@ class Command(CryptMixin, BaseCommand):
|
|||||||
)
|
)
|
||||||
elif EXPORTER_CRYPTO_SETTINGS_NAME in data:
|
elif EXPORTER_CRYPTO_SETTINGS_NAME in data:
|
||||||
self.load_crypt_params(data)
|
self.load_crypt_params(data)
|
||||||
|
elif version_path.exists():
|
||||||
|
with version_path.open() as infile:
|
||||||
|
self.version = json.load(infile)["version"]
|
||||||
|
|
||||||
if self.version and self.version != version.__full_version_str__:
|
if self.version and self.version != version.__full_version_str__:
|
||||||
self.stdout.write(
|
self.stdout.write(
|
||||||
|
@ -285,6 +285,10 @@ def update_document_archive_file(document_id):
|
|||||||
shutil.move(parser.get_archive_path(), document.archive_path)
|
shutil.move(parser.get_archive_path(), document.archive_path)
|
||||||
shutil.move(thumbnail, document.thumbnail_path)
|
shutil.move(thumbnail, document.thumbnail_path)
|
||||||
|
|
||||||
|
document.refresh_from_db()
|
||||||
|
logger.info(
|
||||||
|
f"Updating index for document {document_id} ({document.archive_checksum})",
|
||||||
|
)
|
||||||
with index.open_index_writer() as writer:
|
with index.open_index_writer() as writer:
|
||||||
index.update_document(writer, document)
|
index.update_document(writer, document)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user