2019-06-09 08:47:55 +03:00
|
|
|
package main
|
|
|
|
|
|
|
|
import (
|
2019-07-07 19:18:29 +03:00
|
|
|
"flag"
|
2019-06-09 20:40:35 +03:00
|
|
|
"fmt"
|
2019-06-09 20:34:52 +03:00
|
|
|
"io"
|
|
|
|
"os"
|
2019-07-15 23:27:41 +03:00
|
|
|
"path/filepath"
|
2019-07-08 07:42:48 +03:00
|
|
|
"runtime"
|
2019-06-16 11:02:19 +03:00
|
|
|
"strings"
|
2021-04-06 17:22:40 +03:00
|
|
|
"time"
|
2019-06-09 20:34:52 +03:00
|
|
|
|
2020-10-30 10:19:13 +03:00
|
|
|
log "github.com/sirupsen/logrus"
|
2021-04-15 16:16:06 +03:00
|
|
|
"golang.org/x/term"
|
2020-10-30 10:19:13 +03:00
|
|
|
|
2019-06-10 22:50:31 +03:00
|
|
|
"github.com/walles/moar/m"
|
2021-04-15 16:16:06 +03:00
|
|
|
"github.com/walles/moar/twin"
|
2019-06-09 08:47:55 +03:00
|
|
|
)
|
|
|
|
|
2019-07-07 19:34:05 +03:00
|
|
|
var versionString = "Should be set when building, please use build.sh to build"
|
|
|
|
|
2020-12-29 19:08:54 +03:00
|
|
|
func printUsage(output io.Writer) {
|
2019-07-15 23:14:36 +03:00
|
|
|
// This controls where PrintDefaults() prints, see below
|
|
|
|
flag.CommandLine.SetOutput(output)
|
|
|
|
|
2021-04-20 09:43:37 +03:00
|
|
|
// FIXME: Log if any of these printouts fail?
|
|
|
|
|
|
|
|
_, _ = fmt.Fprintln(output, "Usage:")
|
|
|
|
_, _ = fmt.Fprintln(output, " moar [options] <file>")
|
|
|
|
_, _ = fmt.Fprintln(output, " ... | moar")
|
|
|
|
_, _ = fmt.Fprintln(output, " moar < file")
|
|
|
|
_, _ = fmt.Fprintln(output)
|
2019-07-15 23:14:36 +03:00
|
|
|
|
|
|
|
flag.PrintDefaults()
|
|
|
|
|
2019-07-15 23:27:41 +03:00
|
|
|
moarPath, err := filepath.Abs(os.Args[0])
|
|
|
|
if err == nil {
|
2019-07-15 23:47:36 +03:00
|
|
|
pagerValue, err := filepath.Abs(os.Getenv("PAGER"))
|
|
|
|
if err != nil {
|
|
|
|
pagerValue = ""
|
|
|
|
}
|
|
|
|
if pagerValue != moarPath {
|
2019-07-15 23:43:27 +03:00
|
|
|
// We're not the default pager
|
2021-04-20 09:43:37 +03:00
|
|
|
_, _ = fmt.Fprintln(output)
|
|
|
|
_, _ = fmt.Fprintln(output, "To make Moar your default pager, put the following line in")
|
|
|
|
_, _ = fmt.Fprintln(output, "your .bashrc or .bash_profile and it will be default in all")
|
|
|
|
_, _ = fmt.Fprintln(output, "new terminal windows:")
|
|
|
|
_, _ = fmt.Fprintf(output, " export PAGER=%s\n", moarPath)
|
2019-07-15 23:43:27 +03:00
|
|
|
}
|
2019-07-15 23:27:41 +03:00
|
|
|
} else {
|
2021-04-19 21:29:05 +03:00
|
|
|
log.Warn("Unable to find moar binary ", err)
|
2019-07-15 23:27:41 +03:00
|
|
|
}
|
2019-07-15 23:14:36 +03:00
|
|
|
}
|
|
|
|
|
2020-12-30 00:57:44 +03:00
|
|
|
// printProblemsHeader prints bug reporting information to stderr
|
|
|
|
func printProblemsHeader() {
|
Print bug reporting info on log messages
diff --git moar.go moar.go
index 46b2898..906b310 100644
--- moar.go
+++ moar.go
@@ -58,6 +58,23 @@ func _PrintUsage(output io.Writer) {
}
}
+// PrintProblemsHeader prints bug reporting information to stderr
+func PrintProblemsHeader() {
+ fmt.Fprintln(os.Stderr, "Please post the following report at <https://github.com/walles/moar/issues>,")
+ fmt.Fprintln(os.Stderr, "or e-mail it to johan.walles@gmail.com.")
+ fmt.Fprintln(os.Stderr)
+ fmt.Fprintln(os.Stderr, "Version:", versionString)
+ fmt.Fprintln(os.Stderr, "LANG :", os.Getenv("LANG"))
+ fmt.Fprintln(os.Stderr, "TERM :", os.Getenv("TERM"))
+ fmt.Fprintln(os.Stderr)
+ fmt.Fprintln(os.Stderr, "GOOS :", runtime.GOOS)
+ fmt.Fprintln(os.Stderr, "GOARCH :", runtime.GOARCH)
+ fmt.Fprintln(os.Stderr, "Compiler:", runtime.Compiler)
+ fmt.Fprintln(os.Stderr, "NumCPU :", runtime.NumCPU())
+
+ fmt.Fprintln(os.Stderr)
+}
+
func main() {
// FIXME: If we get a CTRL-C, get terminal back into a useful state before terminating
@@ -67,21 +84,7 @@ func main() {
return
}
- // On any panic or warnings, also print system info and how to report bugs
- fmt.Fprintln(os.Stderr, "Please post the following crash report at <https://github.com/walles/moar/issues>,")
- fmt.Fprintln(os.Stderr, "or e-mail it to johan.walles@gmail.com.")
- fmt.Fprintln(os.Stderr)
- fmt.Fprintln(os.Stderr, "Version:", versionString)
- fmt.Fprintln(os.Stderr, "LANG :", os.Getenv("LANG"))
- fmt.Fprintln(os.Stderr, "TERM :", os.Getenv("TERM"))
- fmt.Fprintln(os.Stderr)
- fmt.Fprintln(os.Stderr, "GOOS :", runtime.GOOS)
- fmt.Fprintln(os.Stderr, "GOARCH :", runtime.GOARCH)
- fmt.Fprintln(os.Stderr, "Compiler:", runtime.Compiler)
- fmt.Fprintln(os.Stderr, "NumCPU :", runtime.NumCPU())
-
- fmt.Fprintln(os.Stderr)
-
+ PrintProblemsHeader()
panic(err)
}()
@@ -161,6 +164,8 @@ func _StartPaging(reader *m.Reader) {
}
if len(loglines.String()) > 0 {
+ PrintProblemsHeader()
+
// FIXME: Don't print duplicate log messages more than once,
// maybe invent our own logger for this?
fmt.Fprintf(os.Stderr, "%s", loglines.String())
Change-Id: If41c17e98daf9f05909ab7e3c31dc84e946cbbf5
2019-11-19 17:33:00 +03:00
|
|
|
fmt.Fprintln(os.Stderr, "Please post the following report at <https://github.com/walles/moar/issues>,")
|
|
|
|
fmt.Fprintln(os.Stderr, "or e-mail it to johan.walles@gmail.com.")
|
|
|
|
fmt.Fprintln(os.Stderr)
|
|
|
|
fmt.Fprintln(os.Stderr, "Version:", versionString)
|
|
|
|
fmt.Fprintln(os.Stderr, "LANG :", os.Getenv("LANG"))
|
|
|
|
fmt.Fprintln(os.Stderr, "TERM :", os.Getenv("TERM"))
|
|
|
|
fmt.Fprintln(os.Stderr)
|
|
|
|
fmt.Fprintln(os.Stderr, "GOOS :", runtime.GOOS)
|
|
|
|
fmt.Fprintln(os.Stderr, "GOARCH :", runtime.GOARCH)
|
|
|
|
fmt.Fprintln(os.Stderr, "Compiler:", runtime.Compiler)
|
|
|
|
fmt.Fprintln(os.Stderr, "NumCPU :", runtime.NumCPU())
|
|
|
|
|
|
|
|
fmt.Fprintln(os.Stderr)
|
|
|
|
}
|
|
|
|
|
2019-06-09 08:47:55 +03:00
|
|
|
func main() {
|
2019-07-11 19:52:20 +03:00
|
|
|
// FIXME: If we get a CTRL-C, get terminal back into a useful state before terminating
|
|
|
|
|
2019-07-08 07:42:48 +03:00
|
|
|
defer func() {
|
|
|
|
err := recover()
|
|
|
|
if err == nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2020-12-30 00:57:44 +03:00
|
|
|
printProblemsHeader()
|
2019-07-08 07:42:48 +03:00
|
|
|
panic(err)
|
|
|
|
}()
|
2019-06-29 12:20:48 +03:00
|
|
|
|
2019-07-15 23:14:36 +03:00
|
|
|
flag.Usage = func() {
|
2020-12-29 19:08:54 +03:00
|
|
|
printUsage(os.Stdout)
|
2019-07-15 23:14:36 +03:00
|
|
|
}
|
2019-07-07 19:34:05 +03:00
|
|
|
printVersion := flag.Bool("version", false, "Prints the moar version number")
|
2019-12-06 21:36:31 +03:00
|
|
|
debug := flag.Bool("debug", false, "Print debug logs after exiting")
|
2021-04-15 16:16:06 +03:00
|
|
|
trace := flag.Bool("trace", false, "Print trace logs after exiting")
|
2019-07-07 19:18:29 +03:00
|
|
|
|
|
|
|
// FIXME: Support --no-highlight
|
|
|
|
|
|
|
|
flag.Parse()
|
2019-07-07 19:34:05 +03:00
|
|
|
if *printVersion {
|
|
|
|
fmt.Println(versionString)
|
2019-07-07 19:18:29 +03:00
|
|
|
os.Exit(0)
|
|
|
|
}
|
|
|
|
|
2019-12-06 21:36:31 +03:00
|
|
|
log.SetLevel(log.InfoLevel)
|
2021-04-15 16:16:06 +03:00
|
|
|
if *trace {
|
|
|
|
log.SetLevel(log.TraceLevel)
|
|
|
|
} else if *debug {
|
2019-12-06 21:36:31 +03:00
|
|
|
log.SetLevel(log.DebugLevel)
|
|
|
|
}
|
|
|
|
|
2021-04-06 17:22:40 +03:00
|
|
|
log.SetFormatter(&log.TextFormatter{
|
|
|
|
TimestampFormat: time.RFC3339Nano,
|
|
|
|
})
|
|
|
|
|
2021-04-20 10:18:02 +03:00
|
|
|
if len(flag.Args()) > 1 {
|
|
|
|
fmt.Fprintln(os.Stderr, "ERROR: Expected exactly one filename, or data piped from stdin, got: ", flag.Args())
|
|
|
|
fmt.Fprintln(os.Stderr)
|
|
|
|
printUsage(os.Stderr)
|
|
|
|
|
|
|
|
os.Exit(1)
|
2019-06-09 20:34:52 +03:00
|
|
|
}
|
|
|
|
|
2021-04-20 10:18:02 +03:00
|
|
|
stdinIsRedirected := !term.IsTerminal(int(os.Stdin.Fd()))
|
|
|
|
stdoutIsRedirected := !term.IsTerminal(int(os.Stdout.Fd()))
|
|
|
|
var inputFilename *string
|
|
|
|
if len(flag.Args()) == 1 {
|
|
|
|
word := flag.Arg(0)
|
|
|
|
inputFilename = &word
|
2019-06-09 22:58:12 +03:00
|
|
|
}
|
|
|
|
|
2021-04-20 10:18:02 +03:00
|
|
|
if inputFilename == nil && !stdinIsRedirected {
|
|
|
|
fmt.Fprintln(os.Stderr, "ERROR: Filename or input pipe required")
|
|
|
|
fmt.Fprintln(os.Stderr, "")
|
2020-12-29 19:08:54 +03:00
|
|
|
printUsage(os.Stderr)
|
2019-06-09 20:40:35 +03:00
|
|
|
os.Exit(1)
|
|
|
|
}
|
|
|
|
|
2021-04-20 10:18:02 +03:00
|
|
|
if inputFilename != nil && stdoutIsRedirected {
|
|
|
|
// Pump file to stdout.
|
|
|
|
//
|
|
|
|
// If we get both redirected stdin and an input filename, we must prefer
|
|
|
|
// to copy the file, because that's how less works.
|
|
|
|
inputFile, err := os.Open(*inputFilename)
|
2019-06-09 22:52:27 +03:00
|
|
|
if err != nil {
|
2021-04-20 10:18:02 +03:00
|
|
|
fmt.Fprintln(os.Stderr, "ERROR: Failed to open", inputFile, ": ")
|
2019-06-09 22:52:27 +03:00
|
|
|
os.Exit(1)
|
|
|
|
}
|
2021-04-20 10:18:02 +03:00
|
|
|
|
|
|
|
_, err = io.Copy(os.Stdout, inputFile)
|
|
|
|
if err != nil {
|
|
|
|
log.Fatal("Failed to copy ", inputFilename, " to stdout: ", err)
|
|
|
|
}
|
|
|
|
os.Exit(0)
|
|
|
|
}
|
|
|
|
|
|
|
|
if stdinIsRedirected && stdoutIsRedirected {
|
|
|
|
// Must be done after trying to pump the input filename to stdout to be
|
|
|
|
// compatible with less, see above.
|
|
|
|
_, err := io.Copy(os.Stdout, os.Stdin)
|
2021-04-20 09:43:37 +03:00
|
|
|
if err != nil {
|
2021-04-20 10:18:02 +03:00
|
|
|
log.Fatal("Failed to copy stdin to stdout: ", err)
|
2021-04-20 09:43:37 +03:00
|
|
|
}
|
2019-06-09 22:58:12 +03:00
|
|
|
os.Exit(0)
|
2019-06-09 20:55:49 +03:00
|
|
|
}
|
2019-06-09 22:58:12 +03:00
|
|
|
|
2021-04-20 10:18:02 +03:00
|
|
|
// INVARIANT: At this point, stdoutIsRedirected is false and we should
|
|
|
|
// proceed with paging.
|
|
|
|
|
|
|
|
if stdinIsRedirected {
|
|
|
|
// Display input pipe contents
|
|
|
|
reader := m.NewReaderFromStream("", os.Stdin)
|
|
|
|
startPaging(reader)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-06-10 22:50:31 +03:00
|
|
|
// Display the input file contents
|
2021-04-20 10:18:02 +03:00
|
|
|
reader, err := m.NewReaderFromFilename(*inputFilename)
|
2019-06-16 11:02:19 +03:00
|
|
|
if err != nil {
|
2021-04-20 10:18:02 +03:00
|
|
|
fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
|
2019-06-16 11:02:19 +03:00
|
|
|
os.Exit(1)
|
|
|
|
}
|
2020-12-29 19:08:54 +03:00
|
|
|
startPaging(reader)
|
2019-06-16 11:02:19 +03:00
|
|
|
}
|
2019-06-15 09:10:56 +03:00
|
|
|
|
2020-12-29 19:08:54 +03:00
|
|
|
func startPaging(reader *m.Reader) {
|
2021-04-15 16:16:06 +03:00
|
|
|
screen, e := twin.NewScreen()
|
2019-06-30 23:11:26 +03:00
|
|
|
if e != nil {
|
2019-07-08 07:42:48 +03:00
|
|
|
panic(e)
|
2019-06-30 23:11:26 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
var loglines strings.Builder
|
2019-06-29 23:27:18 +03:00
|
|
|
defer func() {
|
|
|
|
// Restore screen...
|
2021-04-15 16:16:06 +03:00
|
|
|
screen.Close()
|
2019-06-29 23:27:18 +03:00
|
|
|
|
|
|
|
// ... before printing panic() output, otherwise the output will have
|
|
|
|
// broken linefeeds and be hard to follow.
|
|
|
|
if err := recover(); err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
|
|
|
|
2019-06-30 23:11:26 +03:00
|
|
|
if len(loglines.String()) > 0 {
|
2020-12-30 00:57:44 +03:00
|
|
|
printProblemsHeader()
|
Print bug reporting info on log messages
diff --git moar.go moar.go
index 46b2898..906b310 100644
--- moar.go
+++ moar.go
@@ -58,6 +58,23 @@ func _PrintUsage(output io.Writer) {
}
}
+// PrintProblemsHeader prints bug reporting information to stderr
+func PrintProblemsHeader() {
+ fmt.Fprintln(os.Stderr, "Please post the following report at <https://github.com/walles/moar/issues>,")
+ fmt.Fprintln(os.Stderr, "or e-mail it to johan.walles@gmail.com.")
+ fmt.Fprintln(os.Stderr)
+ fmt.Fprintln(os.Stderr, "Version:", versionString)
+ fmt.Fprintln(os.Stderr, "LANG :", os.Getenv("LANG"))
+ fmt.Fprintln(os.Stderr, "TERM :", os.Getenv("TERM"))
+ fmt.Fprintln(os.Stderr)
+ fmt.Fprintln(os.Stderr, "GOOS :", runtime.GOOS)
+ fmt.Fprintln(os.Stderr, "GOARCH :", runtime.GOARCH)
+ fmt.Fprintln(os.Stderr, "Compiler:", runtime.Compiler)
+ fmt.Fprintln(os.Stderr, "NumCPU :", runtime.NumCPU())
+
+ fmt.Fprintln(os.Stderr)
+}
+
func main() {
// FIXME: If we get a CTRL-C, get terminal back into a useful state before terminating
@@ -67,21 +84,7 @@ func main() {
return
}
- // On any panic or warnings, also print system info and how to report bugs
- fmt.Fprintln(os.Stderr, "Please post the following crash report at <https://github.com/walles/moar/issues>,")
- fmt.Fprintln(os.Stderr, "or e-mail it to johan.walles@gmail.com.")
- fmt.Fprintln(os.Stderr)
- fmt.Fprintln(os.Stderr, "Version:", versionString)
- fmt.Fprintln(os.Stderr, "LANG :", os.Getenv("LANG"))
- fmt.Fprintln(os.Stderr, "TERM :", os.Getenv("TERM"))
- fmt.Fprintln(os.Stderr)
- fmt.Fprintln(os.Stderr, "GOOS :", runtime.GOOS)
- fmt.Fprintln(os.Stderr, "GOARCH :", runtime.GOARCH)
- fmt.Fprintln(os.Stderr, "Compiler:", runtime.Compiler)
- fmt.Fprintln(os.Stderr, "NumCPU :", runtime.NumCPU())
-
- fmt.Fprintln(os.Stderr)
-
+ PrintProblemsHeader()
panic(err)
}()
@@ -161,6 +164,8 @@ func _StartPaging(reader *m.Reader) {
}
if len(loglines.String()) > 0 {
+ PrintProblemsHeader()
+
// FIXME: Don't print duplicate log messages more than once,
// maybe invent our own logger for this?
fmt.Fprintf(os.Stderr, "%s", loglines.String())
Change-Id: If41c17e98daf9f05909ab7e3c31dc84e946cbbf5
2019-11-19 17:33:00 +03:00
|
|
|
|
2019-07-08 07:42:48 +03:00
|
|
|
// FIXME: Don't print duplicate log messages more than once,
|
|
|
|
// maybe invent our own logger for this?
|
2019-06-30 23:11:26 +03:00
|
|
|
fmt.Fprintf(os.Stderr, "%s", loglines.String())
|
|
|
|
os.Exit(1)
|
|
|
|
}
|
|
|
|
}()
|
2019-06-15 09:10:56 +03:00
|
|
|
|
2019-11-27 20:43:46 +03:00
|
|
|
log.SetOutput(&loglines)
|
|
|
|
m.NewPager(reader).StartPaging(screen)
|
2019-06-09 08:47:55 +03:00
|
|
|
}
|