mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-10-30 03:56:23 -05:00 
			
		
		
		
	Get rid of fill_list and rather use defaultdict
This commit is contained in:
		| @@ -328,11 +328,8 @@ class Document(models.Model): | |||||||
|         if settings.PAPERLESS_FILENAME_FORMAT is not None: |         if settings.PAPERLESS_FILENAME_FORMAT is not None: | ||||||
|             tag = defaultdict(lambda: slugify(None), |             tag = defaultdict(lambda: slugify(None), | ||||||
|                               self.many_to_dictionary(self.tags)) |                               self.many_to_dictionary(self.tags)) | ||||||
|             list_length = 10 |             tags = defaultdict(lambda: slugify(None), | ||||||
|             tags = self.many_to_list(self.tags) |                                enumerate(self.many_to_list(self.tags))) | ||||||
|             while True: |  | ||||||
|                 tags = Document.fill_list(tags, list_length, None) |  | ||||||
|                 try: |  | ||||||
|             path = settings.PAPERLESS_FILENAME_FORMAT.format( |             path = settings.PAPERLESS_FILENAME_FORMAT.format( | ||||||
|                    correspondent=slugify(self.correspondent), |                    correspondent=slugify(self.correspondent), | ||||||
|                    title=slugify(self.title), |                    title=slugify(self.title), | ||||||
| @@ -340,13 +337,6 @@ class Document(models.Model): | |||||||
|                    added=slugify(self.added), |                    added=slugify(self.added), | ||||||
|                    tag=tag, |                    tag=tag, | ||||||
|                    tags=tags) |                    tags=tags) | ||||||
|                     break |  | ||||||
|                 except IndexError: |  | ||||||
|                     list_length *= 10 |  | ||||||
|  |  | ||||||
|                 if list_length > 1000: |  | ||||||
|                     path = "" |  | ||||||
|                     break |  | ||||||
|         else: |         else: | ||||||
|             path = "" |             path = "" | ||||||
|  |  | ||||||
|   | |||||||
| @@ -264,7 +264,7 @@ class TestDate(TestCase): | |||||||
|         # Ensure that filename is properly generated |         # Ensure that filename is properly generated | ||||||
|         tmp = document.source_filename |         tmp = document.source_filename | ||||||
|         self.assertEqual(document.generate_source_filename(), |         self.assertEqual(document.generate_source_filename(), | ||||||
|                          "0000001.pdf") |                          "none-0000001.pdf") | ||||||
|         document.create_source_directory() |         document.create_source_directory() | ||||||
|         Path(document.source_path).touch() |         Path(document.source_path).touch() | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Wolf-Bastian Poettner
					Wolf-Bastian Poettner