mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 03:56:23 -05:00 
			
		
		
		
	Reduces number of warnings from testing from 165 to 128. In doing so, fixes a few minor things in the decrypt and export commands
This commit is contained in:
		| @@ -59,8 +59,10 @@ class Command(BaseCommand): | ||||
|  | ||||
|             old_paths = [document.source_path, document.thumbnail_path] | ||||
|  | ||||
|             raw_document = GnuPG.decrypted(document.source_file, passphrase) | ||||
|             raw_thumb = GnuPG.decrypted(document.thumbnail_file, passphrase) | ||||
|             with document.source_file as file_handle: | ||||
|                 raw_document = GnuPG.decrypted(file_handle, passphrase) | ||||
|             with document.thumbnail_file as file_handle: | ||||
|                 raw_thumb = GnuPG.decrypted(file_handle, passphrase) | ||||
|  | ||||
|             document.storage_type = Document.STORAGE_TYPE_UNENCRYPTED | ||||
|  | ||||
|   | ||||
| @@ -199,19 +199,22 @@ class Command(BaseCommand): | ||||
|  | ||||
|                 os.makedirs(os.path.dirname(original_target), exist_ok=True) | ||||
|                 with open(original_target, "wb") as f: | ||||
|                     f.write(GnuPG.decrypted(document.source_file)) | ||||
|                     os.utime(original_target, times=(t, t)) | ||||
|                     with document.source_file as out_file: | ||||
|                         f.write(GnuPG.decrypted(out_file)) | ||||
|                         os.utime(original_target, times=(t, t)) | ||||
|  | ||||
|                 os.makedirs(os.path.dirname(thumbnail_target), exist_ok=True) | ||||
|                 with open(thumbnail_target, "wb") as f: | ||||
|                     f.write(GnuPG.decrypted(document.thumbnail_file)) | ||||
|                     os.utime(thumbnail_target, times=(t, t)) | ||||
|                     with document.thumbnail_file as out_file: | ||||
|                         f.write(GnuPG.decrypted(out_file)) | ||||
|                         os.utime(thumbnail_target, times=(t, t)) | ||||
|  | ||||
|                 if archive_target: | ||||
|                     os.makedirs(os.path.dirname(archive_target), exist_ok=True) | ||||
|                     with open(archive_target, "wb") as f: | ||||
|                         f.write(GnuPG.decrypted(document.archive_path)) | ||||
|                         os.utime(archive_target, times=(t, t)) | ||||
|                         with document.archive_path as out_file: | ||||
|                             f.write(GnuPG.decrypted(out_file)) | ||||
|                             os.utime(archive_target, times=(t, t)) | ||||
|             else: | ||||
|                 self.check_and_copy( | ||||
|                     document.source_path, document.checksum, original_target | ||||
|   | ||||
| @@ -61,6 +61,6 @@ class TestDocumentAdmin(DirectoriesMixin, TestCase): | ||||
|  | ||||
|     def test_created(self): | ||||
|         doc = Document.objects.create( | ||||
|             title="test", created=timezone.datetime(2020, 4, 12) | ||||
|             title="test", created=timezone.make_aware(timezone.datetime(2020, 4, 12)) | ||||
|         ) | ||||
|         self.assertEqual(self.doc_admin.created_(doc), "2020-04-12") | ||||
|   | ||||
| @@ -10,6 +10,7 @@ from unittest import mock | ||||
| import pytest | ||||
| from django.conf import settings | ||||
| from django.contrib.auth.models import User | ||||
| from django.utils import timezone | ||||
| from django.test import override_settings | ||||
| from rest_framework.test import APITestCase | ||||
| from whoosh.writing import AsyncWriter | ||||
| @@ -567,11 +568,15 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): | ||||
|         d3.tags.add(t) | ||||
|         d3.tags.add(t2) | ||||
|         d4 = Document.objects.create( | ||||
|             checksum="4", created=datetime.datetime(2020, 7, 13), content="test" | ||||
|             checksum="4", | ||||
|             created=timezone.datetime(2020, 7, 13), | ||||
|             content="test", | ||||
|         ) | ||||
|         d4.tags.add(t2) | ||||
|         d5 = Document.objects.create( | ||||
|             checksum="5", added=datetime.datetime(2020, 7, 13), content="test" | ||||
|             checksum="5", | ||||
|             added=timezone.datetime(2020, 7, 13), | ||||
|             content="test", | ||||
|         ) | ||||
|         d6 = Document.objects.create(checksum="6", content="test2") | ||||
|  | ||||
|   | ||||
| @@ -162,7 +162,7 @@ class TestMatching(TestCase): | ||||
|     def test_match_regex(self): | ||||
|  | ||||
|         self._test_matching( | ||||
|             "alpha\w+gamma", | ||||
|             r"alpha\w+gamma", | ||||
|             "MATCH_REGEX", | ||||
|             ( | ||||
|                 "I have alpha_and_gamma in me", | ||||
| @@ -181,7 +181,7 @@ class TestMatching(TestCase): | ||||
|         ) | ||||
|  | ||||
|     def test_tach_invalid_regex(self): | ||||
|         self._test_matching("[[", "MATCH_REGEX", [], ["Don't match this"]) | ||||
|         self._test_matching("[", "MATCH_REGEX", [], ["Don't match this"]) | ||||
|  | ||||
|     def test_match_fuzzy(self): | ||||
|  | ||||
|   | ||||
| @@ -121,7 +121,7 @@ class RasterisedDocumentParser(DocumentParser): | ||||
|             # TODO catch all for various issues with PDFminer.six. | ||||
|             #  If PDFminer fails, fall back to OCR. | ||||
|             self.log( | ||||
|                 "warn", | ||||
|                 "warning", | ||||
|                 "Error while getting text from PDF document with " "pdfminer.six", | ||||
|                 exc_info=True, | ||||
|             ) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Trenton Holmes
					Trenton Holmes