Merge pull request #647 from particle-iot/fix/add-proj-prop-for-assets

Fix/add project property for assets

src/cmd/cloud.js

@@ -2,6 +2,7 @@ const os = require('os');
 const _ = require('lodash');
 const VError = require('verror');
 const prompt = require('inquirer').prompt;
+const propertiesParser = require('properties-parser');
 
 const settings = require('../../settings');
 const deviceSpecs = require('../lib/device-specs');
@@ -687,24 +688,22 @@ module.exports = class CloudCommand extends CLICommandBase {
 	 */
 	async _checkForAssets(files) {
 		for (const file of files) {
-			if (await this._isAssetsDir(file)) {
-				return path.join(file, 'assets');
-			}
-		}
-	}
-
-	async _isAssetsDir(file) {
-		try {
-			if ((await fs.stat(file)).isDirectory()) {
-				const assetsDir = path.join(file, 'assets');
-				if ((await fs.stat(assetsDir)).isDirectory()) {
-					return true;
+			const propPath = path.join(file, 'project.properties');
+			try {
+				const savedProp = await fs.readFile(propPath, 'utf8');
+				const savedPropObj = propertiesParser.parse(savedProp);
+
+				if (savedPropObj.assetOtaFolder && savedPropObj.assetOtaFolder !== '') {
+					const assetsDir = path.join(file, savedPropObj.assetOtaFolder);
+					const stats = await fs.stat(assetsDir);
+					if (stats.isDirectory()) {
+						return assetsDir;
+					}
 				}
+			} catch (error) {
+				// Ignore file read or stat errors
 			}
-		} catch (e) {
-			// ignore missing files
 		}
-		return false;
 	}
 
 	/**

src/cmd/cloud.test.js

@@ -287,6 +287,36 @@ describe('Cloud Commands', () => {
 			const dirPath = path.join(PATH_FIXTURES_THIRDPARTY_OTA_DIR, 'invalid_no_assets');
 			expect(await cloud._checkForAssets([dirPath])).to.equal(undefined);
 		});
+
+		it('returns undefined if project.properties is missing', async () => {
+			const { cloud } = stubForLogin(new CloudCommands(), stubs);
+			const dirPath = path.join(PATH_FIXTURES_THIRDPARTY_OTA_DIR, 'valid-no-proj-prop');
+			expect(await cloud._checkForAssets([dirPath])).to.equal(undefined);
+		});
+
+		it('returns undefined if project.properties does not have ossetOtaFolder', async () => {
+			const { cloud } = stubForLogin(new CloudCommands(), stubs);
+			const dirPath = path.join(PATH_FIXTURES_THIRDPARTY_OTA_DIR, 'valid-no-proj-prop');
+			const projectPropertiesPath = path.join(dirPath, 'project.properties');
+			const projectPropertiesContent = 'project.name=valid-no-proj-prop\nassetOtaFolder=';
+			await fs.writeFile(projectPropertiesPath, projectPropertiesContent);
+
+			expect(await cloud._checkForAssets([dirPath])).to.equal(undefined);
+
+			await fs.unlink(projectPropertiesPath);
+		});
+
+		it('returns undefined if project.properties does not have a valid ossetOtaFolder', async () => {
+			const { cloud } = stubForLogin(new CloudCommands(), stubs);
+			const dirPath = path.join(PATH_FIXTURES_THIRDPARTY_OTA_DIR, 'valid-no-proj-prop');
+			const projectPropertiesPath = path.join(dirPath, 'project.properties');
+			const projectPropertiesContent = 'project.name=valid-no-proj-prop\nassetOtaFolder=foo';
+			await fs.writeFile(projectPropertiesPath, projectPropertiesContent);
+
+			expect(await cloud._checkForAssets([dirPath])).to.equal(undefined);
+
+			await fs.unlink(projectPropertiesPath);
+		});
 	});
 
 	describe('_getDownloadPathForBin', () => {

test/__fixtures__/third_party_ota/projects/stroby-with-assets/project.properties

@@ -1 +1,2 @@
 name=stroby
+assetOtaFolder=assets

test/__fixtures__/third_party_ota/valid-no-proj-prop/assets/cat.txt

@@ -0,0 +1 @@
+meow

test/__fixtures__/third_party_ota/valid-no-proj-prop/assets/house.txt

@@ -0,0 +1 @@
+house

test/__fixtures__/third_party_ota/valid-no-proj-prop/assets/water.txt

@@ -0,0 +1 @@
+drip

test/__fixtures__/third_party_ota/valid/project.properties

@@ -0,0 +1,2 @@
+name=valid
+assetOtaFolder=assets

test/__fixtures__/third_party_ota/zero_assets/project.properties

@@ -0,0 +1,2 @@
+name=zero_assets
+assetOtaFolder=assets