daniel
/
distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename: VersionChecker->VersionInfo.

master
Nan Monnand Deng 2013-07-23 17:05:13 -04:00
parent 5f13f19407
commit 262838e069
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/registry.go
View File

@ -98,9 +98,9 @@ func ResolveRepositoryName(reposName string) (string, string, error) {
return endpoint, reposName, err return endpoint, reposName, err
} }
// VersionChecker is used to model entities which has a version. // VersionInfo is used to model entities which has a version.
// It is basically a tupple with name and version. // It is basically a tupple with name and version.
type VersionChecker interface { type VersionInfo interface {
Name() string Name() string
Version() string Version() string
} }
@ -114,7 +114,7 @@ func doWithCookies(c *http.Client, req *http.Request) (*http.Response, error) {
// Set the user agent field in the header based on the versions provided // Set the user agent field in the header based on the versions provided
// in NewRegistry() and extra. // in NewRegistry() and extra.
func (r *Registry) setUserAgent(req *http.Request, extra ...VersionChecker) { func (r *Registry) setUserAgent(req *http.Request, extra ...VersionInfo) {
if len(r.baseVersions)+len(extra) == 0 { if len(r.baseVersions)+len(extra) == 0 {
return return
} }
@ -569,11 +569,11 @@ type ImgData struct {
type Registry struct { type Registry struct {
client *http.Client client *http.Client
authConfig *auth.AuthConfig authConfig *auth.AuthConfig
baseVersions []VersionChecker baseVersions []VersionInfo
baseVersionsStr string baseVersionsStr string
} }
func validVersion(version VersionChecker) bool { func validVersion(version VersionInfo) bool {
stopChars := " \t\r\n/" stopChars := " \t\r\n/"
if strings.ContainsAny(version.Name(), stopChars) { if strings.ContainsAny(version.Name(), stopChars) {
return false return false
@ -586,11 +586,11 @@ func validVersion(version VersionChecker) bool {
// Convert versions to a string and append the string to the string base. // Convert versions to a string and append the string to the string base.
// //
// Each VersionChecker will be converted to a string in the format of // Each VersionInfo will be converted to a string in the format of
// "product/version", where the "product" is get from the Name() method, while // "product/version", where the "product" is get from the Name() method, while
// version is get from the Version() method. Several pieces of verson information // version is get from the Version() method. Several pieces of verson information
// will be concatinated and separated by space. // will be concatinated and separated by space.
func appendVersions(base string, versions ...VersionChecker) string { func appendVersions(base string, versions ...VersionInfo) string {
if len(versions) == 0 { if len(versions) == 0 {
return base return base
} }
@ -612,7 +612,7 @@ func appendVersions(base string, versions ...VersionChecker) string {
return buf.String() return buf.String()
} }
func NewRegistry(root string, authConfig *auth.AuthConfig, baseVersions ...VersionChecker) (r *Registry, err error) { func NewRegistry(root string, authConfig *auth.AuthConfig, baseVersions ...VersionInfo) (r *Registry, err error) {
httpTransport := &http.Transport{ httpTransport := &http.Transport{
DisableKeepAlives: true, DisableKeepAlives: true,
Proxy: http.ProxyFromEnvironment, Proxy: http.ProxyFromEnvironment,