Merge pull request #82 from LISTENAI/feature/opt

monsterboom · zhaozhuobin · commit 5b20f4108570 · 2022-10-13T17:47:47.000+08:00
Feature/opt
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lisa-plugin/zephyr",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "LISA plugin for Zephyr",
   "main": "./lib/main.js",
   "engines": {
diff --git a/src/models/sdk.ts b/src/models/sdk.ts
@@ -0,0 +1,105 @@
+import { pathExists, mkdirp, writeFile } from 'fs-extra';
+import { undertake } from "../main";
+import Lisa from '@listenai/lisa_core';
+import { venvScripts } from '../venv';
+
+import { resolve, join } from "path";
+import { PACKAGE_HOME, loadBundles, getEnv, invalidateEnv } from "../env";
+import { get, set } from "../env/config";
+
+export default class SDK {
+
+    constructor() {
+        
+    }
+
+    static async clear() {
+        await set("sdk", undefined);
+        await invalidateEnv();
+    }
+
+    async zephyrbase() {
+        const env = await getEnv();
+        return env["ZEPHYR_BASE"] ?? '';
+    }
+
+    async westConfigPath() {
+        const zephyrbase = await this.zephyrbase();
+        return zephyrbase ? resolve(zephyrbase, "../.west/config") : '';
+    }
+
+    async manifestPath(basicPath: string) {
+        const { stdout } = await Lisa.cmd(
+            "python",
+            ["-m", "west", "config", "manifest.path"],
+            {
+              env: await getEnv(),
+              cwd: basicPath,
+            }
+        );
+        return join(basicPath, stdout);
+    }
+
+    private async _checkZephyrBase(zephyrbase: string, westConfigPath: string) {
+        if (!zephyrbase) {
+          throw new Error(`需要设置 SDK (lisa zep use-sdk [path])`);
+        }
+        if (!(await pathExists(westConfigPath))) {
+          throw new Error(
+            `当前 SDK 未初始化，需要设置 SDK (lisa zep use-sdk [directory] [--from-git URL#TAG] [--manifest PATH])`
+          );
+        }
+    }
+
+    async changeVersion(version: string, install: boolean = false) {
+        const zephyrbase = await this.zephyrbase();
+        await this._checkZephyrBase(zephyrbase, await this.westConfigPath());
+        const {cmd} = Lisa;
+        const env = await getEnv();
+        try {
+          await cmd("git", ["fetch", "origin"], {
+            env,
+            cwd: zephyrbase,
+          });
+          await cmd("git", ["checkout", version], {
+            env,
+            cwd: zephyrbase,
+          });
+          await cmd("git", ["pull", "origin", version], {
+            stdio: "inherit",
+            env,
+            cwd: zephyrbase,
+          });
+          await cmd("python", ["-m", "west", "update"], {
+            stdio: "inherit",
+            env,
+            cwd: zephyrbase,
+          });
+          if (install) {
+            await this.installRequirement(zephyrbase)
+          }
+        } catch (e: any) {
+          const { stderr } = e;
+          throw new Error(
+            (stderr && JSON.stringify(stderr)) || JSON.stringify(e)
+          );
+        }
+    }
+    
+    async installRequirement(zephyrbase: string) {
+        const {cmd} = Lisa;
+        await cmd("python", [
+            "-m",
+            "pip",
+            "install",
+            "-r",
+            join(zephyrbase, "scripts", "requirements.txt"),
+        ],
+        { 
+            stdio: "inherit",
+            env: await getEnv(),
+        }
+        );
+    }
+   
+} 
diff --git a/src/tasks/create.ts b/src/tasks/create.ts
@@ -30,7 +30,7 @@ export default ({ application, cmd }: LisaType) => {
       if (args["from-git"]) {
         task.title = "";
         const fromGit = args["from-git"];
-        const targetDir = join(
+        const targetDir = workspace() || join(
           process.cwd(),
           await task.prompt({
             type: "Input",
@@ -42,7 +42,7 @@ export default ({ application, cmd }: LisaType) => {
         try {
           await cmd('git', ['clone', fromGit, targetDir], {
             stdio: 'inherit',
-          })  
+          })
         } catch (error: any) {
           process.exit(error.exitCode);
           // console.log(error)
@@ -129,11 +129,11 @@ export default ({ application, cmd }: LisaType) => {
 
         // 根据sampleListJson ux.select 嵌套
         application.debug(sampleListJson);
-
         const answers = await inquirer.prompt([
           {
             type: 'file-tree-selection',
             name: 'file',
+            message: '选择sample. (`左右键/空格键` 展开文件夹，`回车键` 确定选择)',
             root: join(sdk, 'samples'),
             onlyShowValid: true,
             validate: (item) => {
@@ -184,7 +184,7 @@ export default ({ application, cmd }: LisaType) => {
         }
       
         if (!val) {
-          throw new Error('请选择选项为[xx]的项目sample，例如: [hello_world]')
+          throw new Error('请选择选项为[xx]的项目sample，例如: [hello_world]。注意：`左右键/空格键` 展开文件夹，`回车键` 确定选择。')
         }
         from = selected;
       }
@@ -193,7 +193,6 @@ export default ({ application, cmd }: LisaType) => {
 
       // const selected = await promptDir([], sampleListJson, task);
       // const selectedSample = join(sdk, "samples", ...selected);
-
       const targetDir = workspace() || join(
         process.cwd(),
         await task.prompt({
diff --git a/src/tasks/environment.ts b/src/tasks/environment.ts
@@ -164,7 +164,7 @@ export default ({ application, cmd, got }: LisaType) => {
             env,
             cwd: manifestPath,
           });
-          await cmd("git", ["fetch", "origin", branchName], {
+          await cmd("git", ["pull", "origin", branchName], {
             stdio: "inherit",
             env,
             cwd: manifestPath,
diff --git a/src/tasks/sdk.ts b/src/tasks/sdk.ts
@@ -7,6 +7,8 @@ import { get } from "../env/config";
 import { zephyrVersion, sdkTag } from "../utils/sdk";
 import extendExec from "../utils/extendExec";
 const path7za = require('7zip-bin').path7za;
+import SDK from "../models/sdk";
+
 async function checkZephyrBase(ZEPHYR_BASE: string, westConfigPath: string) {
   if (!ZEPHYR_BASE) {
     return false;
@@ -21,6 +23,7 @@ export default ({ application, cmd, got, fs, cli }: LisaType) => {
     title: "SDK 设置",
     async task(_ctx, task) {
       task.title = "";
+      const Sdk = new SDK();
       const exec = extendExec(cmd, { task });
       const argv = application.argv as ParsedArgs;
       const args = argv._[1];
@@ -185,9 +188,13 @@ export default ({ application, cmd, got, fs, cli }: LisaType) => {
           throw new Error(`当前 SDK 已经在此分支`);
         }
         console.log(`正在为您切换分支（${tagName}）`);
-        await cmd("lisa", ["zep", "use-sdk", "--mr", tagName], {
-          stdio: "inherit",
-        });
+        try {
+          await Sdk.changeVersion(tagName);  
+        } catch (error: any) {
+          task.title = `SDK 版本切换失败`;  
+          throw Error(error ? error : `SDK 版本切换失败`);
+        }
+        task.title = `SDK 分支已切换到 ${tagName}`;
       }
       if (args === '7z') { 
         const addArgs = process.argv.slice(5);
diff --git a/src/tasks/west.ts b/src/tasks/west.ts
@@ -73,10 +73,15 @@ export default ({ application, cmd }: LisaType) => {
       const command = execArgs.shift();
       if (!command) return;
 
-      await cmd(command, execArgs, {
-        stdio: "inherit",
-        env: await getEnv(),
-      });
+      try {
+        await cmd(command, execArgs, {
+          stdio: "inherit",
+          env: await getEnv(),
+        });
+      } catch (error) {
+        task.title = 'exec exit';
+        throw new Error(`Command failed : ${command} ${execArgs.join(' ')}`)
+      }
 
       task.title = 'exec exit';
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@lisa-plugin/zephyr",`
`3`		`- "version": "1.6.4",`
	`3`	`+ "version": "1.6.5",`
`4`	`4`	`"description": "LISA plugin for Zephyr",`
`5`	`5`	`"main": "./lib/main.js",`
`6`	`6`	`"engines": {`