fix #147

Author: FredHappyface

licensecheck/io/cli.py

@@ -32,7 +32,7 @@ def cli() -> None:  # pragma: no cover
 	parser.add_argument(
 		"--format",
 		"-f",
-		help=f"Output format. one of: {', '.join(set(fmt.formatMap))}. default=simple",
+		help=f"Output format. one of: {', '.join(x.value for x in fmt.FMT)}. default=simple",
 	)
 	parser.add_argument(
 		"--requirements-paths",
@@ -84,7 +84,7 @@ def cli() -> None:  # pragma: no cover
 	)
 	parser.add_argument(
 		"--skip-dependencies",
-		help="set of packages/dependencies to skip (this sets the 'compatability' to True)",
+		help="set of packages/dependencies to skip (this sets the 'compatibility' to True)",
 		nargs="+",
 	)
 	parser.add_argument(
@@ -109,6 +109,9 @@ def cli() -> None:  # pragma: no cover
 	)
 	args = vars(parser.parse_args())
 
+	if args.get("format", "simple") not in fmt.FMT:
+		args["format"] = "simple"
+
 	stdin_path = Path("__stdin__")
 	if not args.get("requirements_paths"):
 		if stdin.isatty():
@@ -182,11 +185,10 @@ def main(licensecheckConf: LC_Config) -> int:
 		)
 		raise ValueError(msg)
 
-	format_ = licensecheckConf.format or "simple"
-	if licensecheckConf.format in fmt.formatMap:
+	if licensecheckConf.format in fmt.FMT:
 		print(
 			fmt.fmt(
-				format_,
+				licensecheckConf.format,
 				this_license,
 				sorted(depsWithLicenses),
 				hide_output_parameters,

licensecheck/io/fmt.py

@@ -40,6 +40,7 @@
 from __future__ import annotations
 
 import csv
+from enum import StrEnum, auto
 import json
 import re
 from collections import OrderedDict
@@ -326,11 +327,19 @@ def fmt(
 	return formatMap.get(format_, plainText)(myLice, pkgs)
 
 
+class FMT(StrEnum):
+	json = auto()
+	markdown = auto()
+	html = auto()
+	csv = auto()
+	ansi = auto()
+	simple = auto()
+
 formatMap = {
-	"json": raw,
-	"markdown": markdown,
-	"html": html,
-	"csv": rawCsv,
-	"ansi": ansi,
-	"simple": plainText,
+	FMT.json: raw,
+	FMT.markdown: markdown,
+	FMT.html: html,
+	FMT.csv: rawCsv,
+	FMT.ansi: ansi,
+	FMT.simple: plainText,
 }

licensecheck/models/config.py

@@ -3,14 +3,14 @@
 from dataclasses import field
 
 from licensecheck.models.defaultonnone import DefaultOnNoneModel
-
+from licensecheck.io.fmt import FMT
 
 class LC_Config(DefaultOnNoneModel):
 	"""LC_Config type."""
 
 	file: str = ""
 	license: str = ""
-	format: str = ""
+	format: FMT = FMT.simple
 	pypi_api: str = ""
 	show_only_failing: bool = False
 	zero: bool = False