mirror of
				https://github.com/paperless-ngx/paperless-ngx.git
				synced 2025-11-03 19:17:13 -05:00 
			
		
		
		
	fix bug on administration exporter when using -d, --delete option
This commit is contained in:
		
							parent
							
								
									4cb4bd13ad
								
							
						
					
					
						commit
						fae5e834b9
					
				@ -350,6 +350,8 @@ class Command(BaseCommand):
 | 
				
			|||||||
                if self.use_filename_prefix:
 | 
					                if self.use_filename_prefix:
 | 
				
			||||||
                    manifest_name = os.path.join("json", manifest_name)
 | 
					                    manifest_name = os.path.join("json", manifest_name)
 | 
				
			||||||
                manifest_name = os.path.join(self.target, manifest_name)
 | 
					                manifest_name = os.path.join(self.target, manifest_name)
 | 
				
			||||||
 | 
					                if manifest_name in self.files_in_export_dir:
 | 
				
			||||||
 | 
					                    self.files_in_export_dir.remove(manifest_name)
 | 
				
			||||||
                os.makedirs(os.path.dirname(manifest_name), exist_ok=True)
 | 
					                os.makedirs(os.path.dirname(manifest_name), exist_ok=True)
 | 
				
			||||||
                with open(manifest_name, "w") as f:
 | 
					                with open(manifest_name, "w") as f:
 | 
				
			||||||
                    json.dump([document_manifest[index]], f, indent=2)
 | 
					                    json.dump([document_manifest[index]], f, indent=2)
 | 
				
			||||||
@ -357,19 +359,20 @@ class Command(BaseCommand):
 | 
				
			|||||||
        # 4.1 write manifest to target folder
 | 
					        # 4.1 write manifest to target folder
 | 
				
			||||||
        manifest_path = (self.target / Path("manifest.json")).resolve()
 | 
					        manifest_path = (self.target / Path("manifest.json")).resolve()
 | 
				
			||||||
        manifest_path.write_text(json.dumps(manifest, indent=2))
 | 
					        manifest_path.write_text(json.dumps(manifest, indent=2))
 | 
				
			||||||
 | 
					        if manifest_path in self.files_in_export_dir:
 | 
				
			||||||
 | 
					            self.files_in_export_dir.remove(manifest_path)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # 4.2 write version information to target folder
 | 
					        # 4.2 write version information to target folder
 | 
				
			||||||
        version_path = (self.target / Path("version.json")).resolve()
 | 
					        version_path = (self.target / Path("version.json")).resolve()
 | 
				
			||||||
        version_path.write_text(
 | 
					        version_path.write_text(
 | 
				
			||||||
            json.dumps({"version": version.__full_version_str__}, indent=2),
 | 
					            json.dumps({"version": version.__full_version_str__}, indent=2),
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
 | 
					        if version_path in self.files_in_export_dir:
 | 
				
			||||||
 | 
					            self.files_in_export_dir.remove(version_path)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if self.delete:
 | 
					        if self.delete:
 | 
				
			||||||
            # 5. Remove files which we did not explicitly export in this run
 | 
					            # 5. Remove files which we did not explicitly export in this run
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if manifest_path in self.files_in_export_dir:
 | 
					 | 
				
			||||||
                self.files_in_export_dir.remove(manifest_path)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            for f in self.files_in_export_dir:
 | 
					            for f in self.files_in_export_dir:
 | 
				
			||||||
                f.unlink()
 | 
					                f.unlink()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user