add dockerfile

Author: lsongdev

Dockerfile

@@ -0,0 +1,7 @@
+FROM alpine:3.20
+
+RUN apk add --no-cache ca-certificates
+COPY bin/reader-linux-amd64 /usr/local/bin/reader
+
+EXPOSE 8080
+CMD ["reader", "-d", "/data"]

Makefile

@@ -6,9 +6,17 @@ build:
 	GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o ${BINARY_NAME}-linux-amd64
 	GOARCH=amd64 GOOS=windows go build -ldflags="-s -w" -o ${BINARY_NAME}-windows-amd64.exe
 
+docker:
+	docker compose build
+
+docker-run:
+	docker compose up -d
+
+docker-stop:
+	docker compose down
+
 clean:
 	go clean
-	rm ${BINARY_NAME}-darwin-arm64
-	rm ${BINARY_NAME}-darwin-amd64
-	rm ${BINARY_NAME}-linux-amd64
-	rm ${BINARY_NAME}-windows-x64.exe
+	rm -f ${BINARY_NAME}-darwin-arm64 ${BINARY_NAME}-darwin-amd64 ${BINARY_NAME}-linux-amd64 ${BINARY_NAME}-windows-x64.exe
+
+.PHONY: build docker docker-run docker-stop clean

README.md

@@ -14,7 +14,7 @@ The server comes with a built-in, minimal web UI for easy feed management.
 
 ### Fever API Support
 
