From 9fc816c300cb1b4d021f62eefc8a357d5bc949b5 Mon Sep 17 00:00:00 2001
From: Nihilazo <nico@itwont.work>
Date: Fri, 20 Nov 2020 18:44:28 +0000
Subject: [PATCH] added dep on feeds, some cleanup

---
 go.mod  | 5 ++++-
 go.sum  | 2 ++
 main.go | 8 +++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 5d5b199..e991b15 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,7 @@ module tildegit.org/nihilazo/sitegenerator
 
 go 1.15
 
-require tildegit.org/nihilazo/go-gemtext v0.0.0-20201114202124-890be6eb3742
+require (
+	github.com/gorilla/feeds v1.1.1 // indirect
+	tildegit.org/nihilazo/go-gemtext v0.0.0-20201114202124-890be6eb3742
+)
diff --git a/go.sum b/go.sum
index ef5b610..66ab5c2 100644
--- a/go.sum
+++ b/go.sum
@@ -1,2 +1,4 @@
+github.com/gorilla/feeds v1.1.1 h1:HwKXxqzcRNg9to+BbvJog4+f3s/xzvtZXICcQGutYfY=
+github.com/gorilla/feeds v1.1.1/go.mod h1:Nk0jZrvPFZX1OBe5NPiddPw7CfwF6Q9eqzaBbaightA=
 tildegit.org/nihilazo/go-gemtext v0.0.0-20201114202124-890be6eb3742 h1:SE9EroZwQEH3mHxWah4UoHQGgBTa008VIjmh2PqSZXw=
 tildegit.org/nihilazo/go-gemtext v0.0.0-20201114202124-890be6eb3742/go.mod h1:KOdDbr9CNSpgmfNfCEjpDhaGPCd86Mp5+XGrZDBKZvo=
diff --git a/main.go b/main.go
index 73b4c71..200213d 100644
--- a/main.go
+++ b/main.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 	"tildegit.org/nihilazo/go-gemtext"
-	//ht "html/template"
+	"github.com/gorilla/feeds"
 	t "text/template"
 )
 
@@ -124,9 +124,9 @@ func processLinkString(s string, mode int) (string, error) {
 		return "", err
 	}
 	if mode == GEMINI {
-		o = filepath.Join(geminiPrefix, o)
+		o = geminiPrefix + "/" + o
 	} else if mode == HTML {
-		o = filepath.Join(htmlPrefix, strings.Replace(o, ".gmi", ".html", -1))
+		o = htmlPrefix + "/" + strings.Replace(o, ".gmi", ".html", -1)
 	}
 	return o, nil
 }
@@ -198,8 +198,6 @@ func processPage(f filePathInfo) error {
 		if err != nil {
 			return err
 		}
-	} else if filepath.Ext(f.Path) == ".tpl" {
-		// TODO handle template files
 	} else { // Non-gemtext files
 		rel, err := filepath.Rel(inputDir, f.Path)
 		if err != nil {