Improved file-not-found handling (#1508)

johnkerl · Feb 26, 2024 · aff4b9f · aff4b9f
1 parent 3201f9c
commit aff4b9f
Show file tree

Hide file tree

Showing 43 changed files with 85 additions and 61 deletions.
diff --git a/pkg/input/record_reader_csv.go b/pkg/input/record_reader_csv.go
@@ -65,8 +65,9 @@ func (reader *RecordReaderCSV) Read(
 			)
 			if err != nil {
 				errorChannel <- err
+			} else {
+				reader.processHandle(handle, "(stdin)", &context, readerChannel, errorChannel, downstreamDoneChannel)
 			}
-			reader.processHandle(handle, "(stdin)", &context, readerChannel, errorChannel, downstreamDoneChannel)
 		} else {
 			for _, filename := range filenames {
 				handle, err := lib.OpenFileForRead(

diff --git a/pkg/input/record_reader_csvlite.go b/pkg/input/record_reader_csvlite.go
@@ -94,16 +94,16 @@ func (reader *RecordReaderCSVLite) Read(
 			)
 			if err != nil {
 				errorChannel <- err
-				return
+			} else {
+				reader.processHandle(
+					handle,
+					"(stdin)",
+					&context,
+					readerChannel,
+					errorChannel,
+					downstreamDoneChannel,
+				)
 			}
-			reader.processHandle(
-				handle,
-				"(stdin)",
-				&context,
-				readerChannel,
-				errorChannel,
-				downstreamDoneChannel,
-			)
 		} else {
 			for _, filename := range filenames {
 				handle, err := lib.OpenFileForRead(
@@ -114,17 +114,17 @@ func (reader *RecordReaderCSVLite) Read(
 				)
 				if err != nil {
 					errorChannel <- err
-					return
+				} else {
+					reader.processHandle(
+						handle,
+						filename,
+						&context,
+						readerChannel,
+						errorChannel,
+						downstreamDoneChannel,
+					)
+					handle.Close()
 				}
-				reader.processHandle(
-					handle,
-					filename,
-					&context,
-					readerChannel,
-					errorChannel,
-					downstreamDoneChannel,
-				)
-				handle.Close()
 			}
 		}
 	}

diff --git a/pkg/input/record_reader_dkvp_nidx.go b/pkg/input/record_reader_dkvp_nidx.go
@@ -68,8 +68,9 @@ func (reader *RecordReaderDKVPNIDX) Read(
 			)
 			if err != nil {
 				errorChannel <- err
+			} else {
+				reader.processHandle(handle, "(stdin)", &context, readerChannel, errorChannel, downstreamDoneChannel)
 			}
-			reader.processHandle(handle, "(stdin)", &context, readerChannel, errorChannel, downstreamDoneChannel)
 		} else {
 			for _, filename := range filenames {
 				handle, err := lib.OpenFileForRead(

diff --git a/pkg/input/record_reader_json.go b/pkg/input/record_reader_json.go
@@ -45,8 +45,9 @@ func (reader *RecordReaderJSON) Read(
 			)
 			if err != nil {
 				errorChannel <- err
+			} else {
+				reader.processHandle(handle, "(stdin)", &context, readerChannel, errorChannel, downstreamDoneChannel)
 			}
-			reader.processHandle(handle, "(stdin)", &context, readerChannel, errorChannel, downstreamDoneChannel)
 		} else {
 			for _, filename := range filenames {
 				handle, err := lib.OpenFileForRead(

diff --git a/pkg/input/record_reader_pprint.go b/pkg/input/record_reader_pprint.go
@@ -98,16 +98,16 @@ func (reader *RecordReaderPprintBarredOrMarkdown) Read(
 			)
 			if err != nil {
 				errorChannel <- err
-				return
+			} else {
+				reader.processHandle(
+					handle,
+					"(stdin)",
+					&context,
+					readerChannel,
+					errorChannel,
+					downstreamDoneChannel,
+				)
 			}
-			reader.processHandle(
-				handle,
-				"(stdin)",
-				&context,
-				readerChannel,
-				errorChannel,
-				downstreamDoneChannel,
-			)
 		} else {
 			for _, filename := range filenames {
 				handle, err := lib.OpenFileForRead(
@@ -118,17 +118,17 @@ func (reader *RecordReaderPprintBarredOrMarkdown) Read(
 				)
 				if err != nil {
 					errorChannel <- err
-					return
+				} else {
+					reader.processHandle(
+						handle,
+						filename,
+						&context,
+						readerChannel,
+						errorChannel,
+						downstreamDoneChannel,
+					)
+					handle.Close()
 				}
-				reader.processHandle(
-					handle,
-					filename,
-					&context,
-					readerChannel,
-					errorChannel,
-					downstreamDoneChannel,
-				)
-				handle.Close()
 			}
 		}
 	}

diff --git a/pkg/input/record_reader_tsv.go b/pkg/input/record_reader_tsv.go
@@ -76,16 +76,16 @@ func (reader *RecordReaderTSV) Read(
 			)
 			if err != nil {
 				errorChannel <- err
-				return
+			} else {
+				reader.processHandle(
+					handle,
+					"(stdin)",
+					&context,
+					readerChannel,
+					errorChannel,
+					downstreamDoneChannel,
+				)
 			}
-			reader.processHandle(
-				handle,
-				"(stdin)",
-				&context,
-				readerChannel,
-				errorChannel,
-				downstreamDoneChannel,
-			)
 		} else {
 			for _, filename := range filenames {
 				handle, err := lib.OpenFileForRead(
@@ -96,17 +96,17 @@ func (reader *RecordReaderTSV) Read(
 				)
 				if err != nil {
 					errorChannel <- err
-					return
+				} else {
+					reader.processHandle(
+						handle,
+						filename,
+						&context,
+						readerChannel,
+						errorChannel,
+						downstreamDoneChannel,
+					)
+					handle.Close()
 				}
-				reader.processHandle(
-					handle,
-					filename,
-					&context,
-					readerChannel,
-					errorChannel,
-					downstreamDoneChannel,
-				)
-				handle.Close()
 			}
 		}
 	}

diff --git a/pkg/input/record_reader_xtab.go b/pkg/input/record_reader_xtab.go
@@ -71,8 +71,9 @@ func (reader *RecordReaderXTAB) Read(
 			)
 			if err != nil {
 				errorChannel <- err
+			} else {
+				reader.processHandle(handle, "(stdin)", &context, readerChannel, errorChannel, downstreamDoneChannel)
 			}
-			reader.processHandle(handle, "(stdin)", &context, readerChannel, errorChannel, downstreamDoneChannel)
 		} else {
 			for _, filename := range filenames {
 				handle, err := lib.OpenFileForRead(

diff --git a/test/cases/non-windows/file-not-found/csv/cmd b/test/cases/non-windows/file-not-found/csv/cmd
@@ -0,0 +1 @@
+mlr --csv cat /nonesuch/nope/never
diff --git a/test/cases/non-windows/file-not-found/csv/experr b/test/cases/non-windows/file-not-found/csv/experr
@@ -0,0 +1 @@
+mlr: open /nonesuch/nope/never: no such file or directory.
diff --git a/test/cases/non-windows/file-not-found/csv/expout b/test/cases/non-windows/file-not-found/csv/expout
diff --git a/test/cases/non-windows/file-not-found/csv/should-fail b/test/cases/non-windows/file-not-found/csv/should-fail
diff --git a/test/cases/non-windows/file-not-found/dkvp/cmd b/test/cases/non-windows/file-not-found/dkvp/cmd
@@ -0,0 +1 @@
+mlr --dkvp cat /nonesuch/nope/never
diff --git a/test/cases/non-windows/file-not-found/dkvp/experr b/test/cases/non-windows/file-not-found/dkvp/experr
@@ -0,0 +1 @@
+mlr: open /nonesuch/nope/never: no such file or directory.
diff --git a/test/cases/non-windows/file-not-found/dkvp/expout b/test/cases/non-windows/file-not-found/dkvp/expout
diff --git a/test/cases/non-windows/file-not-found/dkvp/should-fail b/test/cases/non-windows/file-not-found/dkvp/should-fail
diff --git a/test/cases/non-windows/file-not-found/imd/cmd b/test/cases/non-windows/file-not-found/imd/cmd
@@ -0,0 +1 @@
+mlr --imd cat /nonesuch/nope/never
diff --git a/test/cases/non-windows/file-not-found/imd/experr b/test/cases/non-windows/file-not-found/imd/experr
@@ -0,0 +1 @@
+mlr: open /nonesuch/nope/never: no such file or directory.
diff --git a/test/cases/non-windows/file-not-found/imd/expout b/test/cases/non-windows/file-not-found/imd/expout
diff --git a/test/cases/non-windows/file-not-found/imd/should-fail b/test/cases/non-windows/file-not-found/imd/should-fail
diff --git a/test/cases/non-windows/file-not-found/json/cmd b/test/cases/non-windows/file-not-found/json/cmd
@@ -0,0 +1 @@
+mlr --json cat /nonesuch/nope/never
diff --git a/test/cases/non-windows/file-not-found/json/experr b/test/cases/non-windows/file-not-found/json/experr
@@ -0,0 +1 @@
+mlr: open /nonesuch/nope/never: no such file or directory.
diff --git a/test/cases/non-windows/file-not-found/json/expout b/test/cases/non-windows/file-not-found/json/expout
@@ -0,0 +1,2 @@
+[
+]
diff --git a/test/cases/non-windows/file-not-found/json/should-fail b/test/cases/non-windows/file-not-found/json/should-fail
diff --git a/test/cases/non-windows/file-not-found/jsonl/cmd b/test/cases/non-windows/file-not-found/jsonl/cmd
@@ -0,0 +1 @@
+mlr --jsonl cat /nonesuch/nope/never
diff --git a/test/cases/non-windows/file-not-found/jsonl/experr b/test/cases/non-windows/file-not-found/jsonl/experr
@@ -0,0 +1 @@
+mlr: open /nonesuch/nope/never: no such file or directory.
diff --git a/test/cases/non-windows/file-not-found/jsonl/expout b/test/cases/non-windows/file-not-found/jsonl/expout
diff --git a/test/cases/non-windows/file-not-found/jsonl/should-fail b/test/cases/non-windows/file-not-found/jsonl/should-fail
diff --git a/test/cases/non-windows/file-not-found/nidx/cmd b/test/cases/non-windows/file-not-found/nidx/cmd
@@ -0,0 +1 @@
+mlr --nidx cat /nonesuch/nope/never
diff --git a/test/cases/non-windows/file-not-found/nidx/experr b/test/cases/non-windows/file-not-found/nidx/experr
@@ -0,0 +1 @@
+mlr: open /nonesuch/nope/never: no such file or directory.
diff --git a/test/cases/non-windows/file-not-found/nidx/expout b/test/cases/non-windows/file-not-found/nidx/expout
diff --git a/test/cases/non-windows/file-not-found/nidx/should-fail b/test/cases/non-windows/file-not-found/nidx/should-fail
diff --git a/test/cases/non-windows/file-not-found/pprint/cmd b/test/cases/non-windows/file-not-found/pprint/cmd
@@ -0,0 +1 @@
+mlr --pprint cat /nonesuch/nope/never
diff --git a/test/cases/non-windows/file-not-found/pprint/experr b/test/cases/non-windows/file-not-found/pprint/experr
@@ -0,0 +1 @@
+mlr: open /nonesuch/nope/never: no such file or directory.
diff --git a/test/cases/non-windows/file-not-found/pprint/expout b/test/cases/non-windows/file-not-found/pprint/expout
diff --git a/test/cases/non-windows/file-not-found/pprint/should-fail b/test/cases/non-windows/file-not-found/pprint/should-fail
diff --git a/test/cases/non-windows/file-not-found/tsv/cmd b/test/cases/non-windows/file-not-found/tsv/cmd
@@ -0,0 +1 @@
+mlr --tsv cat /nonesuch/nope/never
diff --git a/test/cases/non-windows/file-not-found/tsv/experr b/test/cases/non-windows/file-not-found/tsv/experr
@@ -0,0 +1 @@
+mlr: open /nonesuch/nope/never: no such file or directory.
diff --git a/test/cases/non-windows/file-not-found/tsv/expout b/test/cases/non-windows/file-not-found/tsv/expout
diff --git a/test/cases/non-windows/file-not-found/tsv/should-fail b/test/cases/non-windows/file-not-found/tsv/should-fail
diff --git a/test/cases/non-windows/file-not-found/xtab/cmd b/test/cases/non-windows/file-not-found/xtab/cmd
@@ -0,0 +1 @@
+mlr --xtab cat /nonesuch/nope/never
diff --git a/test/cases/non-windows/file-not-found/xtab/experr b/test/cases/non-windows/file-not-found/xtab/experr
@@ -0,0 +1 @@
+mlr: open /nonesuch/nope/never: no such file or directory.
diff --git a/test/cases/non-windows/file-not-found/xtab/expout b/test/cases/non-windows/file-not-found/xtab/expout
diff --git a/test/cases/non-windows/file-not-found/xtab/should-fail b/test/cases/non-windows/file-not-found/xtab/should-fail