-FeedReader supports the [Fever API](https://github.com/song940/fever-go), enabling integration with various RSS client apps.
+FeedReader supports the [Fever API](https://github.com/lsongdev/fever-go), enabling integration with various RSS client apps.
 
 ![Fever API](./screenshots/app.jpg)
 
@@ -28,7 +28,7 @@ FeedReader supports the [Fever API](https://github.com/song940/fever-go), enabli
 To install FeedReader, run the following commands in your terminal:
 
 ```shell
-curl -L https://github.com/song940/feedreader/releases/download/<tag>/reader-linux-$(uname -m) -o /usr/local/bin/feedreader
+curl -L https://github.com/lsongdev/feedreader/releases/download/<tag>/reader-linux-$(uname -m) -o /usr/local/bin/feedreader
 chmod +x /usr/local/bin/feedreader
 ```
 
@@ -37,7 +37,7 @@ Then, create a systemd service file for FeedReader:
 ```ini
 [Unit]
 Description=FeedReader - A Self-hosted RSS Feed Aggregator Service
-Documentation=https://github.com/song940/feedreader
+Documentation=https://github.com/lsongdev/feedreader
 After=network-online.target
 Wants=network-online.target systemd-networkd-wait-online.service
 

docker-compose.yaml

@@ -0,0 +1,8 @@
+services:
+  feedreader:
+    build: .
+    ports:
+      - "7789:8080"
+    volumes:
+      - ~/.feedreader:/data
+    restart: unless-stopped

main.go

@@ -1,13 +1,18 @@
 package main
 
 import (
+	"flag"
 	"net/http"
 
 	"github.com/lsongdev/feedreader/reader"
 	"github.com/song940/fever-go/fever"
 )
 
 func main() {
+
+	flag.StringVar(&reader.ConfigDir, "d", "~/.feedreader", "")
+	flag.Parse()
+
 	config := reader.NewConfig()
 	config.Load()
 

reader/config.go

@@ -0,0 +1,45 @@
+package reader
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+
+	"gopkg.in/yaml.v2"
+)
+
+func expandHomeDir(path string) string {
+	if strings.HasPrefix(path, "~/") {
+		return filepath.Join(os.Getenv("HOME"), path[2:])
+	}
+	return path
+}
+
+var ConfigDir = filepath.Join(os.Getenv("HOME"), ".feedreader")
+
+type Config struct {
+	Title  string `json:"title" yaml:"title"`
+	Listen string `json:"listen" yaml:"listen"`
+	Users  []User `json:"users" yaml:"users"`
+}
+
+func NewConfig() *Config {
+	return &Config{
+		Title:  "Reader",
+		Listen: "0.0.0.0:8080",
+		Users:  []User{{"admin", "admin123"}},
+	}
+}
+
+func (conf *Config) Load() error {
+	ConfigDir = expandHomeDir(ConfigDir)
+	filename := filepath.Join(ConfigDir, "config.yaml")
+	if _, err := os.Stat(filename); os.IsNotExist(err) {
+		return err
+	}
+	data, err := os.ReadFile(filename)
+	if err != nil {
+		return err
+	}
+	return yaml.Unmarshal(data, &conf)
+}

reader/reader.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	"path"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -51,9 +52,9 @@ type Reader struct {
 // New initializes a new instance of the Reader application.
 func NewReader(config *Config) (reader *Reader, err error) {
 	// Open a database connection
-	file := path.Join(config.Dir, "reader.db")
+	file := path.Join(expandHomeDir(ConfigDir), "reader.db")
 	if _, err := os.Stat(file); os.IsNotExist(err) {
-		os.MkdirAll(config.Dir, 0755)
+		os.MkdirAll(filepath.Dir(file), 0755)
 	}
 	db, err := sql.Open("sqlite", file)
 	if err != nil {

reader/server.go

@@ -9,51 +9,20 @@ import (
 	"log"
 	"net/http"
 	"net/url"
-	"os"
-	"path/filepath"
 	"strconv"
 	"time"
 
 	"github.com/lsongdev/feedreader/feed"
 	"github.com/lsongdev/feedreader/templates"
-	"gopkg.in/yaml.v2"
 )
 
-type H map[string]interface{}
+type H map[string]any
 
 type User struct {
 	Username string `json:"username"`
 	Password string `json:"password"`
 }
 
-type Config struct {
-	Dir        string `json:"-" yaml:"-"`
-	Title      string `json:"title" yaml:"title"`
-	Listen     string `json:"listen" yaml:"listen"`
-	Users      []User `json:"users" yaml:"users"`
-	Stylesheet string `json:"stylesheet" yaml:"stylesheet"`
-}
-
-func NewConfig() *Config {
-	return &Config{
-		Title:  "Reader",
-		Listen: "0.0.0.0:8080",
-		Users:  []User{{"admin", "admin123"}},
-	}
-}
-
-func (conf *Config) Load() error {
-	filename := filepath.Join(conf.Dir, "config.yaml")
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		return err
-	}
-	data, err := os.ReadFile(filename)
-	if err != nil {
-		return err
-	}
-	return yaml.Unmarshal(data, &conf)
-}
-
 type Pagination struct {
 	Page  int
 	Size  int
@@ -101,7 +70,7 @@ func (reader *Reader) Render(w http.ResponseWriter, templateName string, data H)
 		data = H{}
 	}
 	data["AppName"] = reader.config.Title
-	data["Stylesheet"] = template.CSS(reader.config.Stylesheet)
+	// data["Stylesheet"] = template.CSS(reader.config.Stylesheet)
 	// tmpl, err := template.ParseFiles("templates/layout.html", "templates/"+templateName+".html")
 	// Parse templates from embedded file system
 	tmpl, err := template.New("").ParseFS(templates.Files, "layout.html", templateName+".html")
@@ -443,20 +412,28 @@ func (reader *Reader) PostsJson(w http.ResponseWriter, r *http.Request) {
 }
 
 func (reader *Reader) CategoryView(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "POST" {
-		return
-	}
-	r.ParseForm()
-	if !reader.CheckAuth(w, r) {
+	if r.Method == "POST" {
+		r.ParseForm()
+		if !reader.CheckAuth(w, r) {
+			return
+		}
+		categoryName := r.FormValue("name")
+		_, err := reader.CreateCategory(categoryName)
+		if err != nil {
+			reader.Error(w, err)
+			return
+		}
+		http.Redirect(w, r, "/categories", http.StatusFound)
 		return
 	}
-	categoryName := r.FormValue("name")
-	categoryId, err := reader.CreateCategory(categoryName)
+	categories, err := reader.GetCategories()
 	if err != nil {
 		reader.Error(w, err)
 		return
 	}
-	http.Redirect(w, r, fmt.Sprintf("/posts?category=%d", categoryId), http.StatusFound)
+	reader.Render(w, "categories", H{
+		"categories": categories,
+	})
 }
 
 func (reader *Reader) RefreshView(w http.ResponseWriter, r *http.Request) {

templates/categories.html

@@ -0,0 +1,20 @@
+{{define "page"}}
+
+<h2>Categories</h2>
+
+<form method="post" action="/categories">
+  <div class="form-field">
+    <label for="name">Category Name:</label>
+    <input type="text" name="name" placeholder="Category Name" required class="input">
+  </div>
+  <div class="form-field">
+    <input type="submit" value="Create" class="button">
+  </div>
+</form>
+
+<ul class="list">
+  {{range .categories}}
+  <li>{{.Name}}</li>
+  {{end}}
+</ul>
+{{end}}

templates/layout.html

@@ -14,14 +14,6 @@
       padding: 0;
     }
 
-    .container {
-      padding: 10px 30px 100px 30px;
-    }
-
-    .form-field {
-      margin-bottom: 5px;
-    }
-
     article {
       overflow: hidden;
       white-space: wrap;
@@ -31,13 +23,6 @@
       color: red;
     }
   </style>
-  <style>
-    {
-        {
-        .Stylesheet
-      }
-    }
-  </style>
 </head>
 
 <body>
@@ -46,6 +31,7 @@ <h1><a href="/">{{.AppName}}</a></h1>
     <nav>
       <a href="/posts">posts</a>
       <a href="/feeds">feeds</a>
+      <a href="/categories">categories</a>
       <a href="/new">[+]</a>
       <a href="/rss.xml">[rss]</a>
       <a href="/atom.xml">[atom]</a>