Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-18 00:45:47 +00:00
Code Issues Projects Releases Wiki Activity

Improved file-not-found handling (#1508)

Browse source
This commit is contained in:
John Kerl 2024-02-26 00:12:31 -05:00 • committed by GitHub
parent 3201f9c675
commit aff4b9f32d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
43 changed files with 85 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkg/input/record_reader_csv.go
View file

@ -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(

38
pkg/input/record_reader_csvlite.go
View file

@ -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()
}
}
}

3
pkg/input/record_reader_dkvp_nidx.go
View file

@ -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(

3
pkg/input/record_reader_json.go
View file

@ -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(

38
pkg/input/record_reader_pprint.go
View file

@ -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()
}
}
}

38
pkg/input/record_reader_tsv.go
View file

@ -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()
}
}
}

3
pkg/input/record_reader_xtab.go
View file

@ -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(

1
test/cases/non-windows/file-not-found/csv/cmd Normal file
View file

@ -0,0 +1 @@
mlr --csv cat /nonesuch/nope/never

1
test/cases/non-windows/file-not-found/csv/experr Normal file
View file

@ -0,0 +1 @@
mlr: open /nonesuch/nope/never: no such file or directory.

0
test/cases/non-windows/file-not-found/csv/expout Normal file
View file

0
test/cases/non-windows/file-not-found/csv/should-fail Normal file
View file

1
test/cases/non-windows/file-not-found/dkvp/cmd Normal file
View file

@ -0,0 +1 @@
mlr --dkvp cat /nonesuch/nope/never

1
test/cases/non-windows/file-not-found/dkvp/experr Normal file
View file

@ -0,0 +1 @@
mlr: open /nonesuch/nope/never: no such file or directory.

0
test/cases/non-windows/file-not-found/dkvp/expout Normal file
View file

0
test/cases/non-windows/file-not-found/dkvp/should-fail Normal file
View file

1
test/cases/non-windows/file-not-found/imd/cmd Normal file
View file

@ -0,0 +1 @@
mlr --imd cat /nonesuch/nope/never

1
test/cases/non-windows/file-not-found/imd/experr Normal file
View file

@ -0,0 +1 @@
mlr: open /nonesuch/nope/never: no such file or directory.

0
test/cases/non-windows/file-not-found/imd/expout Normal file
View file

0
test/cases/non-windows/file-not-found/imd/should-fail Normal file
View file

1
test/cases/non-windows/file-not-found/json/cmd Normal file
View file

@ -0,0 +1 @@
mlr --json cat /nonesuch/nope/never

1
test/cases/non-windows/file-not-found/json/experr Normal file
View file

@ -0,0 +1 @@
mlr: open /nonesuch/nope/never: no such file or directory.

2
test/cases/non-windows/file-not-found/json/expout Normal file
View file

@ -0,0 +1,2 @@
[
]

0
test/cases/non-windows/file-not-found/json/should-fail Normal file
View file

1
test/cases/non-windows/file-not-found/jsonl/cmd Normal file
View file

@ -0,0 +1 @@
mlr --jsonl cat /nonesuch/nope/never

1
test/cases/non-windows/file-not-found/jsonl/experr Normal file
View file

@ -0,0 +1 @@
mlr: open /nonesuch/nope/never: no such file or directory.

0
test/cases/non-windows/file-not-found/jsonl/expout Normal file
View file

0
test/cases/non-windows/file-not-found/jsonl/should-fail Normal file
View file

1
test/cases/non-windows/file-not-found/nidx/cmd Normal file
View file

@ -0,0 +1 @@
mlr --nidx cat /nonesuch/nope/never

1
test/cases/non-windows/file-not-found/nidx/experr Normal file
View file

@ -0,0 +1 @@
mlr: open /nonesuch/nope/never: no such file or directory.

0
test/cases/non-windows/file-not-found/nidx/expout Normal file
View file

0
test/cases/non-windows/file-not-found/nidx/should-fail Normal file
View file

1
test/cases/non-windows/file-not-found/pprint/cmd Normal file
View file

@ -0,0 +1 @@
mlr --pprint cat /nonesuch/nope/never

1
test/cases/non-windows/file-not-found/pprint/experr Normal file
View file

@ -0,0 +1 @@
mlr: open /nonesuch/nope/never: no such file or directory.

0
test/cases/non-windows/file-not-found/pprint/expout Normal file
View file

0
test/cases/non-windows/file-not-found/pprint/should-fail Normal file
View file

1
test/cases/non-windows/file-not-found/tsv/cmd Normal file
View file

@ -0,0 +1 @@
mlr --tsv cat /nonesuch/nope/never

1
test/cases/non-windows/file-not-found/tsv/experr Normal file
View file

@ -0,0 +1 @@
mlr: open /nonesuch/nope/never: no such file or directory.

0
test/cases/non-windows/file-not-found/tsv/expout Normal file
View file

0
test/cases/non-windows/file-not-found/tsv/should-fail Normal file
View file

1
test/cases/non-windows/file-not-found/xtab/cmd Normal file
View file

@ -0,0 +1 @@
mlr --xtab cat /nonesuch/nope/never

1
test/cases/non-windows/file-not-found/xtab/experr Normal file
View file

@ -0,0 +1 @@
mlr: open /nonesuch/nope/never: no such file or directory.

0
test/cases/non-windows/file-not-found/xtab/expout Normal file
View file

0
test/cases/non-windows/file-not-found/xtab/should-fail Normal file
View file