Piotr Czajkowski пре 1 недеља
родитељ
комит
aae5f85a59
2 измењених фајлова са 5 додато и 4 уклоњено
  1. 1 1
      server.go
  2. 4 3
      storage.go

+ 1 - 1
server.go

@@ -55,7 +55,7 @@ func shorten(w http.ResponseWriter, r *http.Request) {
 func decode(w http.ResponseWriter, r *http.Request) {
 	link := r.URL.Query().Get("link")
 	if link == "" {
-		link = strings.TrimPrefix(r.URL.Path, shortenPath)
+		link = strings.TrimPrefix(r.URL.Path, decodePath)
 	}
 
 	parts := strings.Split(link, "/")

+ 4 - 3
storage.go

@@ -50,6 +50,8 @@ func readLinks(path string) {
 
 }
 
+const errCollision = "Can't add link: hash collision"
+
 func addLink(link string, toSave chan<- string) (bool, string) {
 	u, err := url.Parse(link)
 	if err != nil {
@@ -64,9 +66,8 @@ func addLink(link string, toSave chan<- string) (bool, string) {
 	existingLink, loaded := links.LoadOrStore(linkID, link)
 	if loaded {
 		if existingLink != link {
-			m := "Can't add link."
-			log.Println(m)
-			return false, m
+			log.Println(errCollision)
+			return false, errCollision
 		}
 
 		return true, linkID