Skip to content

Commit 9d525cc

Browse files
committed
chore: satisfy linter
1 parent 913a10e commit 9d525cc

File tree

2 files changed

+40
-21
lines changed

2 files changed

+40
-21
lines changed

cmd/texd/main.go

+20-11
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,21 @@ import (
2828
"github.com/thediveo/enumflag"
2929
)
3030

31+
const (
32+
defaultQueueTimeout = 10 * time.Second
33+
defaultMaxJobSize = 50 * units.MiB
34+
defaultCompileTimeout = time.Minute
35+
defaultRetentionPoolSize = 100 * units.MiB
36+
37+
exitFlagErr = 2
38+
)
39+
3140
var opts = service.Options{
3241
Addr: ":2201",
3342
QueueLength: runtime.GOMAXPROCS(0),
34-
QueueTimeout: 10 * time.Second,
35-
MaxJobSize: 50 * units.MiB,
36-
CompileTimeout: time.Minute,
43+
QueueTimeout: defaultQueueTimeout,
44+
MaxJobSize: defaultMaxJobSize,
45+
CompileTimeout: defaultCompileTimeout,
3746
Mode: "local",
3847
Executor: exec.LocalExec,
3948
KeepJobs: service.KeepJobsNever,
@@ -60,8 +69,8 @@ var (
6069
1: {"purge", "purge-on-start"},
6170
2: {"access"},
6271
}
63-
retPolItems = 1000 // number of items in refstore
64-
retPolSize = units.BytesSize(float64(100 * units.MiB)) // max total file size
72+
retPolItems = 1000 // number of items in refstore
73+
retPolSize = units.BytesSize(float64(defaultRetentionPoolSize)) // max total file size
6574
)
6675

6776
func retentionPolicy() (refstore.RetentionPolicy, error) {
@@ -70,7 +79,7 @@ func retentionPolicy() (refstore.RetentionPolicy, error) {
7079
return &refstore.KeepForever{}, nil
7180
case 1:
7281
return &refstore.PurgeOnStart{}, nil
73-
case 2:
82+
case 2: //nolint:mnd
7483
sz, err := units.FromHumanSize(retPolSize)
7584
if err != nil {
7685
return nil, err
@@ -129,13 +138,13 @@ func parseFlags() []string {
129138
os.Exit(0)
130139
case err != nil:
131140
fmt.Fprintf(os.Stderr, "Error parsing flags:\n\t%v\n", err)
132-
os.Exit(2)
141+
os.Exit(exitFlagErr)
133142
}
134143

135144
return fs.Args()
136145
}
137146

138-
func main() {
147+
func main() { //nolint:funlen
139148
texd.PrintBanner(os.Stdout)
140149
images := parseFlags() //nolint:ifshort // func has sideeffects
141150
log, err := setupLogger()
@@ -158,12 +167,12 @@ func main() {
158167
xlog.String("flag", "--tex-engine"),
159168
xlog.Error(err))
160169
}
161-
if max, err := units.FromHumanSize(maxJobSize); err != nil {
170+
if maxsz, err := units.FromHumanSize(maxJobSize); err != nil {
162171
log.Fatal("error parsing maximum job size",
163172
xlog.String("flag", "--max-job-size"),
164173
xlog.Error(err))
165174
} else {
166-
opts.MaxJobSize = max
175+
opts.MaxJobSize = maxsz
167176
}
168177
if storageDSN != "" {
169178
rp, err := retentionPolicy()
@@ -212,7 +221,7 @@ const exitTimeout = 10 * time.Second
212221
type stopFun func(context.Context) error
213222

214223
func onExit(log xlog.Logger, stopper ...stopFun) {
215-
exitCh := make(chan os.Signal, 2)
224+
exitCh := make(chan os.Signal, 2) //nolint:mnd // idiomatic
216225
signal.Notify(exitCh, syscall.SIGINT, syscall.SIGTERM)
217226
sig := <-exitCh
218227

tex/document.go

+20-10
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ import (
1818
// should specify main files explicitly.
1919
const Mark = "%!texd"
2020

21+
// When no main input file is given, the first KiB of each TeX file is
22+
// searched for a `\documentclass` macro. This is another last resort
23+
// measurement.
24+
const guessLimit = 1024 // first KiB
25+
26+
const (
27+
o_rwx = 0o700 // read, write, execute permissions for owner
28+
o_rw = 0o600 // read and write permissions for owner
29+
)
30+
2131
// texFs can be overridden in tests.
2232
var texFs = afero.NewOsFs()
2333

@@ -57,8 +67,8 @@ type fileWriter struct {
5767
func (w *fileWriter) Write(p []byte) (int, error) {
5868
if w.file.isCandidate() {
5969
// fill buf, if buf has capacity
60-
if max := len(w.buf); w.off < max {
61-
if n := max - w.off; n > len(p) {
70+
if pos := len(w.buf); w.off < pos {
71+
if n := pos - w.off; n > len(p) {
6272
// p fits completely into buf's rest capacity
6373
copy(w.buf[w.off:], p)
6474
w.off += len(p)
@@ -271,33 +281,33 @@ func (doc *document) NewWriter(name string) (wc io.WriteCloser, err error) {
271281
var ok bool
272282
if file.name, ok = cleanpath(name); !ok {
273283
err = InputError("invalid file name", nil, nil)
274-
return
284+
return wc, err
275285
}
276286

277287
if _, exists := doc.files[name]; exists {
278288
err = InputError("duplicate file name", nil, nil)
279-
return
289+
return wc, err
280290
} else {
281291
doc.files[name] = file
282292
}
283293

284294
var wd string
285295
wd, err = doc.WorkingDirectory()
286296
if err != nil {
287-
return // err is already an errWithCategory
297+
return wc, err // err is already an errWithCategory
288298
}
289299

290300
if dir := path.Dir(name); dir != "" {
291-
if osErr := doc.fs.MkdirAll(path.Join(wd, dir), 0o700); osErr != nil {
301+
if osErr := doc.fs.MkdirAll(path.Join(wd, dir), o_rwx); osErr != nil {
292302
err = InputError("cannot create directory", osErr, nil)
293-
return
303+
return wc, err
294304
}
295305
}
296306

297-
f, osErr := doc.fs.OpenFile(path.Join(wd, name), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0o600)
307+
f, osErr := doc.fs.OpenFile(path.Join(wd, name), os.O_CREATE|os.O_APPEND|os.O_WRONLY, o_rw)
298308
if osErr != nil {
299309
err = InputError("cannot create file", osErr, nil)
300-
return
310+
return wc, err
301311
}
302312

303313
log := doc.log.With(xlog.String("filename", file.name))
@@ -310,7 +320,7 @@ func (doc *document) NewWriter(name string) (wc io.WriteCloser, err error) {
310320
log: log,
311321
file: file,
312322
wc: f,
313-
buf: make([]byte, 1024),
323+
buf: make([]byte, guessLimit),
314324
}, nil
315325
}
316326

0 commit comments

Comments
 (0)