@@ -369,7 +369,7 @@ export class DatabaseUI extends DisposableObject {
369
369
await this . chooseDatabasesParentFolder ( progress ) ;
370
370
} ,
371
371
{
372
- title : "Choose a Parent Folder contains all Databases to import " ,
372
+ title : "Importing all databases contained in parent folder " ,
373
373
} ,
374
374
) ;
375
375
}
@@ -973,7 +973,7 @@ export class DatabaseUI extends DisposableObject {
973
973
974
974
/**
975
975
* Import database from uri. Returns the imported database, or `undefined` if the
976
- * operation was unsuccessful.
976
+ * operation was unsuccessful or canceled .
977
977
*/
978
978
private async importDatabase (
979
979
uri : Uri ,
@@ -1041,13 +1041,13 @@ export class DatabaseUI extends DisposableObject {
1041
1041
progress ( {
1042
1042
step : index + 1 ,
1043
1043
maxStep : entries . length ,
1044
- message : `Importing ${ entry [ 0 ] } (${ p . step } /${ p . maxStep } ): ${ p . message } ` ,
1044
+ message : `Importing ' ${ entry [ 0 ] } ' (${ p . step } /${ p . maxStep } ): ${ p . message } ` ,
1045
1045
} ) ;
1046
1046
} ;
1047
1047
1048
1048
if ( ! validFileTypes . includes ( entry [ 1 ] ) ) {
1049
1049
void this . app . logger . log (
1050
- `Skip import ${ entry } , invalid FileType : ${ entry [ 1 ] } ` ,
1050
+ `Skipping import for ' ${ entry } ' , invalid file type : ${ entry [ 1 ] } ` ,
1051
1051
) ;
1052
1052
continue ;
1053
1053
}
@@ -1066,8 +1066,8 @@ export class DatabaseUI extends DisposableObject {
1066
1066
} else {
1067
1067
failures . push ( entry [ 0 ] ) ;
1068
1068
}
1069
- } catch {
1070
- failures . push ( entry [ 0 ] ) ;
1069
+ } catch ( e ) {
1070
+ failures . push ( ` ${ entry [ 0 ] } : ${ toErrorMessag ( e ) } ` ) ;
1071
1071
}
1072
1072
}
1073
1073
@@ -1076,7 +1076,7 @@ export class DatabaseUI extends DisposableObject {
1076
1076
this . app . logger ,
1077
1077
`Failed to import ${ failures . length } database(s), successfully imported ${ databases . length } database(s).` ,
1078
1078
{
1079
- fullMessage : `Failed to import ${ failures . length } database(s), successfully imported ${ databases . length } database(s).\nFailed databases to import :\n - ${ failures . join ( "\n - " ) } ` ,
1079
+ fullMessage : `Failed to import ${ failures . length } database(s), successfully imported ${ databases . length } database(s).\nFailed databases:\n - ${ failures . join ( "\n - " ) } ` ,
1080
1080
} ,
1081
1081
) ;
1082
1082
} else if ( databases . length === 0 ) {
0 commit comments