Fix some bugs

This commit is contained in:
2020-06-23 22:46:26 +08:00
parent c5befd94cb
commit 5d84561447
3 changed files with 12 additions and 4 deletions
+11 -3
View File
@@ -29,6 +29,7 @@ STATE state = STATE.none;
RegExp re = RegExp(r'// #\[(debug|release)?(?:\[(.*)\])?\]'); RegExp re = RegExp(r'// #\[(debug|release)?(?:\[(.*)\])?\]');
RegExp pathRe = RegExp(r'\[(debug|release)?(?:\[(.*)\])?\]'); RegExp pathRe = RegExp(r'\[(debug|release)?(?:\[(.*)\])?\]');
Match ma; Match ma;
bool modified = false;
void walkPath(FileSystemEntity path) { void walkPath(FileSystemEntity path) {
var stat = path.statSync(); var stat = path.statSync();
@@ -53,10 +54,12 @@ void walkPath(FileSystemEntity path) {
// 文件名不带规则,逐行读取后进行处理 // 文件名不带规则,逐行读取后进行处理
file = File(path.path); file = File(path.path);
sb.clear(); sb.clear();
modified = false;
try { try {
file.readAsLinesSync().forEach((line) { file.readAsLinesSync().forEach((line) {
ma = re.firstMatch(line); ma = re.firstMatch(line);
if (ma != null) { if (ma != null) {
modified = true;
mode = ma.group(1); mode = ma.group(1);
flavors = (ma.group(2) ?? '').split(' ').where((ele) => ele.trim() != '').toList(); flavors = (ma.group(2) ?? '').split(' ').where((ele) => ele.trim() != '').toList();
@@ -70,6 +73,8 @@ void walkPath(FileSystemEntity path) {
// 前一状态为缓存中或缓存结束,此时应该将状态改为替换,用于跳过默认内容 // 前一状态为缓存中或缓存结束,此时应该将状态改为替换,用于跳过默认内容
else if (state == STATE.caching || state == STATE.cached) { else if (state == STATE.caching || state == STATE.cached) {
state = STATE.replace; state = STATE.replace;
} else if (state == STATE.notMatch) {
state = STATE.none;
} }
} else { } else {
// 带有条件的替换代码块 // 带有条件的替换代码块
@@ -88,15 +93,18 @@ void walkPath(FileSystemEntity path) {
} }
} else { } else {
// none状态时直接将line写入sb // none状态时直接将line写入sb
if (state == STATE.none) if (state == STATE.none) {
sb.writeln(line); sb.writeln(line);
}
// 缓存中状态,将用于替换的内容移除注释后写入缓存 // 缓存中状态,将用于替换的内容移除注释后写入缓存
else if (state == STATE.caching) tmp.writeln(line.replaceFirst('// ', '')); else if (state == STATE.caching) tmp.writeln(line.replaceFirst('// ', ''));
// 这样就跳过了没有匹配上的替换代码块和默认内容 // 这样就跳过了没有匹配上的替换代码块和默认内容
} }
}); });
file.renameSync(path.path + '.bak'); if (modified) {
File(path.path).writeAsStringSync(sb.toString(), flush: true); file.renameSync(path.path + '.bak');
File(path.path).writeAsStringSync(sb.toString(), flush: true);
}
} catch (e) { } catch (e) {
if (!(e is FileSystemException)) { if (!(e is FileSystemException)) {
rethrow; rethrow;
+1 -1
View File
@@ -30,7 +30,7 @@ fi
${DART_EXE} "$SCRIPT_DIR"/bin/pre_script.dart "$@" ${DART_EXE} "$SCRIPT_DIR"/bin/pre_script.dart "$@"
#flutter "$@" flutter "$@"
${DART_EXE} "$SCRIPT_DIR"/bin/after_script.dart "$@" ${DART_EXE} "$SCRIPT_DIR"/bin/after_script.dart "$@"
View File