Implement support for multiple arguments including files #6

README.md

@@ -1,9 +1,9 @@
 licensechecker (lc)
 -------------------
-`lc` is a command line tool that recursively iterates over a supplied directory
+`lc` is a command line tool that recursively iterates over a supplied directory or file 
 attempting to identify what software license each file is under using the list
 of licenses supplied by the SPDX (Software Package Data Exchange) Project. It will pick up 
-license files named appropiateld or inline licenses such as the below in source files
+license files named appropiately or inline licenses such as the below in source files
 
 `SPDX-License-Identifier: GPL-3.0-only`
 
@@ -98,6 +98,23 @@ Or to a SPDX 2.1 file
 $lc -f spdx -o spdx_example.spdx --pbl .git,vendor,licenses -dn licensechecker -pn licensechecker .
 ```
 
+You can specify multiple directories as additional arguments and all results will be merged into a single output
+
+```
+$ lc -f tabular ./examples/identifier ./scripts
+```
+
+You can also specify files and directories as additional arguments 
+
+```
+$ lc -f tabular README.md LICENSE ./examples/identifier
+Directory              File               License                        Confidence  Size
+                       README.md          NOASSERTION                    100.00%     8K
+                       LICENSE            GPL-3.0-only                   99.68%      34.3K
+./examples/identifier  LICENSE            GPL-3.0+ AND MIT               95.40%      1K
+./examples/identifier  LICENSE2           MIT AND GPL-3.0+               99.65%      35K
+./examples/identifier  has_identifier.py  (MIT OR GPL-3.0+) AND GPL-2.0  100.00%     428B
+```
 
 ### SPDX
 
@@ -113,7 +130,7 @@ This SPDX Document is valid.
 
 ### Package
 
-Run go build for windows and linux then the following in linux
+Run go build for windows and linux then the following in linux, keep in mind need to update the version
 
 ```
 zip -r9 lc-1.0.0-x86_64-pc-windows.zip lc.exe && zip -r9 lc-1.0.0-x86_64-unknown-linux.zip lc

main.go

@@ -16,7 +16,7 @@ func main() {
 	app.Name = parsers.ToolName
 	app.Version = parsers.ToolVersion
 	app.Usage = "Check directory for licenses and list what license(s) a file is under"
-	app.UsageText = "lc [global options] [DIRECTORY]"
+	app.UsageText = "lc [global options] [DIRECTORY|FILE] [DIRECTORY|FILE]"
 
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
@@ -85,7 +85,7 @@ func main() {
 		},
 	}
 	app.Action = func(c *cli.Context) error {
-		parsers.DirPath = c.Args().Get(0)
+		parsers.DirFilePaths = c.Args()
 		parsers.Process()
 		return nil
 	}

parsers/guesser.go

@@ -20,13 +20,13 @@ import (
 
 // Shared all over the place
 var ToolName = "licensechecker"
-var ToolVersion = "1.0.1"
+var ToolVersion = "1.0.2"
 
 // Set by user as command line arguments
 var confidence = 0.0
 var Confidence = ""
 var PossibleLicenceFiles = ""
-var DirPath = "."
+var DirFilePaths = []string{}
 var PathBlacklist = ""
 var deepGuess = true
 var DeepGuess = ""
@@ -340,16 +340,23 @@ func Process() {
 
 	fileResults := []FileResult{}
 
-	if DirPath == "" {
-		DirPath = "."
+	if len(DirFilePaths) == 0 {
+		DirFilePaths = append(DirFilePaths, ".")
 	}
 
-	if info, err := os.Stat(DirPath); err == nil && info.IsDir() {
-		fileResults = walkDirectory(DirPath, [][]LicenseMatch{})
-	} else {
-		fmt.Println("Argument " + DirPath + " should be a directory not a file")
-	}
+	for _, fileDirectory := range DirFilePaths {
+		if info, err := os.Stat(fileDirectory); err == nil && info.IsDir() {
+			fileResults = append(fileResults, walkDirectory(fileDirectory, [][]LicenseMatch{})...)
+		} else {
+			directory, file := filepath.Split(fileDirectory)
+			fileResult := processFile(directory, file, []LicenseMatch{})
+			fileResults = append(fileResults, fileResult)
 
+			if strings.ToLower(Format) == "progress" {
+				toProgress(directory, file, []LicenseMatch{}, fileResult.LicenseGuesses, fileResult.LicenseIdentified)
+			}
+		}
+	}
 	s.Stop()
 
 	switch strings.ToLower(Format) {