scip/tablizer
1
0
Fork 0
mirror of https://codeberg.org/scip/tablizer.git synced 2025-12-17 12:31:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed file handling, use -r <file> or nothing to use stdin

Browse Source
This commit is contained in:
Thomas von Dein
2025-01-14 12:21:55 +01:00
committed by T.v.Dein
parent 306f583522
commit 6ca835add1
4 changed files with 86 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
lib/io.go
View File

@@ -29,7 +29,7 @@ import (
const RWRR = 0755
func ProcessFiles(conf *cfg.Config, args []string) error {
fds, pattern, err := determineIO(conf, args)
fd, pattern, err := determineIO(conf, args)
if err != nil {
return err
@@ -39,28 +39,67 @@ func ProcessFiles(conf *cfg.Config, args []string) error {
return err
}
for _, fd := range fds {
data, err := Parse(*conf, fd)
if err != nil {
return err
}
if err = ValidateConsistency(&data); err != nil {
return err
}
err = PrepareColumns(conf, &data)
if err != nil {
return err
}
printData(os.Stdout, *conf, &data)
data, err := Parse(*conf, fd)
if err != nil {
return err
}
if err = ValidateConsistency(&data); err != nil {
return err
}
err = PrepareColumns(conf, &data)
if err != nil {
return err
}
printData(os.Stdout, *conf, &data)
return nil
}
func determineIO(conf *cfg.Config, args []string) ([]io.Reader, string, error) {
func determineIO(conf *cfg.Config, args []string) (io.Reader, string, error) {
var filehandle io.Reader
var pattern string
var haveio bool
switch {
case conf.InputFile == "-":
filehandle = os.Stdin
haveio = true
case conf.InputFile != "":
fd, err := os.OpenFile(conf.InputFile, os.O_RDONLY, RWRR)
if err != nil {
return nil, "", fmt.Errorf("failed to read input file %s: %w", conf.InputFile, err)
}
filehandle = fd
haveio = true
}
if !haveio {
stat, _ := os.Stdin.Stat()
if (stat.Mode() & os.ModeCharDevice) == 0 {
// we're reading from STDIN, which takes precedence over file args
filehandle = os.Stdin
haveio = true
}
}
if len(args) > 0 {
pattern = args[0]
conf.Pattern = args[0]
}
if !haveio {
return nil, "", errors.New("no file specified and nothing to read on stdin")
}
return filehandle, pattern, nil
}
func _determineIO(conf *cfg.Config, args []string) ([]io.Reader, string, error) {
var filehandles []io.Reader
var pattern string
@@ -80,7 +119,7 @@ func determineIO(conf *cfg.Config, args []string) ([]io.Reader, string, error) {
haveio = true
} else if len(args) > 0 {
// threre were args left, take a look
// there were args left, take a look
if args[0] == "-" {
// in traditional unix programs a dash denotes STDIN (forced)
filehandles = append(filehandles, os.Stdin)