coco/support for installing fonts #831

coco-super · 2020-03-27T05:45:58Z

tanhe123 · 2020-03-27T11:32:56Z

src/lib/nas/cp/file.js

+async function isNotEmptyDir(path) {
+  const lstat = await fs.lstat(path);
+  if (lstat.isDirectory()) {
+    const dirs = await fs.readdir(path);
+    if (!_.isEmpty(dirs)) {
+      return true;
+    }
+  }
+  return false;
+}


return !await isEmptyDir(path)

tanhe123 · 2020-03-27T11:34:58Z

src/lib/fc.js

+  const absCodeUri = path.resolve(baseDir, codeUri);
+  const fontsDir = path.join(absCodeUri, 'fonts');
+
+  if (!await fs.pathExists(fontsDir) || !await isNotEmptyDir(fontsDir)) { return {}; }


!await isNotEmptyDir(fontsDir) 不就等于 await isEmptyDir(fontsDir)？后者已经有这个方法了吧

添加了注释仅当路径为目录且目录下有文件是返回 ture

tanhe123 · 2020-03-27T11:38:26Z

src/bin/fun-install.js

@@ -37,6 +37,8 @@ program
  .description('install dependencies which are described in fun.yml file.')
  .action(async (packageNames, program) => {


这里不要写 .action 的方式了，commander 5.0 应该是有改动，可以把这个逻辑放到 if (!program.args.length) { 的 else 条件里

tanhe123 · 2020-03-27T11:38:34Z

src/bin/fun-install.js

@@ -37,6 +37,8 @@ program
  .description('install dependencies which are described in fun.yml file.')
  .action(async (packageNames, program) => {

+    if (_.isEmpty(packageNames)) { return; }


这个就不需要了

tanhe123 · 2020-03-27T11:39:12Z

src/lib/fc.js

@@ -171,14 +172,19 @@ const CUSTOM_RUNTIME_JAVA_MAPPING = {
  'pathSuffix': '*'
 };

+const FONTS__MAPPING = {


多了一个下划线吧

tanhe123 · 2020-03-27T11:47:14Z

src/lib/fc.js

@@ -983,6 +992,39 @@ function generateNasAndVpcConfig(mountTarget, securityGroupId, serviceName) {
  };
 }

+function writeFileToLine(filePath, content, lineNum) {
+  let data = fs.readFileSync(filePath, 'utf8').split(/\r\n|\n|\r/gm);


coco/support for installing fonts

db2142a

coco-super force-pushed the coco/support-for-installing-fonts branch from 292b98c to db2142a Compare March 27, 2020 06:58

tanhe123 suggested changes Mar 27, 2020

View reviewed changes

coco-super added 2 commits March 27, 2020 21:40

fix

73eaa9d

trivals again

73cb1bc

tanhe123 merged commit 4336c92 into alibaba:master Mar 27, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

coco/support for installing fonts #831

coco/support for installing fonts #831

coco-super commented Mar 27, 2020

tanhe123 Mar 27, 2020

tanhe123 Mar 27, 2020

coco-super Mar 27, 2020

tanhe123 Mar 27, 2020

tanhe123 Mar 27, 2020

tanhe123 Mar 27, 2020

coco-super Mar 27, 2020

tanhe123 Mar 27, 2020

coco-super Mar 27, 2020

		@@ -37,6 +37,8 @@ program
		.description('install dependencies which are described in fun.yml file.')
		.action(async (packageNames, program) => {

coco/support for installing fonts #831

coco/support for installing fonts #831

Conversation

coco-super commented Mar 27, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment