refactor: Decompose logger completely

This commit is contained in:
Felicitas Pojtinger
2021-12-10 21:20:35 +01:00
parent bc7793360f
commit bc0951e476
24 changed files with 172 additions and 132 deletions
-8
View File
@@ -3,8 +3,6 @@ package converters
import (
"archive/tar"
"encoding/json"
"fmt"
"time"
models "github.com/pojntfx/stfs/internal/db/sqlite/models/metadata"
)
@@ -68,9 +66,3 @@ func TarHeaderToDBHeader(record, lastKnownRecord, block, lastKnownBlock int64, t
return &hdr, nil
}
func TARHeaderToCSV(record, lastKnownRecord, block, lastKnownBlock int64, hdr *tar.Header) []string {
return []string{
fmt.Sprintf("%v", record), fmt.Sprintf("%v", lastKnownRecord), fmt.Sprintf("%v", block), fmt.Sprintf("%v", lastKnownBlock), fmt.Sprintf("%v", hdr.Typeflag), hdr.Name, hdr.Linkname, fmt.Sprintf("%v", hdr.Size), fmt.Sprintf("%v", hdr.Mode), fmt.Sprintf("%v", hdr.Uid), fmt.Sprintf("%v", hdr.Gid), fmt.Sprintf("%v", hdr.Uname), fmt.Sprintf("%v", hdr.Gname), hdr.ModTime.Format(time.RFC3339), hdr.AccessTime.Format(time.RFC3339), hdr.ChangeTime.Format(time.RFC3339), fmt.Sprintf("%v", hdr.Devmajor), fmt.Sprintf("%v", hdr.Devminor), fmt.Sprintf("%v", hdr.PAXRecords), fmt.Sprintf("%v", hdr.Format),
}
}
-18
View File
@@ -1,18 +0,0 @@
package formatting
import (
"encoding/csv"
"os"
)
var (
TARHeaderCSV = []string{
"record", "lastknownrecord", "block", "lastknownblock", "typeflag", "name", "linkname", "size", "mode", "uid", "gid", "uname", "gname", "modtime", "accesstime", "changetime", "devmajor", "devminor", "paxrecords", "format",
}
)
func PrintCSV(input []string) error {
w := csv.NewWriter(os.Stdout)
return w.WriteAll([][]string{input})
}
+44
View File
@@ -0,0 +1,44 @@
package logging
import (
"encoding/csv"
"fmt"
"os"
"time"
models "github.com/pojntfx/stfs/internal/db/sqlite/models/metadata"
)
var (
tarHeaderCSV = []string{
"record", "lastknownrecord", "block", "lastknownblock", "typeflag", "name", "linkname", "size", "mode", "uid", "gid", "uname", "gname", "modtime", "accesstime", "changetime", "devmajor", "devminor", "paxrecords", "format",
}
)
func headerToCSV(hdr *models.Header) []string {
return []string{
fmt.Sprintf("%v", hdr.Record), fmt.Sprintf("%v", hdr.Lastknownrecord), fmt.Sprintf("%v", hdr.Block), fmt.Sprintf("%v", hdr.Lastknownblock), fmt.Sprintf("%v", hdr.Typeflag), hdr.Name, hdr.Linkname, fmt.Sprintf("%v", hdr.Size), fmt.Sprintf("%v", hdr.Mode), fmt.Sprintf("%v", hdr.UID), fmt.Sprintf("%v", hdr.Gid), fmt.Sprintf("%v", hdr.Uname), fmt.Sprintf("%v", hdr.Gname), hdr.Modtime.Format(time.RFC3339), hdr.Accesstime.Format(time.RFC3339), hdr.Changetime.Format(time.RFC3339), fmt.Sprintf("%v", hdr.Devmajor), fmt.Sprintf("%v", hdr.Devminor), fmt.Sprintf("%v", hdr.Paxrecords), fmt.Sprintf("%v", hdr.Format),
}
}
type Logger struct {
n int
}
func NewLogger() *Logger {
return &Logger{}
}
func (l *Logger) PrintHeader(hdr *models.Header) {
w := csv.NewWriter(os.Stdout)
if l.n <= 0 {
_ = w.Write(tarHeaderCSV) // Errors are ignored for compatibility with traditional logging APIs
}
_ = w.Write(headerToCSV(hdr)) // Errors are ignored for compatibility with traditional logging APIs
w.Flush()
l.n++
}
+3
View File
@@ -7,6 +7,7 @@ import (
"context"
"database/sql"
"fmt"
"log"
"strings"
"github.com/pojntfx/stfs/internal/db/sqlite/migrations/metadata"
@@ -137,6 +138,8 @@ func (p *MetadataPersister) GetHeaderDirectChildren(ctx context.Context, name st
rootDepth = int(depth.Depth)
}
log.Println(rootDepth)
if err := queries.Raw(
fmt.Sprintf(
`select %v, %v, %v, %v, %v, %v, %v, %v, %v, %v, %v, %v, %v, %v, %v, %v, %v, %v, %v, %v, %v,