Merge pull request #29 from antavelos/manage-rel-url

Write fix to handle relative URL

Author: creekorful

ctrl.go

@@ -20,6 +20,7 @@ package main
 import (
 	"fmt"
 	"log"
+	"net/url"
 	"os/exec"
 	"strings"
 
@@ -655,8 +656,11 @@ func LoadContent(g *c.Gui, v *c.View) error {
 			if currItem == nil {
 				return nil
 			}
+
+			site := SitesList.CurrentItem().(db.Site)
 			event := currItem.(db.Event)
-			CurrentContent, _ = GetContent(event.Url)
+
+			CurrentContent, _ = GetContent(getContentURL(site, event.Url))
 			if err := UpdateContent(g, CurrentContent); err != nil {
 				log.Println("Error on UpdateContent", err)
 				return err
@@ -712,3 +716,16 @@ func Help(g *c.Gui, v *c.View) error {
 
 	return nil
 }
+
+func getContentURL(site db.Site, contentUrl string) string {
+	if !strings.HasPrefix(contentUrl, "http") {
+		u, err := url.Parse(site.Url)
+		if err != nil {
+			return contentUrl // it would have failed anyway (todo: maybe log error message and display it to end user?)
+		}
+
+		return fmt.Sprintf("%s://%s/%s", u.Scheme, u.Host, strings.TrimPrefix(contentUrl, "/"))
+	}
+
+	return contentUrl
+}

ctrl_test.go

@@ -0,0 +1,44 @@
+package main
+
+import (
+	"github.com/antavelos/terminews/db"
+	"testing"
+)
+
+func TestGetContentURL(t *testing.T) {
+	type test struct {
+		site     db.Site
+		url      string
+		expected string
+	}
+
+	tests := []test{
+		{
+			site:     db.Site{Url: "https://blog.example.org/index.xml"},
+			url:      "/2021/02/a-blog-post",
+			expected: "https://blog.example.org/2021/02/a-blog-post",
+		},
+		{
+			site:     db.Site{Url: "http://blog.example.org/index.xml"},
+			url:      "2021/02/a-blog-post",
+			expected: "http://blog.example.org/2021/02/a-blog-post",
+		},
+		{
+			site:     db.Site{Url: "https://blog.example.org/feed.rss"},
+			url:      "https://blog.example.org/super-blog-post",
+			expected: "https://blog.example.org/super-blog-post",
+		},
+		{
+			site:     db.Site{Url: "http://blog.example.org/feed.rss"},
+			url:      "http://blog.example.org/super-blog-post",
+			expected: "http://blog.example.org/super-blog-post",
+		},
+	}
+
+	for _, test := range tests {
+		value := getContentURL(test.site, test.url)
+		if value != test.expected {
+			t.Errorf("got: %s want: %s", value, test.expected)
+		}
+	}
+}