Merge pull request #146 from oduwsdl/issue-110

Handle escaped URI-Rs
oduwsdl · Apr 17, 2024 · ae71612 · ae71612
2 parents 39c3610 + e6e7820
commit ae71612
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/main.go b/main.go
@@ -472,10 +472,16 @@ func aggregateTimemap(urir string, dttmp *time.Time, sess *Session) (basetm *lis
 }
 
 func parseURI(uri string) (urir string, err error) {
-	if !regs["isprtcl"].MatchString(uri) {
-		uri = "http://" + uri
+	uescd, err := url.PathUnescape(uri)
+	if err != nil {
+		logError.Printf("Error Unescaping path (%s): %v", uri, err)
+		return
+	}
+	uescd = strings.ReplaceAll(uescd, " ", "%20")
+	if !regs["isprtcl"].MatchString(uescd) {
+		uescd = "http://" + uescd
 	}
-	u, err := url.Parse(uri)
+	u, err := url.Parse(uescd)
 	if err == nil {
 		urir = u.String()
 	}