firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete and recreate all affected directories during an artifact cache refresh (#5461)

Browse Source 
This will ensure cleanup of any files that existed in previous versions of
the artifacts but have since been removed
This commit is contained in:
Jason Simmons
2016-08-17 10:55:01 -07:00
committed by GitHub
parent 96ec30b8af
commit 80fe689a56
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
packages/flutter_tools/lib/src/cache.dart
View File

@@ -220,10 +220,12 @@ class MaterialFonts {
Future<Null> download() {
Status status = logger.startProgress('Downloading Material fonts...');
Directory fontsDir = cache.getArtifactDirectory(kName);
if (fontsDir.existsSync())
fontsDir.deleteSync(recursive: true);
return Cache._downloadFileToCache(
Uri.parse(cache.getVersionFor(kName)),
cache.getArtifactDirectory(kName),
true
Uri.parse(cache.getVersionFor(kName)), fontsDir, true
).then((_) {
cache.setStampFor(kName, cache.getVersionFor(kName));
status.stop(showElapsedTime: true);
@@ -315,28 +317,27 @@ class FlutterEngine {
String engineVersion = cache.getVersionFor(kName);
String url = 'https://storage.googleapis.com/flutter_infra/flutter/$engineVersion/';
bool allDirty = engineVersion != cache.getStampFor(kName);
Directory pkgDir = cache.getCacheDir('pkg');
for (String pkgName in _getPackageDirs()) {
Directory dir = new Directory(path.join(pkgDir.path, pkgName));
if (!dir.existsSync() || allDirty) {
await _downloadItem('Downloading package $pkgName...', url + pkgName + '.zip', pkgDir);
}
if (dir.existsSync())
dir.deleteSync(recursive: true);
await _downloadItem('Downloading package $pkgName...', url + pkgName + '.zip', pkgDir);
}
Directory engineDir = cache.getArtifactDirectory(kName);
if (engineDir.existsSync())
engineDir.deleteSync(recursive: true);
for (String dirName in _getEngineDirs()) {
Directory dir = new Directory(path.join(engineDir.path, dirName));
if (!dir.existsSync() || allDirty) {
await _downloadItem('Downloading engine artifacts $dirName...',
url + dirName + '/artifacts.zip', dir);
File frameworkZip = new File(path.join(dir.path, 'Flutter.framework.zip'));
if (frameworkZip.existsSync()) {
Directory framework = new Directory(path.join(dir.path, 'Flutter.framework'));
framework.createSync();
os.unzip(frameworkZip, framework);
}
await _downloadItem('Downloading engine artifacts $dirName...',
url + dirName + '/artifacts.zip', dir);
File frameworkZip = new File(path.join(dir.path, 'Flutter.framework.zip'));
if (frameworkZip.existsSync()) {
Directory framework = new Directory(path.join(dir.path, 'Flutter.framework'));
framework.createSync();
os.unzip(frameworkZip, framework);
}
}
@@ -344,10 +345,8 @@ class FlutterEngine {
String cacheDir = toolsDir[0];
String urlPath = toolsDir[1];
Directory dir = new Directory(path.join(engineDir.path, cacheDir));
if (!dir.existsSync() || allDirty) {
await _downloadItem('Downloading $cacheDir tools...', url + urlPath, dir);
_makeFilesExecutable(dir);
}
await _downloadItem('Downloading $cacheDir tools...', url + urlPath, dir);
_makeFilesExecutable(dir);
}
cache.setStampFor(kName, cache.getVersionFor(kName));