X-Git-Url: http://www.git.cypherpunks.ru/?p=gocheese.git;a=blobdiff_plain;f=list.go;h=7ca9b18f08e8bda641173b42d57c4dac3c97d988;hp=d8bd0732459d04fc805e1f6562418d71dae4c00b;hb=f077359218864862f94290b582cb09a4a8fa1b9c;hpb=60834a0713d5dcc6a9911511cb8618ce7358c824
diff --git a/list.go b/list.go
index d8bd073..7ca9b18 100644
--- a/list.go
+++ b/list.go
@@ -21,6 +21,7 @@ import (
"bytes"
"encoding/hex"
"errors"
+ "fmt"
"html/template"
"io/fs"
"io/ioutil"
@@ -29,6 +30,7 @@ import (
"os"
"path/filepath"
"sort"
+ "strconv"
"strings"
"time"
)
@@ -39,7 +41,7 @@ var (
- Links for root
+ Simple index
{{$Refresh := .RefreshURLPath}}{{range .Packages}}
{{.}}
@@ -66,7 +68,7 @@ var (
)
func listRoot(w http.ResponseWriter, r *http.Request) {
- files, err := ioutil.ReadDir(*Root)
+ files, err := ioutil.ReadDir(Root)
if err != nil {
log.Println("error", r.RemoteAddr, "root", err)
http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -137,8 +139,8 @@ func filenameToVersion(fn string) string {
return cols[0]
}
-func listDir(pkgName string, doSize bool) (int, []*PkgReleaseInfo, error) {
- dirPath := filepath.Join(*Root, pkgName)
+func listDir(pkgName string, doSize bool) (int64, []*PkgReleaseInfo, error) {
+ dirPath := filepath.Join(Root, pkgName)
entries, err := os.ReadDir(dirPath)
if err != nil {
return 0, nil, err
@@ -206,7 +208,15 @@ func listDir(pkgName string, doSize bool) (int, []*PkgReleaseInfo, error) {
releases = append(releases, release)
}
sort.Sort(PkgReleaseInfoByName(releases))
- return len(entries), releases, nil
+ fi, err := os.Stat(dirPath)
+ if err != nil {
+ return 0, nil, err
+ }
+ serial := fi.ModTime().Unix()
+ if fi, err = os.Stat(filepath.Join(dirPath, MetadataFile)); err == nil {
+ serial += fi.ModTime().Unix()
+ }
+ return serial, releases, nil
}
func serveListDir(
@@ -215,7 +225,7 @@ func serveListDir(
pkgName string,
autorefresh, gpgUpdate bool,
) {
- dirPath := filepath.Join(*Root, pkgName)
+ dirPath := filepath.Join(Root, pkgName)
if autorefresh {
if !refreshDir(w, r, pkgName, "", gpgUpdate) {
return
@@ -224,7 +234,7 @@ func serveListDir(
!refreshDir(w, r, pkgName, "", false) {
return
}
- _, releases, err := listDir(pkgName, false)
+ serial, releases, err := listDir(pkgName, false)
if err != nil {
log.Println("error", r.RemoteAddr, "list", pkgName, err)
http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -258,5 +268,7 @@ func serveListDir(
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
+ w.Header().Set("X-PyPI-Last-Serial", strconv.FormatInt(serial, 10))
w.Write(buf.Bytes())
+ w.Write([]byte(fmt.Sprintf("\n", serial)))
}