Skip to content
This repository was archived by the owner on Nov 28, 2022. It is now read-only.

Commit 3f23a01

Browse files
makandresghung
authored andcommitted
0.5.0: Appsody - Ignore paths and use settings file (#761)
* ignore paths Signed-off-by: Andrew Mak <[email protected]> * don't rely on output Signed-off-by: Andrew Mak <[email protected]>
1 parent 976bee5 commit 3f23a01

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

src/pfe/file-watcher/server/src/projects/ShellExtensionProject.ts

+15-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import * as projectEventsController from "../controllers/projectEventsController
2222
import { IExtensionProject } from "../extensions/IExtensionProject";
2323
import * as processManager from "../utils/processManager";
2424
import * as logger from "../utils/logger";
25-
import { StartModes } from "./constants";
25+
import { projectConstants, StartModes } from "./constants";
2626

2727
/**
2828
* @interface
@@ -59,6 +59,7 @@ interface ShellExtensionProjectConfig {
5959
export class ShellExtensionProject implements IExtensionProject {
6060

6161
supportedType: string;
62+
defaultIgnoredPath: string[] = ["*/*"];
6263

6364
private fullPath: string;
6465
private config: ShellExtensionProjectConfig;
@@ -82,11 +83,21 @@ export class ShellExtensionProject implements IExtensionProject {
8283
*/
8384
private setLanguage = async (projectInfo: ProjectInfo): Promise<void> => {
8485

86+
const logDir = await logHelper.getLogDir(
87+
projectInfo.projectID, path.basename(projectInfo.location));
88+
8589
const args = [
8690
projectInfo.location,
8791
projectUtil.LOCAL_WORKSPACE,
8892
projectInfo.projectID,
89-
projectInfo.language
93+
projectInfo.language,
94+
"",
95+
"",
96+
"",
97+
"",
98+
"",
99+
"",
100+
logDir
90101
];
91102

92103
try {
@@ -97,8 +108,8 @@ export class ShellExtensionProject implements IExtensionProject {
97108
{});
98109

99110
if (!result.stderr) {
100-
const lastLine = result.stdout.substring(result.stdout.lastIndexOf("\n") + 1);
101-
const json = JSON.parse(lastLine);
111+
const json = await fs.readJson(
112+
path.join(projectConstants.projectsLogDir, logDir, "settings.json"), { encoding: "utf8" });
102113
this.language = json.language;
103114
return;
104115
}

0 commit comments

Comments
 (0)