Skip to content

Commit ef6d926

Browse files
committed
Fix asynchronous code
1 parent 70846fe commit ef6d926

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

lib/src/flutter_rename_app.dart

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,23 @@ renameApp() async {
3333

3434
Logger.newLine();
3535

36-
Logger.info("Let's change all in lib !");
37-
await _changeAllImportsIn("lib", config);
36+
if (config.oldDartPackageName != config.newDartPackageName) {
37+
Logger.info("Let's change all in lib !");
38+
_changeAllImportsIn("lib", config);
3839

39-
Logger.info("Let's change all in tests !");
40-
await _changeAllImportsIn("test", config);
40+
Logger.info("Let's change all in tests !");
41+
_changeAllImportsIn("test", config);
42+
}
4143

42-
await changeAndroidPackageName(config);
44+
if (config.oldAndroidPackageName != config.newAndroidPackageName) {
45+
await changeAndroidPackageName(config);
46+
}
4347

4448
final List<RequiredChange> contentChanges = getFilesToModifyContent(config);
45-
await _applyContentChanges(contentChanges);
49+
_applyContentChanges(contentChanges);
4650

4751
final List<RequiredChange> nameChanges = getFilesToModifyName(config);
48-
await _applyNameChanges(nameChanges);
52+
_applyNameChanges(nameChanges);
4953

5054
final shell = Shell();
5155

@@ -55,17 +59,16 @@ renameApp() async {
5559
Logger.error(error.message);
5660
return;
5761
}
58-
print("ERROR : $error");
5962
}
6063
}
6164

62-
_changeAllImportsIn(String directoryPath, Config config) async {
65+
_changeAllImportsIn(String directoryPath, Config config) {
6366
final Directory directory = Directory(directoryPath);
6467
if (directory.existsSync()) {
6568
final List<FileSystemEntity> files = directory.listSync(recursive: true);
66-
await Future.forEach(files, (FileSystemEntity fileSystemEntity) async {
69+
files.forEach((FileSystemEntity fileSystemEntity) {
6770
if (fileSystemEntity is File) {
68-
await _changeContentInFile(
71+
_changeContentInFile(
6972
fileSystemEntity.path,
7073
RegExp(config.oldDartPackageName),
7174
config.newDartPackageName,
@@ -77,24 +80,24 @@ _changeAllImportsIn(String directoryPath, Config config) async {
7780
}
7881
}
7982

80-
_applyNameChanges(List<RequiredChange> requiredChanges) async {
81-
return await Future.forEach(requiredChanges, (RequiredChange change) async {
83+
_applyNameChanges(List<RequiredChange> requiredChanges) {
84+
requiredChanges.forEach((RequiredChange change) {
8285
for (final path in change.paths) {
83-
await _changeFileName(path, change.regexp, change.replacement);
86+
_changeFileName(path, change.regexp, change.replacement);
8487
}
8588
});
8689
}
8790

88-
_applyContentChanges(List<RequiredChange> requiredChanges) async {
89-
return await Future.forEach(requiredChanges, (RequiredChange change) async {
91+
_applyContentChanges(List<RequiredChange> requiredChanges) {
92+
requiredChanges.forEach((RequiredChange change) {
9093
for (final path in change.paths) {
9194
if (change.isDirectory) {
9295
final Directory directory = Directory(path);
93-
Future.forEach(directory.listSync(recursive: true), (FileSystemEntity entity) async {
94-
await _changeContentInFile(entity.path, change.regexp, change.replacement);
96+
directory.listSync(recursive: true).forEach((FileSystemEntity entity) {
97+
_changeContentInFile(entity.path, change.regexp, change.replacement);
9598
});
9699
} else {
97-
await _changeContentInFile(path, change.regexp, change.replacement);
100+
_changeContentInFile(path, change.regexp, change.replacement);
98101
}
99102
}
100103
});
@@ -105,9 +108,7 @@ _changeFileName(String filePath, RegExp regexp, String replacement) {
105108
try {
106109
final File file = File(filePath);
107110
file.renameSync(filePath.replaceAll(regexp, replacement));
108-
} on FileSystemException {
109-
///Logger.error("File $filePath does not exist on this project");
110-
}
111+
} catch (error) {}
111112
}
112113
}
113114

@@ -120,7 +121,5 @@ _changeContentInFile(String filePath, RegExp regexp, String replacement) {
120121
file.writeAsStringSync(newContent);
121122
Logger.info("Changed file $filePath");
122123
}
123-
} on FileSystemException {
124-
///Logger.error("File $filePath does not exist on this project");
125-
}
124+
} catch (error) {}
126125
}

0 commit comments

Comments
 (0)