refactor: update fs and brotli commands

Author: ITboo

src/app/dispatcher.js

@@ -1,12 +1,10 @@
 import * as COMMAND from '../commands/commandList.js'
-import { BYE_MSG, OPERATION_FAILED, THANK_MSG } from '../common/messages.js';
+import { BYE_MSG, OPERATION_FAILED, THANK_MSG, compress_success, decompress_success } from '../common/messages.js';
 import { consoleColors } from '../utils/consoleColors.js';
 import { parseInput } from './parser.js';
 
-
 export const handleCommands = async (line) => {
     const { command, params } = parseInput(line);
-    // ! refactor switch-case
     switch (command) {
         case '.exit':
             console.log(consoleColors.yellow, `${THANK_MSG}${BYE_MSG}`);
@@ -48,10 +46,12 @@ export const handleCommands = async (line) => {
             await COMMAND.calculateHash(...params);
             break;
         case 'compress':
-            await COMMAND.compress(...params);
+            await COMMAND.brotli('compress', ...params);
+            console.log(consoleColors.green, compress_success)
             break;
         case 'decompress':
-            await COMMAND.decompress(...params);
+            await COMMAND.brotli('decompress', ...params);
+            console.log(consoleColors.green, decompress_success)
             break;
         default:
             console.log(consoleColors.red, OPERATION_FAILED);

src/app/parser.js

@@ -1,3 +1,5 @@
+import { INVALID_PARAM } from "../common/messages.js";
+
 export const parseInput = (line) => {
     const trimmedInput = line.trim();
     const [command] = trimmedInput.split(' ');
@@ -13,36 +15,20 @@ export const parseInput = (line) => {
 
 const separateParams = (paramsLine) => {
     let params = [];
-
-    const lineTrimmed = paramsLine.trim();
-
-    if (!lineTrimmed.length) return params;
-
-    const firstSymbol = lineTrimmed.slice(0, 1);
-
-    if (firstSymbol === "'" || firstSymbol === '"') {
-        const paramEnd = lineTrimmed.indexOf(firstSymbol, 1);
-
-        if (paramEnd === -1) {
-            throw new Error('Invalid param');
-        }
-
-        const param = lineTrimmed.slice(1, paramEnd);
-
-        if (param.includes('"') || param.includes("'")) {
-            throw new Error('Invalid param');
-        }
-
-        const rest = lineTrimmed.slice(paramEnd + 1);
+    const trimmedLine = paramsLine.trim();
+    if (!trimmedLine.length) return params;
+    const first = trimmedLine.slice(0, 1);
+    if (first === "'" || first === '"') {
+        const end = trimmedLine.indexOf(first, 1);
+        if (end === -1) throw new Error(INVALID_PARAM);
+        const param = trimmedLine.slice(1, end);
+        if (param.includes('"') || param.includes("'")) throw new Error(INVALID_PARAM)
+        const rest = trimmedLine.slice(end + 1);
         params.push(param, ...separateParams(rest));
     } else {
-        const [param] = lineTrimmed.split(' ');
-
-        if (param.includes('"') || param.includes("'")) {
-            throw new Error('Invalid param');
-        }
-
-        params.push(param, ...separateParams(lineTrimmed.slice(param.length)));
+        const [param] = trimmedLine.split(' ');
+        if (param.includes('"') || param.includes("'")) throw new Error(INVALID_PARAM);
+        params.push(param, ...separateParams(trimmedLine.slice(param.length)));
     }
 
     return params;

src/commands/commandList.js

@@ -14,8 +14,7 @@ export { os } from './os/os.js';
 //HASH
 export { calculateHash } from './hash/hash.js';
 //ZIP
-export { compress } from './zip/compress.js';
-export { decompress } from './zip/decompress.js';
+export { brotli } from './zip/brotli.js';
 //HELP
 export { printHelp } from './help/help.js';
 

src/commands/fs/cp.js

@@ -1,6 +1,23 @@
 import { createReadStream, createWriteStream } from 'fs';
-import { basename, join } from 'path';
+import { resolve as pathResolve, basename } from 'path';
 
-export const cp = async (command) => {
-   console.log('ll')
-};
+export const cp = async (path, newPath) => {
+   const fileToCopyPath = pathResolve(process.cwd(), path);
+   const fileName = basename(fileToCopyPath);
+   const dirToWritePath = pathResolve(process.cwd(), newPath);
+   const fileToWritePath = pathResolve(dirToWritePath, fileName);
+   try {
+      await new Promise(async (res, rej) => {
+         const fileToCopy = createReadStream(fileToCopyPath, { encoding: 'utf8' });
+         const fileToWrite = createWriteStream(fileToWritePath, {
+            flags: 'wx',
+         });
+
+         fileToCopy.pipe(fileToWrite);
+         fileToCopy.on('error', rej);
+         fileToCopy.on('end', res);
+      });
+   } catch (error) {
+      throw error;
+   }
+}

src/commands/fs/mv.js

@@ -1,7 +1,7 @@
 import { cp } from "./cp.js"
 import { remove } from "./rm.js"
 
-export const mv = async (command) => {
-    await cp(command);
-    await remove(command);
+export const mv = async (...params) => {
+    await cp(...params);
+    await remove(...params);
 }

src/commands/fs/rm.js

@@ -7,5 +7,5 @@ import { rm_success } from '../../common/messages.js';
 export const remove = async (path) => {
     const filePath = resolve(cwd(), path);
     await rmFile(filePath);
-    console.log(rm_success);
+
 };

src/commands/fs/rn.js

@@ -1,14 +1,10 @@
 import { rename } from 'fs/promises';
 import { resolve } from 'path';
 import { cwd } from 'process';
-
 import { rn_success } from '../../common/messages.js';
 
 export const rn = async (currentName, newName) => {
     const filePath = resolve(cwd(), currentName);
     const newFile = resolve(cwd(), newName);
     await rename(filePath, newFile);
-    if (rename){
-        console.log(rn_success);
-    }
 };

src/commands/zip/brotli.js

@@ -0,0 +1,33 @@
+import { createReadStream, createWriteStream } from 'fs';
+import { resolve, basename, parse } from 'path';
+import { createBrotliDecompress, createBrotliCompress } from 'zlib';
+
+export const brotli = async (option, path, newPath) => {
+    const EXT = 'br';
+  try {
+    const needCompress = option === 'compress';
+
+    const fileToConvertPath = resolve(process.cwd(), path);
+
+    const baseName = basename(fileToConvertPath);
+    const fileName = parse(baseName).name;
+
+    const fileNameToWrite = needCompress ? `${baseName}.${EXT}` : fileName;
+    const dirToWritePath = resolve(process.cwd(), newPath);
+    const fileToWritePath = resolve(dirToWritePath, fileNameToWrite);
+
+    await new Promise((res, rej) => {
+      const fileToConvert = createReadStream(fileToConvertPath);
+      const fileToWrite = createWriteStream(fileToWritePath, { flags: 'wx',});
+
+      const brotliHandler = needCompress ? createBrotliCompress() : createBrotliDecompress();
+
+      fileToConvert.pipe(brotliHandler).pipe(fileToWrite);
+      fileToConvert.on('error', rej);
+      fileToConvert.on('end', res);
+    });
+  } catch (err) {
+    throw err;
+  }
+};
+