mirror of
				https://github.com/netinvent/npbackup.git
				synced 2025-10-28 06:16:21 +08:00 
			
		
		
		
	Separate additional parameters for all restic calls and for backup only
This commit is contained in:
		
							parent
							
								
									0c48848b7e
								
							
						
					
					
						commit
						443a13a24d
					
				
					 4 changed files with 17 additions and 3 deletions
				
			
		|  | @ -347,6 +347,14 @@ class NPBackupRunner: | ||||||
|         except ValueError: |         except ValueError: | ||||||
|             logger.warning("Bogus ignore_cloud_files value given") |             logger.warning("Bogus ignore_cloud_files value given") | ||||||
| 
 | 
 | ||||||
|  | 
 | ||||||
|  |         try: | ||||||
|  |             if self.config_dict["backup"]["additional_parameters"]: | ||||||
|  |                 self.restic_runner.additional_parameters = self.config_dict["backup"]["additional_parameters"] | ||||||
|  |         except KeyError: | ||||||
|  |             pass | ||||||
|  |         except ValueError: | ||||||
|  |             logger.warning("Bogus additional parameters given") | ||||||
|         self.restic_runner.stdout = self.stdout |         self.restic_runner.stdout = self.stdout | ||||||
| 
 | 
 | ||||||
|         try: |         try: | ||||||
|  | @ -564,9 +572,9 @@ class NPBackupRunner: | ||||||
|             tags = None |             tags = None | ||||||
| 
 | 
 | ||||||
|         try: |         try: | ||||||
|             additional_parameters = self.config_dict["backup"]["additional_parameters"] |             additional_backup_only_parameters = self.config_dict["backup"]["additional_backup_only_parameters"] | ||||||
|         except KeyError: |         except KeyError: | ||||||
|             additional_parameters = None |             additional_backup_only_parameters = None | ||||||
| 
 | 
 | ||||||
|         # Check if backup is required |         # Check if backup is required | ||||||
|         self.restic_runner.verbose = False |         self.restic_runner.verbose = False | ||||||
|  | @ -615,7 +623,7 @@ class NPBackupRunner: | ||||||
|             one_file_system=one_file_system, |             one_file_system=one_file_system, | ||||||
|             use_fs_snapshot=use_fs_snapshot, |             use_fs_snapshot=use_fs_snapshot, | ||||||
|             tags=tags, |             tags=tags, | ||||||
|             additional_parameters=additional_parameters, |             additional_backup_only_parameters=additional_backup_only_parameters, | ||||||
|         ) |         ) | ||||||
|         logger.debug("Restic output:\n{}".format(result_string)) |         logger.debug("Restic output:\n{}".format(result_string)) | ||||||
|         metric_writer( |         metric_writer( | ||||||
|  |  | ||||||
|  | @ -285,6 +285,10 @@ def config_gui(config_dict: dict, config_file: str): | ||||||
|             sg.Text(_t("config_gui.additional_parameters"), size=(40, 1)), |             sg.Text(_t("config_gui.additional_parameters"), size=(40, 1)), | ||||||
|             sg.Input(key="backup---additional_parameters", size=(50, 1)), |             sg.Input(key="backup---additional_parameters", size=(50, 1)), | ||||||
|         ], |         ], | ||||||
|  |         [ | ||||||
|  |             sg.Text(_t("config_gui.additional_backup_only_parameters"), size=(40, 1)), | ||||||
|  |             sg.Input(key="backup---additional_backup_only_parameters", size=(50, 1)), | ||||||
|  |         ], | ||||||
|     ] |     ] | ||||||
| 
 | 
 | ||||||
|     repo_col = [ |     repo_col = [ | ||||||
|  |  | ||||||
|  | @ -20,6 +20,7 @@ en: | ||||||
|   one_per_line: one per line |   one_per_line: one per line | ||||||
|   backup_priority: Backup priority |   backup_priority: Backup priority | ||||||
|   additional_parameters: Additional parameters |   additional_parameters: Additional parameters | ||||||
|  |   additional_backup_only_parameters: Additional backup only parmas | ||||||
| 
 | 
 | ||||||
|   backup_destination: Backup destination |   backup_destination: Backup destination | ||||||
|   minimum_backup_age: Minimum delay between two backups |   minimum_backup_age: Minimum delay between two backups | ||||||
|  |  | ||||||
|  | @ -20,6 +20,7 @@ fr: | ||||||
|   one_per_line: un par ligne |   one_per_line: un par ligne | ||||||
|   backup_priority: Priorité de sauvegarde |   backup_priority: Priorité de sauvegarde | ||||||
|   additional_parameters: Paramètres supplémentaires |   additional_parameters: Paramètres supplémentaires | ||||||
|  |   additional_backup_only_parameters: Paramètres supp. sauvegarde | ||||||
| 
 | 
 | ||||||
|   backup_destination: Destination de sauvegarde |   backup_destination: Destination de sauvegarde | ||||||
|   minimum_backup_age: Délai minimal entre deux sauvegardes |   minimum_backup_age: Délai minimal entre deux sauvegardes | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue