cc-codeline 1.0.2 → 1.0.4

package/README.md

@@ -3,4 +3,8 @@
 npm i -g cc-codeline
 
 codeline /path/
+
+-h  Show help
+-l  Print log
+-e  Exclude directory
 ```

package/bin.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 const fs = require('fs');
-const { join, extname } = require('path');
+const { extname, resolve } = require('path');
 
 const languages = {
 	'.js': {
@@ -43,31 +43,47 @@ const languages = {
 		comment: /\/\*[\s\S]+?\*\/|\/\/.*/g
 	},
 	'.py': {
-		comment: /'''[\s\S]+?'''/g
+		comment: /'''[\s\S]+?'''|#.*/g
 	}
 };
-let total = 0;
-let empty = 0;
-let source = 0;
-let comment = 0;
-let fileCount = 0;
 
 const param = process.argv.slice(2);
-const isLog = param.includes('-l');
-
-const base = process.cwd();
-const path = join(base, param[0] || '');
-
-(() => {
-	if (param.includes('-h')) {
-		console.log(`
-codeline /path/ -l
+if (param.includes('-h')) {
+	console.log(`
+codeline /path/ -l -e node_modules dist
 ------------------
 -h  Show help
 -l  Print log
+-e  Exclude directory
 		`);
-		return;
+	process.exit(0);
+}
+const base = process.cwd();
+const isLog = (() => {
+	const index = param.indexOf('-l');
+	if (index >= 0) {
+		param.splice(index, 1);
+		return true;
+	}
+	return false;
+})();
+
+const excludePath = (() => {
+	const index = param.findIndex(it => it == '-e');
+	if (index >= 0) {
+		return param.splice(index).map(it => resolve(base, it));
 	}
+})();
+
+const path = resolve(base, param[0] || '');
+
+let total = 0;
+let empty = 0;
+let source = 0;
+let comment = 0;
+let fileCount = 0;
+
+(() => {
 	try {
 		const stat = fs.statSync(path);
 		if (stat.isDirectory()) {
@@ -79,8 +95,8 @@ codeline /path/ -l
 				print()
 			});
 		}
-	} catch (_) {
-		console.log('Error, the path may not exist');
+	} catch (err) {
+		console.log(err.message || 'Error, the path may not exist');
 	}
 })();
 
@@ -95,10 +111,14 @@ function print() {
 }
 
 function readDirectory(dirPath, callback) {
+	if (excludePath && excludePath.includes(dirPath)) {
+		callback();
+		return;
+	}
 	let progress = 0;
 	fs.readdir(dirPath, (err, filenames) => {
 		if (err) {
-			console.log('Error reading directory');
+			console.log(err.message);
 			callback();
 			return;
 		}
@@ -107,7 +127,7 @@ function readDirectory(dirPath, callback) {
 			return;
 		}
 		for (let name of filenames) {
-			const filepath = join(dirPath, name);
+			const filepath = resolve(dirPath, name);
 			const fileStat = fs.statSync(filepath);
 			if (fileStat.isDirectory()) {
 				readDirectory(filepath, () => {
@@ -136,12 +156,14 @@ function readFile(filepath, callback) {
 	}
 	fs.readFile(filepath, (err, data) => {
 		if (err) {
-			console.log('Error reading file');
+			console.log(err.message);
 			callback();
 			return;
 		}
 
-		isLog && console.log(filepath);
+		if (isLog) {
+			console.log(filepath);
+		}
 
 		const content = data.toString();
 		fileCount += 1;

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "cc-codeline",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "bin.js",
   "description": "Quickly count your lines of code",
   "bin": {
     "codeline": "./bin.js"
   },
-  "keywords": ["codeline"],
+  "keywords": [
+    "codeline",
+    "cli"
+  ],
   "author": "",
   "license": "MIT",
   "type": "commonjs"
-}
+}