Skip to content

fix(AppResources): try recover if resources update fails #3492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions lib/services/android-resources-migration-service.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import * as path from "path";
import * as shell from "shelljs";
import * as constants from "../constants";
import { EOL } from "os";

export class AndroidResourcesMigrationService implements IAndroidResourcesMigrationService {
private static ANDROID_DIR = "Android";
private static ANDROID_DIR_TEMP = "Android-Updated";
private static ANDROID_DIR_OLD = "Android-Pre-v4";

constructor(private $fs: IFileSystem,
private $errors: IErrors,
private $logger: ILogger,
private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants) { }

Expand All @@ -22,6 +23,25 @@ export class AndroidResourcesMigrationService implements IAndroidResourcesMigrat
public async migrate(appResourcesDir: string): Promise<void> {
const originalAppResources = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR);
const appResourcesDestination = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_TEMP);
const appResourcesBackup = path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_OLD);

try {
await this.tryMigrate(originalAppResources, appResourcesDestination, appResourcesBackup);
this.$logger.out(`Successfully updated your project's application resources '/Android' directory structure.${EOL}The previous version of your Android application resources has been renamed to '/${AndroidResourcesMigrationService.ANDROID_DIR_OLD}'`);
} catch (error) {
try {
this.recover(originalAppResources, appResourcesDestination, appResourcesBackup);
this.$logger.out("Failed to update resources. They should be in their initial state.");
} catch (err) {
this.$logger.trace(err);
this.$logger.out(`Failed to update resources.${EOL} Backup of original content is inside "${appResourcesBackup}".${EOL}If "${originalAppResources} is missing copy from backup folder."`);
} finally {
this.$errors.failWithoutHelp(error.message);
}
}
}

private async tryMigrate(originalAppResources: string, appResourcesDestination: string, appResourcesBackup: string): Promise<void> {
const appMainSourceSet = path.join(appResourcesDestination, constants.SRC_DIR, constants.MAIN_DIR);
const appResourcesMainSourceSetResourcesDestination = path.join(appMainSourceSet, constants.RESOURCES_DIR);

Expand Down Expand Up @@ -64,11 +84,20 @@ export class AndroidResourcesMigrationService implements IAndroidResourcesMigrat
this.$fs.copyFile(path.join(originalAppResources, constants.MANIFEST_FILE_NAME), path.join(appMainSourceSet, constants.MANIFEST_FILE_NAME));

// rename the legacy app_resources to ANDROID_DIR_OLD
shell.mv(originalAppResources, path.join(appResourcesDir, AndroidResourcesMigrationService.ANDROID_DIR_OLD));
this.$fs.rename(originalAppResources, appResourcesBackup);

// move the new, updated app_resources to App_Resources/Android, as the de facto resources
shell.mv(appResourcesDestination, originalAppResources);
this.$fs.rename(appResourcesDestination, originalAppResources);
}

private recover(originalAppResources: string, appResourcesDestination: string, appResourcesBackup: string): void {
if (!this.$fs.exists(originalAppResources)) {
this.$fs.rename(appResourcesBackup, originalAppResources);
}

this.$logger.out(`Successfully updated your project's application resources '/Android' directory structure.\nThe previous version of your Android application resources has been renamed to '/${AndroidResourcesMigrationService.ANDROID_DIR_OLD}'`);
if (this.$fs.exists(appResourcesDestination)) {
this.$fs.deleteDirectory(appResourcesDestination);
}
}
}

Expand Down