X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=warc%2Furis.go;h=2c40dcfbb7f60cde38240edd8309c07749fbd3c1;hb=HEAD;hp=4d8c1a34b20fef8aa77d5ba64f89d9835535b9dc;hpb=bae1cfe5ce46a1b758ccc4dddda2751b6ac47f3e;p=tofuproxy.git diff --git a/warc/uris.go b/warc/uris.go index 4d8c1a3..35cce91 100644 --- a/warc/uris.go +++ b/warc/uris.go @@ -1,26 +1,27 @@ -/* -tofuproxy -- flexible HTTP/WARC proxy with TLS certificates management -Copyright (C) 2021 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// tofuproxy -- flexible HTTP/HTTPS proxy, TLS terminator, X.509 TOFU +// manager, WARC/geminispace browser +// Copyright (C) 2021-2025 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package warc import ( "encoding/gob" + "errors" "fmt" "io" + "io/fs" "log" "os" "strconv" @@ -45,10 +46,10 @@ func Add(warcPath string) error { var uris map[string]*Record var offsets []Offset dec := gob.NewDecoder(fd) - if err := dec.Decode(&uris); err != nil { + if err = dec.Decode(&uris); err != nil { return err } - if err := dec.Decode(&offsets); err != nil { + if err = dec.Decode(&offsets); err != nil { return err } WARCsM.Lock() @@ -58,7 +59,7 @@ func Add(warcPath string) error { log.Println("loaded marshalled index:", warcPath+IndexExt) return nil } - if err != nil && !os.IsNotExist(err) { + if !errors.Is(err, fs.ErrNotExist) { return err } r, err := NewReader(warcPath) @@ -122,7 +123,7 @@ func Add(warcPath string) error { return nil } -func SaveIndexes() error { +func SaveIndices() error { WARCsM.RLock() defer WARCsM.RUnlock() for warcPath, uris := range WARCs { @@ -134,7 +135,7 @@ func SaveIndexes() error { fd, err := os.OpenFile( p+tmpSuffix, os.O_WRONLY|os.O_CREATE|os.O_EXCL, - os.FileMode(0666), + os.FileMode(0o666), ) if err != nil { return err