oipage 1.5.0 → 1.6.0-alpha.1

package/CHANGELOG

@@ -114,4 +114,16 @@ v1.5.0:
             * 图片转PDF
           2、API功能（Node.js）
             * disk 磁盘相关操作
-            （包括：moveDisk、listDisk）
+            （包括：moveDisk、listDisk）
+v1.6.0:
+    date:
+    changes:
+        - 新增功能
+          1、命令（oipage-cli）
+            * disk 
+                --link 创建磁盘链接
+                --delempty 删除空文件夹 
+            * network 网络相关
+          2、API功能（Node.js）
+            * disk 磁盘相关操作
+            （包括：linkDisk）

package/bin/disk.js

@@ -1,4 +1,6 @@
-const { deleteDisk, copyDisk, moveDisk } = require("../nodejs/disk");
+const { join } = require("path");
+const { deleteDisk, copyDisk, moveDisk, linkDisk } = require("../nodejs/disk");
+const deleteEmptyFolder = require("./tools/deleteEmptyFolder");
 
 module.exports = function (config) {
     let isForce = false;
@@ -27,5 +29,15 @@ module.exports = function (config) {
         else if (config.value[i].name === "--copy") {
             copyDisk(config.value[i].value[0], config.value[i].value[1], isForce);
         }
+
+        // 创建磁盘链接
+        else if (config.value[i].name === "--link") {
+            linkDisk(config.value[i].value[0], config.value[i].value[1], isForce);
+        }
+
+        // 删除空文件夹
+        else if (config.value[i].name === "--delempty") {
+            deleteEmptyFolder(join(process.cwd(), config.value[i].value[0]));
+        }
     }
 };

package/bin/help.js

@@ -15,11 +15,16 @@ OIPage@v${packageValue.version}
 【2】oipage-cli disk 磁盘操作
     --force|-f 强制执行
     --delete|-d 删除文件或文件夹
-    --move|m 移动文件或文件夹
+    --delempty 删除空文件夹
+    --move|-m 移动文件或文件夹
     --copy|-c 复制文件或文件夹
+    --link|-l 创建磁盘链接
 
 【3】oipage-cli run "任务一" "任务二" ... 运行多命令
 
