]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Prefer the metadata JSON file over the version JSON file (#7048)
authorTrenton H <797416+stumpylog@users.noreply.github.com>
Thu, 20 Jun 2024 19:49:54 +0000 (12:49 -0700)
committerGitHub <noreply@github.com>
Thu, 20 Jun 2024 19:49:54 +0000 (12:49 -0700)
src/documents/management/commands/document_importer.py

index 97b73b743acb5f24e346907be6bb3c456500b376..3535e1476373ffaadca92a918fac3fddde318e48 100644 (file)
@@ -166,10 +166,7 @@ class Command(CryptMixin, BaseCommand):
             )
             return
 
-        if version_path.exists():
-            with version_path.open() as infile:
-                self.version = json.load(infile)["version"]
-        elif metadata_path.exists():
+        if metadata_path.exists():
             with metadata_path.open() as infile:
                 data = json.load(infile)
                 self.version = data["version"]
@@ -179,6 +176,9 @@ class Command(CryptMixin, BaseCommand):
                     )
                 elif EXPORTER_CRYPTO_SETTINGS_NAME in 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__:
             self.stdout.write(