@@ -358,7 +358,7 @@ def execute_restore(self, **options):
358
358
# Restore Fixtures
359
359
abortlater = False
360
360
for app_name , dump_name in zip (config .app_names , config .dump_names ):
361
- fixture_file = os .path .join (target_folder , dump_name + ' .json' )
361
+ fixture_file = os .path .join (target_folder , f" { dump_name } .json" )
362
362
363
363
print (f"Deserializing '{ fixture_file } '" )
364
364
try :
@@ -405,7 +405,7 @@ def execute_restore(self, **options):
405
405
# (check to prevent overriding files from site-packages
406
406
# in project-template based GeoNode projects)
407
407
if getattr (settings , 'LOCAL_ROOT' , None ) and \
408
- not static_files_folder .startswith (settings .LOCAL_ROOT ):
408
+ not static_files_folder .startswith (settings .LOCAL_ROOT ):
409
409
print (
410
410
f"Skipping static directory: { static_files_folder } . "
411
411
f"It's not located under LOCAL_ROOT path: { settings .LOCAL_ROOT } ." )
@@ -430,7 +430,7 @@ def execute_restore(self, **options):
430
430
# (check to prevent overriding files from site-packages
431
431
# in project-template based GeoNode projects)
432
432
if getattr (settings , 'LOCAL_ROOT' , None ) and \
433
- not template_files_folder .startswith (settings .LOCAL_ROOT ):
433
+ not template_files_folder .startswith (settings .LOCAL_ROOT ):
434
434
print (
435
435
f"Skipping template directory: { template_files_folder } . "
436
436
f"It's not located under LOCAL_ROOT path: { settings .LOCAL_ROOT } ." )
@@ -455,7 +455,7 @@ def execute_restore(self, **options):
455
455
# (check to prevent overriding files from site-packages
456
456
# in project-template based GeoNode projects)
457
457
if getattr (settings , 'LOCAL_ROOT' , None ) and \
458
- not locale_files_folder .startswith (settings .LOCAL_ROOT ):
458
+ not locale_files_folder .startswith (settings .LOCAL_ROOT ):
459
459
print (
460
460
f"Skipping locale directory: { locale_files_folder } . "
461
461
f"It's not located under LOCAL_ROOT path: { settings .LOCAL_ROOT } ." )
@@ -663,8 +663,7 @@ def restore_geoserver_backup(self, config, settings, target_folder,
663
663
}
664
664
r = requests .post (f'{ url } rest/br/restore/' , data = json .dumps (data ),
665
665
headers = headers , auth = HTTPBasicAuth (user , passwd ))
666
- error_backup = 'Could not successfully restore GeoServer ' + \
667
- 'catalog [{}rest/br/restore/]: {} - {}'
666
+ error_backup = "Could not successfully restore GeoServer catalog [{{}}rest/br/restore/]: {{}} - {{}}"
668
667
669
668
if r .status_code in (200 , 201 , 406 ):
670
669
try :
@@ -761,8 +760,7 @@ def restore_geoserver_raster_data(self, config, settings, target_folder):
761
760
copy_tree (gs_data_folder , gs_data_root )
762
761
print (f"GeoServer Uploaded Raster Data Restored to '{ gs_data_root } '." )
763
762
else :
764
- print (('Skipping geoserver raster data restore: ' +
765
- f'directory "{ gs_data_folder } " not found.' ))
763
+ print (f"Skipping geoserver raster data restore: directory \" { gs_data_folder } \" not found." )
766
764
767
765
# Restore '$config.gs_data_dir/data/geonode'
768
766
gs_data_folder = os .path .join (target_folder , 'gs_data_dir' , 'data' , 'geonode' )
@@ -777,17 +775,15 @@ def restore_geoserver_raster_data(self, config, settings, target_folder):
777
775
copy_tree (gs_data_folder , gs_data_root )
778
776
print (f"GeoServer Uploaded Data Restored to '{ gs_data_root } '." )
779
777
else :
780
- print (('Skipping geoserver raster data restore: ' +
781
- f'directory "{ gs_data_folder } " not found.' ))
778
+ print (f"Skipping geoserver raster data restore: directory \" { gs_data_folder } \" not found." )
782
779
783
780
def restore_geoserver_vector_data (self , config , settings , target_folder , soft_reset ):
784
781
"""Restore Vectorial Data from DB"""
785
782
if (config .gs_dump_vector_data ):
786
783
787
784
gs_data_folder = os .path .join (target_folder , 'gs_data_dir' , 'geonode' )
788
785
if not os .path .exists (gs_data_folder ):
789
- print (('Skipping geoserver vector data restore: ' +
790
- f'directory "{ gs_data_folder } " not found.' ))
786
+ print (f"Skipping geoserver vector data restore: directory \" { gs_data_folder } \" not found." )
791
787
return
792
788
793
789
datastore = settings .OGC_SERVER ['default' ]['DATASTORE' ]
0 commit comments