Exclude platform specific files when prepare command is executed

Author: Fatme

lib/definitions/project.d.ts

@@ -1,15 +1,14 @@
 interface IProjectService {
 	createProject(projectName: string, projectId: string): IFuture<void>;
 	createPlatformSpecificProject(platform: string): IFuture<void>;
-	prepareProject(platform: string): IFuture<void>;
+	prepareProject(platform: string, platforms: string[]): IFuture<void>;
 	buildProject(platform: string): IFuture<void>;
 	ensureProject(): void;
 	projectData: IProjectData;
 }
 
 interface IAndroidProjectService {
 	createProject(projectData: IProjectData): IFuture<void>;
-	prepareProject(projectData: IProjectData): IFuture<void>;
 	buildProject(projectData: IProjectData): IFuture<void>;
 }
 

lib/services/platform-service.ts

@@ -1,13 +1,10 @@
 ///<reference path="../.d.ts"/>
 
 import path = require("path");
+import util = require("util");
 import helpers = require("./../common/helpers");
 
 export class PlatformService implements IPlatformService {
-	constructor(private $errors: IErrors,
-		private $fs: IFileSystem,
-		private $projectService: IProjectService) { }
-
 	private platformCapabilities: { [key: string]: IPlatformCapabilities } = {
 		ios: {
 			targetedOS: ['darwin']
@@ -16,6 +13,14 @@ export class PlatformService implements IPlatformService {
 		}
 	};
 
+	private platformNames = [];
+
+	constructor(private $errors: IErrors,
+				private $fs: IFileSystem,
+				private $projectService: IProjectService) {
+		this.platformNames = Object.keys(this.platformCapabilities);
+	}
+
 	public getCapabilities(platform: string): IPlatformCapabilities {
 		return this.platformCapabilities[platform];
 	}
@@ -66,14 +71,14 @@ export class PlatformService implements IPlatformService {
 			}
 
 			var subDirs = this.$fs.readDirectory(this.$projectService.projectData.platformsDir).wait();
-			return _.filter(subDirs, p => { return Object.keys(this.platformCapabilities).indexOf(p) > -1; });
+			return _.filter(subDirs, p => { return this.platformNames.indexOf(p) > -1; });
 		}).future<string[]>()();
 	}
 
 	public getAvailablePlatforms(): IFuture<string[]> {
 		return (() => {
 			var installedPlatforms = this.getInstalledPlatforms().wait();
-			return _.filter(_.keys(this.platformCapabilities), p => {
+			return _.filter(this.platformNames, p => {
 				return installedPlatforms.indexOf(p) < 0 && this.isPlatformSupportedForOS(p); // Only those not already installed
 			});
 		}).future<string[]>()();
@@ -89,7 +94,7 @@ export class PlatformService implements IPlatformService {
 		return (() => {
 			this.validatePlatform(platform);
 
-			this.$projectService.prepareProject(platform).wait();
+			this.$projectService.prepareProject(platform, this.platformNames).wait();
 		}).future<void>()();
 	}
 
@@ -101,7 +106,7 @@ export class PlatformService implements IPlatformService {
 
 	private validatePlatform(platform): void {
 		if (!this.isValidPlatform(platform)) {
-			this.$errors.fail("Invalid platform %s. Valid platforms are %s.", platform, helpers.formatListOfNames(_.keys(this.platformCapabilities)));
+			this.$errors.fail("Invalid platform %s. Valid platforms are %s.", platform, helpers.formatListOfNames(this.platformNames));
 		}
 
 		if (!this.isPlatformSupportedForOS(platform)) {

lib/services/project-service.ts

@@ -4,6 +4,8 @@ import path = require("path");
 import options = require("./../options");
 import shell = require("shelljs");
 import osenv = require("osenv");
+import util = require("util");
+import helpers = require("./../common/helpers");
 
 export class ProjectService implements IProjectService {
 	private static DEFAULT_PROJECT_ID = "com.telerik.tns.HelloWorld";
@@ -149,12 +151,37 @@ export class ProjectService implements IProjectService {
 		}).future<void>()();
 	}
 
-	public prepareProject(platform: string): IFuture<void> {
+	public prepareProject(platform: string, platforms: string[]): IFuture<void> {
 		return (() => {
-			this.executePlatformSpecificAction(platform, "prepareProject").wait();
+			var assetsDirectoryPath = path.join(this.projectData.platformsDir, platform, "assets");
+			shell.cp("-r",path.join(this.projectData.projectDir, ProjectService.APP_FOLDER_NAME), assetsDirectoryPath);
+
+			var files = helpers.enumerateFilesInDirectorySync(path.join(assetsDirectoryPath, ProjectService.APP_FOLDER_NAME));
+			var pattern = util.format("%s%s%s", path.sep, ProjectService.APP_FOLDER_NAME ,path.sep);
+			_.each(files, fileName => {
+				if(ProjectService.shouldExcludeFile(platform, platforms, fileName.split(pattern)[1])) {
+					this.$fs.deleteFile(fileName).wait();
+				}
+			});
 		}).future<void>()();
 	}
 
+	private static shouldExcludeFile(platform: string, platforms: string[], fileName: string): boolean {
+		var platformInfo = ProjectService.parsePlatformSpecificFileName(fileName, platforms);
+		return platformInfo && platformInfo.platform !== platform;
+	}
+
+	private static parsePlatformSpecificFileName(fileName: string, platforms: string[]): any {
+		var regex = util.format("^(.+?)\.(%s)(\..+?)$", platforms.join("|"));
+		var parsed = fileName.toLowerCase().match(new RegExp(regex, "i"));
+		if (parsed) {
+			return {
+				platform: parsed[2]
+			};
+		}
+		return undefined;
+	}
+
 	public buildProject(platform: string): IFuture<void> {
 		return (() => {
 			this.executePlatformSpecificAction(platform, "buildProject").wait();
@@ -259,14 +286,6 @@ class AndroidProjectService implements IAndroidProjectService {
 		}).future<any>()();
 	}
 
-	public prepareProject(projectData: IProjectData): IFuture<void> {
-		return (() => {
-			var projectDir = path.join(projectData.projectDir, "platforms", "android");
-			// Copy app into assets
-			shell.cp("-r", path.join(projectData.projectDir, ProjectService.APP_FOLDER_NAME), path.join(projectDir, "assets"));
-		}).future<void>()();
-	}
-
 	public buildProject(projectData: IProjectData): IFuture<void> {
 		return (() => {