Better validate input

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [1.7.1]
+- Better validate input
+
 ## [1.7.0]
 - Supports input and output a `Buffer`
 - Remove temp folder usage, instead write directly to the output

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ozelot379/convert-minecraft-java-texture-to-bedrock",
   "productName": "ConvertMinecraftJavaTextureToBedrock",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "CLI version for convert Minecraft Java texture packs to Minecraft Bedrock texture packs",
   "keywords": [
     "Minecraft",

src/Converter/MetadataConverter.js

@@ -6,6 +6,13 @@ import uuid from "uuid/v4";
  * Class MetadataConverter
  */
 class MetadataConverter extends AbstractConverter {
+	/**
+	 * @returns {string}
+	 */
+	static get PACK_MCMETA() {
+		return "pack.mcmeta";
+	}
+
 	/**
 	 * @inheritDoc
 	 */
@@ -70,7 +77,7 @@ class MetadataConverter extends AbstractConverter {
 	 * @inheritDoc
 	 */
 	async* getData() {
-		const date = ["pack.mcmeta", "manifest.json", "bedrock_uuid_header", "bedrock_uuid_module"];
+		const date = [this.constructor.PACK_MCMETA, "manifest.json", "bedrock_uuid_header", "bedrock_uuid_module"];
 
 		yield date;
 	}

src/Input/index.js

@@ -2,6 +2,7 @@ import AbstractInput from "./AbstractInput";
 import BufferInput from "./BufferInput";
 import FolderInput from "./FolderInput";
 import fs from "fs-extra";
+import MetadataConverter from "../Converter/MetadataConverter";
 import path from "path";
 import ZipInput from "./ZipInput";
 
@@ -33,14 +34,23 @@ async function detectInput(input) {
 		throw new Error(`The input ${input} does not exists!`);
 	}
 
+	if (fs.statSync(input).isDirectory()) {
+		if (!fs.existsSync(path.join(input, MetadataConverter.PACK_MCMETA))) { // Prevents copy whole wrong folders
+			throw new Error(`Invalid folder input ${input} - Missing ${MetadataConverter.PACK_MCMETA}!`);
+		}
+
+		return new FolderInput(input);
+	}
+
+
 	const ext = path.extname(input).toLowerCase().substr(1);
 
 	switch (ext) {
 		case "zip":
 			return new ZipInput(input);
 
 		default:
-			return new FolderInput(input);
+			throw new Error(`The input ${input} is no zip archive or folder!`);
 	}
 }
 

src/cli.js

@@ -33,7 +33,7 @@ import yargs from "yargs";
 			verbose: argv.verbose
 		});
 	} catch (err) {
-		console.error(err);
+		console.error(err.message);
 
 		process.exit(1);
 	}