ston1th/docstore
1
1
Fork 0
Code Issues 3 Releases Activity

some lint fixes

Browse source
This commit is contained in:
ston1th 2021-11-05 22:10:52 +01:00
commit 9f4fda3c8b
11 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,5 +1,5 @@
CC=go
BUILD=build -a -v -trimpath
BUILD=build -v -trimpath
VERSION=$(shell cat VERSION)
GCFLAGS=-gcflags '-e'
LDFLAGS=-ldflags '-buildid= -X main.version=$(VERSION) -s -w'

16
pkg/cmd/cmd.go
View file

@ -42,12 +42,12 @@ var (
configFile string
)
func initServer(cfg core.Config) (err error) {
func initServer(cfg *core.Config) (err error) {
// remove initial pledge due to violation with go1.12
// sysctl kern.somaxconn
//if err = godrop.PledgePromises("stdio rpath wpath cpath inet fattr flock proc exec id unveil"); err != nil {
// if err = godrop.PledgePromises("stdio rpath wpath cpath inet fattr flock proc exec id unveil"); err != nil {
// return
//}
// }
dropCfg := godrop.Config{
User: cfg.User,
Group: cfg.Group,
@ -169,7 +169,7 @@ func Run(version string) {
stdlog.Fatal("server: ", err)
}
config.Version = app.Version
if err := initServer(config); err != nil {
if err := initServer(&config); err != nil {
stdlog.Fatal("server: ", err)
}
return nil
@ -183,7 +183,7 @@ func Run(version string) {
if err := loadConfig(); err != nil {
stdlog.Fatal("reset: ", err)
}
DB, err := db.NewPlain(config)
DB, err := db.NewPlain(&config)
if err != nil {
stdlog.Fatal("reset: ", err)
}
@ -222,12 +222,12 @@ func Run(version string) {
stdlog.Fatal("dump: ", err)
}
if dumpFile != "-" {
file, err = os.OpenFile(dumpFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0640)
file, err = os.OpenFile(dumpFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o640)
if err != nil {
stdlog.Fatal("dump: ", err)
}
}
DB, err := db.NewPlain(config)
DB, err := db.NewPlain(&config)
if err != nil {
stdlog.Fatal("dump: ", err)
}
@ -260,7 +260,7 @@ func Run(version string) {
stdlog.Fatal("restore: ", err)
}
}
DB, err := db.NewPlain(config)
DB, err := db.NewPlain(&config)
if err != nil {
stdlog.Fatal("restore: ", err)
}

4
pkg/db/db.go
View file

@ -24,7 +24,7 @@ type DB struct {
Index *index.Index
}
func New(cfg core.Config) (db *DB, err error) {
func New(cfg *core.Config) (db *DB, err error) {
db, err = NewPlain(cfg)
if err != nil {
return
@ -48,7 +48,7 @@ func New(cfg core.Config) (db *DB, err error) {
return
}
func NewPlain(cfg core.Config) (db *DB, err error) {
func NewPlain(cfg *core.Config) (db *DB, err error) {
db = new(DB)
dbFile := filepath.Join(cfg.RunDir, storeFile)
db.store, err = store.NewBoltStore(dbFile, nil)

2
pkg/db/mutex.go
View file

@ -10,7 +10,7 @@ type countMutex struct {
c uint64
}
func (cm *countMutex) Lock() (uint64, uint64, bool) {
func (cm *countMutex) Lock() (max, c uint64, ok bool) {
if atomic.CompareAndSwapUint64(&cm.mu, 0, 1) {
return 0, 0, true
}

4
pkg/fs/fs.go
View file

@ -14,8 +14,8 @@ import (
)
const (
DirMode = 0750
FileMode = 0640
DirMode = 0o750
FileMode = 0o640
)
// Directory represents a directory and its contents

4
pkg/log/log.go
View file

@ -14,12 +14,12 @@ var (
debug = false
)
func InitLogger(cfg core.Config) {
func InitLogger(cfg *core.Config) {
debug = cfg.Debug
if cfg.LogFile == "-" {
return
}
f, err := os.OpenFile(filepath.Join(cfg.DataDir, cfg.LogFile), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0640)
f, err := os.OpenFile(filepath.Join(cfg.DataDir, cfg.LogFile), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0o640)
if err != nil {
stdlog.Fatal(err)
}

10
pkg/log/scanlog.go
View file

@ -13,7 +13,7 @@ const defaultSize = 500
type ScanLog struct {
// protects logs
sync.RWMutex
mu sync.RWMutex
size int
logs []string
@ -30,20 +30,20 @@ func (l *ScanLog) Printf(f string, v ...interface{}) {
s := fmt.Sprintf(f, v...)
Println(s)
s = core.LogTime() + s
l.Lock()
l.mu.Lock()
llen := len(l.logs)
if llen < l.size {
l.logs = append(l.logs, s)
} else if llen == l.size {
l.logs = append(l.logs[1:], s)
}
l.Unlock()
l.mu.Unlock()
}
func (l *ScanLog) Logs() (logs string) {
l.RLock()
l.mu.RLock()
logs = reverseJoin(l.logs, "\n")
l.RUnlock()
l.mu.RUnlock()
return
}

4
pkg/scan/scanner.go
View file

@ -38,7 +38,7 @@ type Tesseract struct {
var (
wsr = regexp.MustCompile(`[\t\f ]+`)
nlr = regexp.MustCompile(`[\n]{3,}`)
nlr = regexp.MustCompile(`\n{3,}`)
ws = []byte(" ")
nl = []byte("\n")
)
@ -50,7 +50,7 @@ type Scanner struct {
p PDF
}
func New(c core.Config) (s *Scanner, err error) {
func New(c *core.Config) (s *Scanner, err error) {
var (
tcmd string
pcmd string

14
pkg/server/handler.go
View file

@ -416,8 +416,7 @@ func deleteHandler(ctx *Context) {
func dirHandler(ctx *Context) {
ctx.Template("dirHandler")
path := ctx.Path()
switch ctx.Method() {
case "GET":
if ctx.Method() == "GET" {
mode, enoent, err := ctx.Srv.FS.Mode(path)
if !enoent && err != nil {
ctx.Error(err)
@ -439,7 +438,7 @@ func dirHandler(ctx *Context) {
Title: "Document Viewer | " + path,
}
ctx.Template("fileHandler")
//f := ctx.Srv.DB.IsIndexed(path)
// f := ctx.Srv.DB.IsIndexed(path)
id, err := ctx.Srv.DB.GetID(path)
f := err == nil
if id != "" {
@ -701,8 +700,7 @@ func logsHandler(ctx *Context) {
Title: "Logs",
BodyTitle: "Logs",
}
switch ctx.Method() {
case "GET":
if ctx.Method() == "GET" {
ctx.Data.Data = ctx.Srv.Log.Logs()
ctx.Exec()
}
@ -714,8 +712,7 @@ func tagsHandler(ctx *Context) {
Title: "Tags",
BodyTitle: "Tags",
}
switch ctx.Method() {
case "GET":
if ctx.Method() == "GET" {
t, err := ctx.Srv.DB.GetAllTags()
if err != nil {
ctx.Error(err)
@ -828,8 +825,7 @@ func statsHandler(ctx *Context) {
Title: "Stats",
BodyTitle: "Stats",
}
switch ctx.Method() {
case "GET":
if ctx.Method() == "GET" {
ctx.Data.Data = getStats(ctx.Srv.DB.Index)
ctx.Exec()
}

10
pkg/server/server.go
View file

@ -28,7 +28,7 @@ const (
)
type HTTPServer struct {
Config core.Config
Config *core.Config
listener net.Listener
srv *http.Server
@ -44,7 +44,7 @@ type HTTPServer struct {
res map[string][]byte
}
func NewHTTPServer(cfg core.Config, l net.Listener, s *scan.Scanner) (srv *HTTPServer) {
func NewHTTPServer(cfg *core.Config, l net.Listener, s *scan.Scanner) (srv *HTTPServer) {
srv = &HTTPServer{
Config: cfg,
listener: l,
@ -115,9 +115,9 @@ func (s *HTTPServer) buildRoutes() http.Handler {
r := mux.NewRouter()
r.NotFoundHandler = &notFoundHandler{s}
if s.Config.WebDav {
fs := authdav.NewWriteOnlyOnceFileSystem(webdav.Dir(s.Config.DataDir))
fs.Filters = []authdav.Filter{authdav.NewMacOSFilter()}
h := authdav.NewWebdavBasicAuth(core.WebDavPrefix, fs, nil, webdavLogger, s.DB, "DocStore WebDav")
dav := authdav.NewWriteOnlyOnceFileSystem(webdav.Dir(s.Config.DataDir))
dav.Filters = []authdav.Filter{authdav.NewMacOSFilter()}
h := authdav.NewWebdavBasicAuth(core.WebDavPrefix, dav, nil, webdavLogger, s.DB, "DocStore WebDav")
r.PathPrefix(core.WebDavPrefix).Handler(h)
}
r.Handle("/static/{file}", http.StripPrefix("/", http.FileServer(http.FS(static))))

4
pkg/store/boltstore.go
View file

@ -10,7 +10,7 @@ import (
const (
defaultBoltBucket = "default"
fileMode = 0640
fileMode = 0o640
)
type BoltStore struct {
@ -26,7 +26,7 @@ func NewBoltStore(file string, m Marshaler) (Store, error) {
if err != nil {
return nil, err
}
if err = db.Update(func(tx *bolt.Tx) (err error) {
if err := db.Update(func(tx *bolt.Tx) (err error) {
_, err = tx.CreateBucketIfNotExists([]byte(defaultBoltBucket))
return
}); err != nil {