smokephil/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-12-11 17:17:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactored source_filename_new into generate_source_filename and

Browse source 
create_source_directory
This commit is contained in:
Wolf-Bastian Poettner 2020-02-01 13:52:27 +00:00
parent e79f5394fc
commit bcff75433c
2 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/documents/tests/test_file_handling.py
View file

@ -29,16 +29,17 @@ class TestDate(TestCase):
@override_settings(PAPERLESS_DIRECTORY_FORMAT="")
@override_settings(PAPERLESS_FILENAME_FORMAT="")
def test_source_filename_new(self):
def test_generate_source_filename(self):
document = Document()
document.file_type = "pdf"
document.storage_type = Document.STORAGE_TYPE_UNENCRYPTED
document.save()
self.assertEqual(document.source_filename_new(), "0000001.pdf")
self.assertEqual(document.generate_source_filename(), "0000001.pdf")
document.storage_type = Document.STORAGE_TYPE_GPG
self.assertEqual(document.source_filename_new(), "0000001.pdf.gpg")
self.assertEqual(document.generate_source_filename(),
"0000001.pdf.gpg")
@override_settings(MEDIA_ROOT="/tmp/paperless-tests-{}".
format(str(uuid4())[:8]))
@ -52,8 +53,9 @@ class TestDate(TestCase):
# Ensure that filename is properly generated
tmp = document.source_filename
self.assertEqual(document.source_filename_new(),
self.assertEqual(document.generate_source_filename(),
"none/none-0000001.pdf")
document.create_source_directory()
Path(document.source_path).touch()
# Test source_path
@ -63,7 +65,7 @@ class TestDate(TestCase):
# Enable encryption and check again
document.storage_type = Document.STORAGE_TYPE_GPG
tmp = document.source_filename
self.assertEqual(document.source_filename_new(),
self.assertEqual(document.generate_source_filename(),
"none/none-0000001.pdf.gpg")
document.save()
@ -82,7 +84,7 @@ class TestDate(TestCase):
"/documents/originals/none"), False)
self.assertEqual(os.path.isfile(settings.MEDIA_ROOT + "/documents/" +
"originals/test/test-0000001.pdf.gpg"), True)
self.assertEqual(document.source_filename_new(),
self.assertEqual(document.generate_source_filename(),
"test/test-0000001.pdf.gpg")
@override_settings(MEDIA_ROOT="/tmp/paperless-tests-{}".
@ -97,8 +99,9 @@ class TestDate(TestCase):
# Ensure that filename is properly generated
tmp = document.source_filename
self.assertEqual(document.source_filename_new(),
self.assertEqual(document.generate_source_filename(),
"none/none-0000001.pdf")
document.create_source_directory()
Path(document.source_path).touch()
# Ensure file deletion after delete
@ -120,8 +123,9 @@ class TestDate(TestCase):
# Ensure that filename is properly generated
tmp = document.source_filename
self.assertEqual(document.source_filename_new(),
self.assertEqual(document.generate_source_filename(),
"none/none-0000001.pdf")
document.create_source_directory()
Path(document.source_path).touch()
Path(document.source_path + "test").touch()
@ -151,4 +155,4 @@ class TestDate(TestCase):
document.storage_type = Document.STORAGE_TYPE_UNENCRYPTED
document.save()
self.assertEqual(document.source_filename_new(), "0000001.pdf")
self.assertEqual(document.generate_source_filename(), "0000001.pdf")