cli: input argument takes precedence over stdin

Author: JohannesKaufmann

cli/html2markdown/cmd/exec.go

@@ -134,7 +134,6 @@ func (cli *CLI) run() ([]error, error) {
 	}
 
 	if len(cli.config.args) != 0 {
-
 		return nil, NewCLIError(
 			fmt.Errorf("unknown arguments: %s", strings.Join(cli.config.args, " ")),
 			Paragraph("Here is how you can use the CLI:"),

cli/html2markdown/cmd/exec_test.go

@@ -493,7 +493,7 @@ func TestExecute(t *testing.T) {
 				modeStderr: modePipe,
 
 				inputStdin: []byte("<strong>stdin content</strong>"),
-				inputArgs:  []string{"html2markdown", "--input", filepath.Join(directoryPath, "website_a.html")},
+				inputArgs:  []string{"html2markdown", "--input", filepath.Join(directoryPath, "input", "website_a.html")},
 			},
 		},
 		{

cli/html2markdown/cmd/io_input.go

@@ -25,25 +25,11 @@ func fileNameWithoutExtension(fileName string) string {
 var defaultBasename = "output"
 
 func (cli *CLI) listInputs() ([]*input, error) {
-	if cli.isStdinPipe && cli.config.inputFilepath != "" {
-		return nil, NewCLIError(
-			fmt.Errorf("cannot use both stdin and --input at the same time. Use either stdin or specify an input file, but not both"),
-		)
-	}
-
-	if cli.isStdinPipe {
-		data, err := io.ReadAll(cli.Stdin)
-		if err != nil {
-			return nil, err
-		}
-		return []*input{
-			{
-				inputFullFilepath: defaultBasename,
-				data:              data,
-			},
-		}, nil
-	}
 
+	// NOTE: When both stdin and --input are specified,
+	// the explicit --file argument takes precedence.
+	// This improves interoperability with other tools like `xargs`.
+	// https://github.com/JohannesKaufmann/html-to-markdown/issues/170
 	if cli.config.inputFilepath != "" {
 		matches, err := doublestar.FilepathGlob(cli.config.inputFilepath, doublestar.WithFilesOnly(), doublestar.WithNoFollow())
 		if err != nil {
@@ -78,6 +64,19 @@ func (cli *CLI) listInputs() ([]*input, error) {
 		return inputs, nil
 	}
 
+	if cli.isStdinPipe {
+		data, err := io.ReadAll(cli.Stdin)
+		if err != nil {
+			return nil, err
+		}
+		return []*input{
+			{
+				inputFullFilepath: defaultBasename,
+				data:              data,
+			},
+		}, nil
+	}
+
 	return nil, NewCLIError(
 		fmt.Errorf("the html input should be piped into the cli"),
 		Paragraph("Here is how you can use the CLI:"),

cli/html2markdown/cmd/testdata/TestExecute/[files]_both_stdin_and_file/stderr.golden

@@ -1,3 +0,0 @@
-
-error: cannot use both stdin and --input at the same time. Use either stdin or specify an input file, but not both
-

cli/html2markdown/cmd/testdata/TestExecute/[files]_both_stdin_and_file/stdout.golden

@@ -0,0 +1 @@
+**file content A**