+【4】oipage-cli network 网络相关
+    --log 打印网络信息
+
 Powered by https://github.com/zxl20070701
 \x1b[0m`);
 

package/bin/network.js

@@ -0,0 +1,22 @@
+const networkInfo = require("./tools/network");
+
+module.exports = function (config) {
+    let info = networkInfo(true);
+
+    // 执行一个个任务
+    for (let i = 0; i < config.value.length; i++) {
+
+        // 打印信息
+        if (config.value[i].name === "--log") {
+
+            for (let iptype of ["IPv4", "IPv6"]) {
+                console.log("\n" + iptype);
+                for (let i = 0; i < info[iptype].length; i++) {
+                    console.log("  \x1b[1m\x1b[32m" + info[iptype][i].address + "\x1b[0m  " + info[iptype][i].mac);
+                }
+            }
+
+            console.log("");
+        }
+    }
+};

package/bin/run

@@ -56,7 +56,8 @@ else if (process.argv[2] === "disk") {
         "-f": "--force",
         "-d": "--delete",
         "-m": "--move",
-        "-c": "--copy"
+        "-c": "--copy",
+        "-l": "--link"
     }, true);
 
     require("./disk.js")(argvObj);
@@ -93,6 +94,14 @@ else if (process.argv[2] === "run") {
 
 }
 
+// 网络相关
+else if (process.argv[2] === "network") {
+
+    let argvObj = formatArgv(process.argv, {}, true);
+
+    require("./network.js")(argvObj);
+}
+
 // 默认，帮助
 else {
     require("./help.js")();

package/bin/tools/deleteEmptyFolder.js

@@ -0,0 +1,24 @@
+const { readdirSync, lstatSync, rmdirSync } = require("fs");
+const { join } = require("path");
+
+module.exports = function (rootPath) {
+    (function deleteEmptyFolder(folderPath) {
+        let subItems = readdirSync(folderPath);
+        if (subItems.length > 0) {
+            for (let i = 0; i < subItems.length; i++) {
+                let itemPath = join(folderPath, subItems[i]);
+                if (lstatSync(itemPath).isDirectory()) deleteEmptyFolder(itemPath);
+            }
+        } else {
+            rmdirSync(folderPath);
+
+            folderPath = join(folderPath, "..");
+            while (folderPath.length >= rootPath.length) {
+                subItems = readdirSync(folderPath);
+                if (readdirSync(folderPath).length > 0) break;
+                rmdirSync(folderPath);
+                folderPath = join(folderPath, "..");
+            }
+        }
+    })(params.path);
+};

package/bin/tools/network.js

@@ -1,7 +1,7 @@
 const { networkInterfaces } = require("os");
 
 // 网络信息
-module.exports = function () {
+module.exports = function (isAll) {
 
     let infomation = {
         IPv4: [],
@@ -15,8 +15,8 @@ module.exports = function () {
     for (let typeName in networks) {
         let network = networks[typeName]
         for (let index = 0; index < network.length; index++) {
-            if (network[index].mac != "00:00:00:00:00:00") {
-                if (network[index].family == 'IPv4' && network[index].address != '127.0.0.1') {
+            if (network[index].mac != "00:00:00:00:00:00" || isAll) {
+                if (network[index].family == 'IPv4' && (network[index].address != '127.0.0.1' || isAll)) {
                     if (!IPv4Had[network[index].mac]) {
                         infomation.IPv4.push({
                             address: network[index].address,

package/nodejs/animation/index.js

@@ -1,5 +1,5 @@
 /*!
-* animation of OIPage v1.5.0
+* animation of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/cmdlog/index.js

@@ -1,5 +1,5 @@
 /*!
-* cmdlog of OIPage v1.5.0
+* cmdlog of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/disk/index.d.ts

@@ -36,4 +36,13 @@ export interface listDiskType {
     }) => void): void
 }
 
-export let listDisk: listDiskType
+export let listDisk: listDiskType
+
+/**
+ * 创建文件或文件夹的链接
+ */
+export interface linkDiskType {
+    (sourcePath: string, targetPath: string): void
+}
+
+export let linkDisk: linkDiskType

package/nodejs/disk/index.js

@@ -1,10 +1,11 @@
 /*!
-* disk of OIPage v1.5.0
+* disk of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
 const { join } = require("path");
-const { existsSync, readdirSync, lstatSync, unlinkSync, rmdirSync, mkdirSync, copyFileSync } = require("fs");
+const { existsSync, readdirSync, lstatSync, unlinkSync, rmdirSync, mkdirSync, copyFileSync, symlinkSync } = require("fs");
+const { execSync } = require("child_process");
 
 /**
  * 删除文件或文件夹
@@ -156,8 +157,19 @@ function listDisk(sourcePath, callback) {
             "folder": folder
         });
     }
+}
+
+/**
+ * 软链接文件或文件夹
+ * @param {*} sourcePath 
+ * @param {*} targetPath 
+ */
+function linkDisk(sourcePath, targetPath) {
+    const type = lstatSync(sourcePath).isDirectory() ? 'junction' : 'file';
+    symlinkSync(sourcePath, targetPath, type);
 }
 exports.deleteDisk = deleteDisk;
 exports.copyDisk = copyDisk;
 exports.moveDisk = moveDisk;
 exports.listDisk = listDisk;
+exports.linkDisk = linkDisk;

package/nodejs/format/index.js

@@ -1,5 +1,5 @@
 /*!
-* format of OIPage v1.5.0
+* format of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/json/index.js

@@ -1,5 +1,5 @@
 /*!
-* json of OIPage v1.5.0
+* json of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 const {reader} = require("../reader/index.js");

package/nodejs/logform/index.js

@@ -1,5 +1,5 @@
 /*!
-* logform of OIPage v1.5.0
+* logform of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 const {linelog} = require("../cmdlog/index.js");

package/nodejs/reader/index.js

@@ -1,5 +1,5 @@
 /*!
-* reader of OIPage v1.5.0
+* reader of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/throttle/index.js

@@ -1,5 +1,5 @@
 /*!
-* throttle of OIPage v1.5.0
+* throttle of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oipage",
-  "version": "1.5.0",
+  "version": "1.6.0-alpha.1",
   "description": "前端网页或应用快速开发助手，包括开发服务器、辅助命令、实用API等",
   "sideEffects": false,
   "scripts": {

package/web/XMLHttpRequest/index.js

@@ -1,5 +1,5 @@
 /*!
-* XMLHttpRequest of OIPage v1.5.0
+* XMLHttpRequest of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/animation/index.js

@@ -1,5 +1,5 @@
 /*!
-* animation of OIPage v1.5.0
+* animation of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/format/index.js

@@ -1,5 +1,5 @@
 /*!
-* format of OIPage v1.5.0
+* format of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/json/index.js

@@ -1,5 +1,5 @@
 /*!
-* json of OIPage v1.5.0
+* json of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 import {reader} from "../reader/index.js";

package/web/onReady/index.js

@@ -1,5 +1,5 @@
 /*!
-* onReady of OIPage v1.5.0
+* onReady of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/performChunk/index.js

@@ -1,5 +1,5 @@
 /*!
-* performChunk of OIPage v1.5.0
+* performChunk of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/reader/index.js

@@ -1,5 +1,5 @@
 /*!
-* reader of OIPage v1.5.0
+* reader of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/style/index.js

@@ -1,5 +1,5 @@
 /*!
-* style of OIPage v1.5.0
+* style of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/throttle/index.js

@@ -1,5 +1,5 @@
 /*!
-* throttle of OIPage v1.5.0
+* throttle of OIPage v1.6.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */