NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 12:12:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved logger to separate file

Browse source
This commit is contained in:
bytedream 2022-01-17 19:40:33 +01:00
parent 30e8663186
commit effd160dc3
2 changed files with 199 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

199
cmd/crunchyroll-go/cmd/logger.go Normal file
View file

@ -0,0 +1,199 @@
package cmd
import (
"fmt"
"io"
"log"
"os"
"runtime"
"strings"
"sync"
"time"
)
type progress struct {
status bool
message string
}
type logger struct {
DebugLog *log.Logger
InfoLog *log.Logger
ErrLog *log.Logger
devView bool
progressWG sync.Mutex
progress chan progress
}
func newLogger(debug, info, err bool, color bool) *logger {
debugLog, infoLog, errLog := log.New(io.Discard, "=> ", 0), log.New(io.Discard, "=> ", 0), log.New(io.Discard, "=> ", 0)
debugColor, infoColor, errColor := "", "", ""
if color && runtime.GOOS != "windows" {
debugColor, infoColor, errColor = "\033[95m", "\033[96m", "\033[31m"
}
if debug {
debugLog.SetOutput(&loggerWriter{original: os.Stdout, color: debugColor})
}
if info {
infoLog.SetOutput(&loggerWriter{original: os.Stdout, color: infoColor})
}
if err {
errLog.SetOutput(&loggerWriter{original: os.Stdout, color: errColor})
}
if debug {
debugLog = log.New(debugLog.Writer(), "[debug] ", 0)
infoLog = log.New(infoLog.Writer(), "[info] ", 0)
errLog = log.New(errLog.Writer(), "[err] ", 0)
}
return &logger{
DebugLog: debugLog,
InfoLog: infoLog,
ErrLog: errLog,
devView: debug,
}
}
func (l *logger) Empty() {
if !l.devView && l.InfoLog.Writer() != io.Discard {
fmt.Println()
}
}
func (l *logger) StartProgress(message string) {
if l.devView {
l.InfoLog.Println(message)
return
}
l.progress = make(chan progress)
go func() {
states := []string{"-", "\\", "|", "/"}
for i := 0; ; i++ {
l.progressWG.Lock()
select {
case p := <-l.progress:
// clearing the last line
fmt.Printf("\r%s\r", strings.Repeat(" ", len(l.InfoLog.Prefix())+len(message)+2))
if p.status {
successTag := "✔"
if runtime.GOOS == "windows" {
successTag = "~"
}
l.InfoLog.Printf("%s %s", successTag, p.message)
} else {
errorTag := "✘"
if runtime.GOOS == "windows" {
errorTag = "!"
}
l.ErrLog.Printf("%s %s", errorTag, p.message)
}
l.progress = nil
l.progressWG.Unlock()
return
default:
if i%10 == 0 {
fmt.Printf("\r%s%s %s", l.InfoLog.Prefix(), states[i/10%4], message)
}
time.Sleep(35 * time.Millisecond)
l.progressWG.Unlock()
}
}
}()
}
func (l *logger) StartProgressf(message string, a ...interface{}) {
l.StartProgress(fmt.Sprintf(message, a...))
}
func (l *logger) EndProgress(successful bool, message string) {
if l.devView {
if successful {
l.InfoLog.Print(message)
} else {
l.ErrLog.Print(message)
}
return
} else if l.progress != nil {
l.progress <- progress{
status: successful,
message: message,
}
}
}
func (l *logger) EndProgressf(successful bool, message string, a ...interface{}) {
l.EndProgress(successful, fmt.Sprintf(message, a...))
}
func (l *logger) Debugln(v ...interface{}) {
l.print(0, v...)
}
func (l *logger) Debugf(message string, a ...interface{}) {
l.print(0, fmt.Sprintf(message, a...))
}
func (l *logger) Infoln(v ...interface{}) {
l.print(1, v...)
}
func (l *logger) Infof(message string, a ...interface{}) {
l.print(1, fmt.Sprintf(message, a...))
}
func (l *logger) Errln(v ...interface{}) {
l.print(2, v...)
}
func (l *logger) Errf(message string, a ...interface{}) {
l.print(2, fmt.Sprintf(message, a...))
}
func (l *logger) Fatalln(v ...interface{}) {
l.print(2, v...)
os.Exit(1)
}
func (l *logger) Fatalf(message string, a ...interface{}) {
l.print(2, fmt.Sprintf(message, a...))
os.Exit(1)
}
func (l *logger) print(level int, v ...interface{}) {
if l.progress != nil {
l.progressWG.Lock()
defer l.progressWG.Unlock()
fmt.Print("\r")
}
switch level {
case 0:
l.DebugLog.Print(v...)
case 1:
l.InfoLog.Print(v...)
case 2:
l.ErrLog.Print(v...)
}
}
type loggerWriter struct {
io.Writer
original io.Writer
color string
}
func (lw *loggerWriter) Write(p []byte) (n int, err error) {
if lw.color != "" {
p = append([]byte(lw.color), p...)
p = append(p, []byte("\033[0m")...)
}
return lw.original.Write(p)
}

190
cmd/crunchyroll-go/cmd/utils.go
View file

@ -4,9 +4,7 @@ import (
"fmt" "fmt"
"github.com/ByteDream/crunchyroll-go" "github.com/ByteDream/crunchyroll-go"
"github.com/ByteDream/crunchyroll-go/utils" "github.com/ByteDream/crunchyroll-go/utils"
"io"
"io/ioutil" "io/ioutil"
"log"
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
@ -16,199 +14,11 @@ import (
"runtime" "runtime"
"strconv" "strconv"
"strings" "strings"
"sync"
"time" "time"
) )
var sessionIDPath = filepath.Join(os.TempDir(), ".crunchy") var sessionIDPath = filepath.Join(os.TempDir(), ".crunchy")
type progress struct {
status bool
message string
}
type logger struct {
DebugLog *log.Logger
InfoLog *log.Logger
ErrLog *log.Logger
devView bool
progressWG sync.Mutex
progress chan progress
}
func newLogger(debug, info, err bool, color bool) *logger {
debugLog, infoLog, errLog := log.New(io.Discard, "=> ", 0), log.New(io.Discard, "=> ", 0), log.New(io.Discard, "=> ", 0)
debugColor, infoColor, errColor := "", "", ""
if color && runtime.GOOS != "windows" {
debugColor, infoColor, errColor = "\033[95m", "\033[96m", "\033[31m"
}
if debug {
debugLog.SetOutput(&loggerWriter{original: os.Stdout, color: debugColor})
}
if info {
infoLog.SetOutput(&loggerWriter{original: os.Stdout, color: infoColor})
}
if err {
errLog.SetOutput(&loggerWriter{original: os.Stdout, color: errColor})
}
if debug {
debugLog = log.New(debugLog.Writer(), "[debug] ", 0)
infoLog = log.New(infoLog.Writer(), "[info] ", 0)
errLog = log.New(errLog.Writer(), "[err] ", 0)
}
return &logger{
DebugLog: debugLog,
InfoLog: infoLog,
ErrLog: errLog,
devView: debug,
}
}
func (l *logger) Empty() {
if !l.devView && l.InfoLog.Writer() != io.Discard {
fmt.Println()
}
}
func (l *logger) StartProgress(message string) {
if l.devView {
l.InfoLog.Println(message)
return
}
l.progress = make(chan progress)
go func() {
states := []string{"-", "\\", "|", "/"}
for i := 0; ; i++ {
l.progressWG.Lock()
select {
case p := <-l.progress:
// clearing the last line
fmt.Printf("\r%s\r", strings.Repeat(" ", len(l.InfoLog.Prefix())+len(message)+2))
if p.status {
successTag := "✔"
if runtime.GOOS == "windows" {
successTag = "~"
}
l.InfoLog.Printf("%s %s", successTag, p.message)
} else {
errorTag := "✘"
if runtime.GOOS == "windows" {
errorTag = "!"
}
l.ErrLog.Printf("%s %s", errorTag, p.message)
}
l.progress = nil
l.progressWG.Unlock()
return
default:
if i%10 == 0 {
fmt.Printf("\r%s%s %s", l.InfoLog.Prefix(), states[i/10%4], message)
}
time.Sleep(35 * time.Millisecond)
l.progressWG.Unlock()
}
}
}()
}
func (l *logger) StartProgressf(message string, a ...interface{}) {
l.StartProgress(fmt.Sprintf(message, a...))
}
func (l *logger) EndProgress(successful bool, message string) {
if l.devView {
if successful {
l.InfoLog.Print(message)
} else {
l.ErrLog.Print(message)
}
return
} else if l.progress != nil {
l.progress <- progress{
status: successful,
message: message,
}
}
}
func (l *logger) EndProgressf(successful bool, message string, a ...interface{}) {
l.EndProgress(successful, fmt.Sprintf(message, a...))
}
func (l *logger) Debugln(v ...interface{}) {
l.print(0, v...)
}
func (l *logger) Debugf(message string, a ...interface{}) {
l.print(0, fmt.Sprintf(message, a...))
}
func (l *logger) Infoln(v ...interface{}) {
l.print(1, v...)
}
func (l *logger) Infof(message string, a ...interface{}) {
l.print(1, fmt.Sprintf(message, a...))
}
func (l *logger) Errln(v ...interface{}) {
l.print(2, v...)
}
func (l *logger) Errf(message string, a ...interface{}) {
l.print(2, fmt.Sprintf(message, a...))
}
func (l *logger) Fatalln(v ...interface{}) {
l.print(2, v...)
os.Exit(1)
}
func (l *logger) Fatalf(message string, a ...interface{}) {
l.print(2, fmt.Sprintf(message, a...))
os.Exit(1)
}
func (l *logger) print(level int, v ...interface{}) {
if l.progress != nil {
l.progressWG.Lock()
defer l.progressWG.Unlock()
fmt.Print("\r")
}
switch level {
case 0:
l.DebugLog.Print(v...)
case 1:
l.InfoLog.Print(v...)
case 2:
l.ErrLog.Print(v...)
}
}
type loggerWriter struct {
io.Writer
original io.Writer
color string
}
func (lw *loggerWriter) Write(p []byte) (n int, err error) {
if lw.color != "" {
p = append([]byte(lw.color), p...)
p = append(p, []byte("\033[0m")...)
}
return lw.original.Write(p)
}
// systemLocale receives the system locale // systemLocale receives the system locale
// https://stackoverflow.com/questions/51829386/golang-get-system-language/51831590#51831590 // https://stackoverflow.com/questions/51829386/golang-get-system-language/51831590#51831590
func systemLocale() crunchyroll.LOCALE { func systemLocale() crunchyroll.LOCALE {