working commit

referer.go

@@ -1,88 +1,87 @@
 package client
 
 import (
-	"errors"
 	"net/url"
 	"strings"
 )
 
-type Reference struct {
+type Repository struct {
 	urlobj     *url.URL
 	user, pass string
-	repo, tag  string
+	base       string
 }
 
-func NewReference(rawref string) (*Reference, error) {
-	ref := &Reference{}
-	if !strings.Contains(rawref, "://") {
-		rawref = "https://" + rawref
+func NewRepository(rawrepo string) (*Repository, error) {
+	repo := &Repository{}
+	if !strings.Contains(rawrepo, "://") {
+		rawrepo = "https://" + rawrepo
 	}
-	urlobj, err := url.Parse(rawref)
+	urlobj, err := url.Parse(rawrepo)
 	if err != nil {
-		return ref, err
+		return repo, err
 	}
 	if urlobj.User != nil {
-		ref.user = urlobj.User.Username()
-		ref.pass, _ = urlobj.User.Password()
+		repo.user = urlobj.User.Username()
+		repo.pass, _ = urlobj.User.Password()
 		urlobj.User = nil
 	}
-	repotag := strings.SplitN(urlobj.Path, ":", 2)
-	if len(repotag) != 2 {
-		err = errors.New("Incorrect repo")
-		return ref, err
-	}
-	ref.urlobj = urlobj
-	ref.urlobj.Path = "/"
-	ref.repo = repotag[0]
-	ref.tag = repotag[1]
-	ref.urlobj = urlobj
+	repo.urlobj = urlobj
+	repo.base = repo.urlobj.Path
+	repo.urlobj.Path = "/"
+	repo.urlobj = urlobj
 
-	return ref, err
+	return repo, err
 }
 
-func (ref *Reference) Manifest() string {
-	curl := ref.urlobj.JoinPath("/v2", ref.repo, "/manifests", ref.tag)
+func (repo *Repository) Manifest(tag string) string {
+	curl := repo.urlobj.JoinPath("/v2", repo.base, "/manifests", tag)
 	return curl.String()
 }
 
-func (ref *Reference) Blob() string {
-	curl := ref.urlobj.JoinPath("/v2", ref.repo, "/blobs", ref.tag)
+func (repo *Repository) Blob(digest string) string {
+	curl := repo.urlobj.JoinPath("/v2", repo.base, "/blobs", digest)
 	return curl.String()
 }
 
-func (ref *Reference) Upload() string {
-	curl := ref.urlobj.JoinPath("/v2", ref.repo, "/blobs/uploads/")
+func (repo *Repository) Upload() string {
+	curl := repo.urlobj.JoinPath("/v2", repo.base, "/blobs/uploads/")
 	return curl.String()
 }
 
-func (ref *Reference) Patch(loc string) (string, error) {
+func (repo *Repository) Patch(loc string) (string, error) {
 	var curl *url.URL
 	var out string
 	var err error
-
+	if isUUID(loc) {
+		curl = repo.urlobj.JoinPath("/v2/", repo.base, "/blobs/uploads/", loc)
+		return curl.String(), nil
+	}
 	if strings.Contains(loc, "://") {
 		curl, err = url.Parse(loc)
 		if err != nil {
 			return out, err
 		}
 	} else {
-		curl = ref.urlobj.JoinPath(loc)
+		curl = repo.urlobj.JoinPath(loc)
 	}
 	out = curl.String()
 	return out, err
 }
 
-func (ref *Reference) Put(loc, digest string) (string, error) {
+func (repo *Repository) Put(loc, digest string) (string, error) {
 	var curl *url.URL
 	var out string
 	var err error
-	if strings.Contains(loc, "://") {
+
+	if isUUID(loc) {
+		curl = repo.urlobj.JoinPath("/v2/", repo.base, "/blobs/uploads/", loc)
+	} else if strings.Contains(loc, "://") {
 		curl, err = url.Parse(loc)
 		if err != nil {
 			return out, err
 		}
 	} else {
-		curl = ref.urlobj.JoinPath(loc)
+		curl = repo.urlobj.JoinPath(loc)
 	}
 	query := curl.Query()
 	query.Set("digest", digest)
@@ -91,10 +90,6 @@ func (ref *Reference) Put(loc, digest string) (string, error) {
 	return out, err
 }
 
-func (ref *Reference) Tag() string {
-	return ref.tag
-}
-
-func (ref *Reference) Userinfo() (string, string) {
-	return ref.user, ref.pass
+func (repo *Repository) Userinfo() (string, string) {
+	return repo.user, repo.pass
 }