]> Cypherpunks.ru repositories - gocheese.git/commitdiff
projects / gocheese.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 60bbf40)
More reliable serial calculation
authorSergey Matveev <stargrave@stargrave.org>
Sun, 26 Sep 2021 14:01:06 +0000 (17:01 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Sun, 26 Sep 2021 17:15:43 +0000 (20:15 +0300)
doc/storage.texi patch | blob | history
list.go patch | blob | history
metadata.go patch | blob | history

diff --git a/doc/storage.texi b/doc/storage.texi
index 215db8ddb5d346f375c065078e41a9ad4fbab336..12edb708ebc47a11f28f2fc8abe964b0f2933fe6 100644 (file)
--- a/doc/storage.texi
+++ b/doc/storage.texi
@@ -46,7 +46,8 @@ SHA256 recalculated checksum. Also upstream has corresponding
 
 @file{private-package} is private package, because it contains
 @file{.internal} file. It can be uploaded and queries to it are not
 
 @file{private-package} is private package, because it contains
 @file{.internal} file. It can be uploaded and queries to it are not
-proxied to upstream PyPI. You have to create it manually. If you upload
-GPG signature, then it will be also stored.
+proxied to upstream PyPI. You have to create it manually.
 
 Each packages release file has @code{mtime} set to its upload time.
 
 Each packages release file has @code{mtime} set to its upload time.
+Package's serial is a sum of @code{mtime}s of the directory and
+@file{.metadata.rec} (if it exists).
diff --git a/list.go b/list.go
index 48a9d71498fc7cbaebe315bd76cba7d76b1871d2..7ca9b18f08e8bda641173b42d57c4dac3c97d988 100644 (file)
--- a/list.go
+++ b/list.go
@@ -21,6 +21,7 @@ import (
        "bytes"
        "encoding/hex"
        "errors"
        "bytes"
        "encoding/hex"
        "errors"
+       "fmt"
        "html/template"
        "io/fs"
        "io/ioutil"
        "html/template"
        "io/fs"
        "io/ioutil"
@@ -29,6 +30,7 @@ import (
        "os"
        "path/filepath"
        "sort"
        "os"
        "path/filepath"
        "sort"
+       "strconv"
        "strings"
        "time"
 )
        "strings"
        "time"
 )
@@ -39,7 +41,7 @@ var (
 <html>
   <head>
     <meta name="pypi:repository-version" content="1.0">
 <html>
   <head>
     <meta name="pypi:repository-version" content="1.0">
-    <title>Links for root</title>
+    <title>Simple index</title>
   </head>
   <body>{{$Refresh := .RefreshURLPath}}{{range .Packages}}
     <a href="{{$Refresh}}{{.}}/">{{.}}</a><br/>
   </head>
   <body>{{$Refresh := .RefreshURLPath}}{{range .Packages}}
     <a href="{{$Refresh}}{{.}}/">{{.}}</a><br/>
@@ -137,7 +139,7 @@ func filenameToVersion(fn string) string {
        return cols[0]
 }
 
        return cols[0]
 }
 
-func listDir(pkgName string, doSize bool) (int, []*PkgReleaseInfo, error) {
+func listDir(pkgName string, doSize bool) (int64, []*PkgReleaseInfo, error) {
        dirPath := filepath.Join(Root, pkgName)
        entries, err := os.ReadDir(dirPath)
        if err != nil {
        dirPath := filepath.Join(Root, pkgName)
        entries, err := os.ReadDir(dirPath)
        if err != nil {
@@ -206,7 +208,15 @@ func listDir(pkgName string, doSize bool) (int, []*PkgReleaseInfo, error) {
                releases = append(releases, release)
        }
        sort.Sort(PkgReleaseInfoByName(releases))
                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(
 }
 
 func serveListDir(
@@ -224,7 +234,7 @@ func serveListDir(
                !refreshDir(w, r, pkgName, "", false) {
                return
        }
                !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)
        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
        }
                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(buf.Bytes())
+       w.Write([]byte(fmt.Sprintf("<!--SERIAL %d-->\n", serial)))
 }
 }
diff --git a/metadata.go b/metadata.go
index 65080b506b256d82daefc230617a8f6622fd7574..87ff48a1df93d96e6f75881f6676f5c0bc0ac43c 100644 (file)
--- a/metadata.go
+++ b/metadata.go
@@ -108,7 +108,7 @@ type PkgReleaseInfo struct {
 
 type PkgMeta struct {
        Info       PkgInfo                      `json:"info"`
 
 type PkgMeta struct {
        Info       PkgInfo                      `json:"info"`
-       LastSerial int                          `json:"last_serial"`
+       LastSerial int64                        `json:"last_serial"`
        Releases   map[string][]*PkgReleaseInfo `json:"releases"`
        URLs       []*PkgReleaseInfo            `json:"urls"`
 }
        Releases   map[string][]*PkgReleaseInfo `json:"releases"`
        URLs       []*PkgReleaseInfo            `json:"urls"`
 }
Python private package repository and caching proxy