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

Improves the output to the user

Browse Source
This commit is contained in:
Trenton Holmes 2022-05-05 09:17:51 -07:00
parent dd4d903f69
commit c907d690b7
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/documents/management/commands/document_importer.py
View File

@ -70,13 +70,13 @@ class Command(BaseCommand):
if not os.access(self.source, os.R_OK): if not os.access(self.source, os.R_OK):
raise CommandError("That path doesn't appear to be readable") raise CommandError("That path doesn't appear to be readable")
manifest_path = os.path.join(self.source, "manifest.json") manifest_path = os.path.normpath(os.path.join(self.source, "manifest.json"))
self._check_manifest_exists(manifest_path) self._check_manifest_exists(manifest_path)
with open(manifest_path) as f: with open(manifest_path) as f:
self.manifest = json.load(f) self.manifest = json.load(f)
version_path = os.path.join(self.source, "version.json") version_path = os.path.normpath(os.path.join(self.source, "version.json"))
if os.path.exists(version_path): if os.path.exists(version_path):
with open(version_path) as f: with open(version_path) as f:
self.version = json.load(f)["version"] self.version = json.load(f)["version"]
@ -91,7 +91,7 @@ class Command(BaseCommand):
) )
else: else:
self.stdout.write(self.style.WARNING("No version.json file located")) self.stdout.write(self.style.NOTICE("No version.json file located"))
self._check_manifest() self._check_manifest()
with disable_signal( with disable_signal(
@ -108,17 +108,24 @@ class Command(BaseCommand):
try: try:
call_command("loaddata", manifest_path) call_command("loaddata", manifest_path)
except (FieldDoesNotExist, DeserializationError) as e: except (FieldDoesNotExist, DeserializationError) as e:
self.stdout.write(self.style.ERROR("Database import failed"))
if ( if (
self.version is not None self.version is not None
and self.version != version.__full_version_str__ and self.version != version.__full_version_str__
): ):
raise CommandError( self.stdout.write(
"Error loading database, version mismatch. " self.style.ERROR(
f"Currently {version.__full_version_str__}," "Version mismatch: "
f" importing {self.version}", f"Currently {version.__full_version_str__},"
) from e f" importing {self.version}",
),
)
raise e
else: else:
raise CommandError("Error loading database") from e self.stdout.write(
self.style.ERROR("No version information present"),
)
raise e
self._import_files_from_manifest(options["no_progress_bar"]) self._import_files_from_manifest(options["no_progress_bar"])