blankie
/
rimgo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add image cache and use struct for config (closes #58)

This commit is contained in:
video-prize-ranch 2022-09-30 16:57:18 -04:00
parent f1c058cbfc
commit 4306b3bb81
No known key found for this signature in database
GPG Key ID: D8EAA4C5B12A7281
9 changed files with 116 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env.example
View File

@ -3,6 +3,11 @@ PORT=3000
FIBER_PREFORK=false
IMGUR_CLIENT_ID=546c25a59c58ad7
# Create IMAGE_CACHE_DIR before enabling image caching
IMAGE_CACHE=false
IMAGE_CACHE_DIR=/var/cache/rimgo
IMAGE_CACHE_CLEANUP_INTERVAL=24h
# Instance privacy
# For more information, see https://codeberg.org/librarian/librarian/wiki/Instance-privacy
# Required to be on the instance list.

6
api/album.go
View File

@ -42,7 +42,7 @@ func FetchAlbum(albumID string) (Album, error) {
return cacheData.(Album), nil
}
data, err := utils.GetJSON("https://api.imgur.com/post/v1/albums/" + albumID + "?client_id=" + utils.Config["imgurId"].(string) + "&include=media%2Caccount")
data, err := utils.GetJSON("https://api.imgur.com/post/v1/albums/" + albumID + "?client_id=" + utils.Config.ImgurId + "&include=media%2Caccount")
if err != nil {
return Album{}, err
}
@ -62,7 +62,7 @@ func FetchPosts(albumID string) (Album, error) {
return cacheData.(Album), nil
}
data, err := utils.GetJSON("https://api.imgur.com/post/v1/posts/" + albumID + "?client_id=" + utils.Config["imgurId"].(string) + "&include=media%2Caccount%2Ctags")
data, err := utils.GetJSON("https://api.imgur.com/post/v1/posts/" + albumID + "?client_id=" + utils.Config.ImgurId + "&include=media%2Caccount%2Ctags")
if err != nil {
return Album{}, err
}
@ -82,7 +82,7 @@ func FetchMedia(mediaID string) (Album, error) {
return cacheData.(Album), nil
}
data, err := utils.GetJSON("https://api.imgur.com/post/v1/media/" + mediaID + "?client_id=" + utils.Config["imgurId"].(string) + "&include=media%2Caccount")
data, err := utils.GetJSON("https://api.imgur.com/post/v1/media/" + mediaID + "?client_id=" + utils.Config.ImgurId + "&include=media%2Caccount")
if err != nil {
return Album{}, err
}

2
api/comments.go
View File

@ -33,7 +33,7 @@ func FetchComments(galleryID string) ([]Comment, error) {
return cacheData.([]Comment), nil
}
data, err := utils.GetJSON("https://api.imgur.com/comment/v1/comments?client_id=" + utils.Config["imgurId"].(string) + "&filter[post]=eq:" + galleryID + "&include=account,adconfig&per_page=30&sort=best")
data, err := utils.GetJSON("https://api.imgur.com/comment/v1/comments?client_id=" + utils.Config.ImgurId + "&filter[post]=eq:" + galleryID + "&include=account,adconfig&per_page=30&sort=best")
if err != nil {
return []Comment{}, nil
}

2
api/tag.go
View File

@ -36,7 +36,7 @@ func FetchTag(tag string, sort string, page string) (Tag, error) {
}
q := req.URL.Query()
q.Add("client_id", utils.Config["imgurId"].(string))
q.Add("client_id", utils.Config.ImgurId)
q.Add("include", "cover")
q.Add("page", page)

4
api/user.go
View File

@ -43,7 +43,7 @@ func FetchUser(username string) (User, error) {
return cacheData.(User), nil
}
res, err := http.Get("https://api.imgur.com/account/v1/accounts/" + username + "?client_id=" + utils.Config["imgurId"].(string))
res, err := http.Get("https://api.imgur.com/account/v1/accounts/" + username + "?client_id=" + utils.Config.ImgurId)
if err != nil {
return User{}, err
}
@ -77,7 +77,7 @@ func FetchSubmissions(username string, sort string, page string) ([]Submission,
return cacheData.([]Submission), nil
}
data, err := utils.GetJSON("https://api.imgur.com/3/account/" + username + "/submissions/" + page + "/" + sort + "?album_previews=1&client_id=" + utils.Config["imgurId"].(string))
data, err := utils.GetJSON("https://api.imgur.com/3/account/" + username + "/submissions/" + page + "/" + sort + "?album_previews=1&client_id=" + utils.Config.ImgurId)
if err != nil {
return []Submission{}, err
}

20
main.go
View File

@ -3,7 +3,11 @@ package main
import (
"flag"
"fmt"
"log"
"net/http"
"os"
"path/filepath"
"time"
"codeberg.org/video-prize-ranch/rimgo/pages"
"codeberg.org/video-prize-ranch/rimgo/static"
@ -24,10 +28,22 @@ func main() {
}
utils.LoadConfig()
if utils.Config.ImageCache {
go func() {
for range time.Tick(utils.Config.CleanupInterval) {
log.Println("Cache cleaned")
files, _ := filepath.Glob(filepath.Join(utils.Config.CacheDir, "*"))
for _, file := range files {
os.RemoveAll(file)
}
}
}()
}
engine := handlebars.NewFileSystem(http.FS(views.GetFiles()), ".hbs")
app := fiber.New(fiber.Config{
Views: engine,
Prefork: utils.Config["fiberPrefork"].(bool),
Prefork: utils.Config.FiberPrefork,
UnescapePath: true,
StreamRequestBody: true,
ErrorHandler: func(ctx *fiber.Ctx, err error) error {
@ -90,5 +106,5 @@ func main() {
app.Get("/gallery/:postID", pages.HandlePost)
app.Get("/gallery/:postID/embed", pages.HandleEmbed)
app.Listen(utils.Config["addr"].(string) + ":" + utils.Config["port"].(string))
app.Listen(utils.Config.Addr + ":" + utils.Config.Port)
}

33
pages/media.go
View File

@ -1,6 +1,9 @@
package pages
import (
"crypto/sha256"
"encoding/hex"
"io"
"net/http"
"os"
"strings"
@ -37,6 +40,19 @@ func handleMedia(c *fiber.Ctx, url string) error {
url = strings.ReplaceAll(url, ".jpeg", ".webp")
}
optionsHash := ""
if utils.Config.ImageCache {
hasher := sha256.New()
hasher.Write([]byte(url))
optionsHash = hex.EncodeToString(hasher.Sum(nil))
image, err := os.ReadFile(utils.Config.CacheDir + "/" + optionsHash)
if err == nil {
_, err := c.Write(image)
return err
}
}
req, err := http.NewRequest("GET", url, nil)
if err != nil {
return err
@ -63,5 +79,20 @@ func handleMedia(c *fiber.Ctx, url string) error {
c.Set("Content-Range", res.Header.Get("Content-Range"))
}
return c.SendStream(res.Body)
if strings.HasPrefix(res.Header.Get("Content-Type"), "image/") && utils.Config.ImageCache && res.StatusCode == 200 {
data, err := io.ReadAll(res.Body)
if err != nil {
return err
}
err = os.WriteFile(utils.Config.CacheDir + "/" + optionsHash, data, 0644)
if err != nil {
return err
}
_, err = c.Write(data)
return err
} else {
return c.SendStream(res.Body)
}
}

55
utils/config.go
View File

@ -1,8 +1,23 @@
package utils
import "os"
import (
"log"
"os"
"time"
)
var Config map[string]interface{}
type config struct {
Port string
Addr string
ImgurId string
FiberPrefork bool
ImageCache bool
CleanupInterval time.Duration
CacheDir string
Privacy map[string]interface{}
}
var Config config
func LoadConfig() {
port := "3000"
@ -13,11 +28,6 @@ func LoadConfig() {
port = os.Getenv("RIMGU_PORT")
}
fiberPrefork := false
if os.Getenv("FIBER_PREFORK") == "true" {
fiberPrefork = true
}
addr := "0.0.0.0"
if os.Getenv("ADDRESS") != "" {
addr = os.Getenv("ADDRESS")
@ -34,14 +44,29 @@ func LoadConfig() {
imgurId = os.Getenv("RIMGU_IMGUR_CLIENT_ID")
}
Config = map[string]interface{}{
"port": port,
"addr": addr,
"imgurId": imgurId,
"fiberPrefork": fiberPrefork,
"privacy": map[string]interface{}{
"set": os.Getenv("PRIVACY_NOT_COLLECTED") != "",
"policy": os.Getenv("PRIVACY_POLICY"),
imageCache := os.Getenv("IMAGE_CACHE") == "true"
cleanupInterval, err := time.ParseDuration(os.Getenv("IMAGE_CACHE_CLEANUP_INTERVAL"))
if err != nil && imageCache {
log.Fatal("invalid configuration: invalid duration for IMAGE_CACHE_CLEANUP_INTERVAL")
}
cacheDir := os.Getenv("IMAGE_CACHE_DIR")
if cacheDir == "" && imageCache {
log.Fatal("invalid configuration: no IMAGE_CACHE_DIR")
}
Config = config{
Port: port,
Addr: addr,
ImgurId: imgurId,
FiberPrefork: os.Getenv("FIBER_PREFORK") == "true",
ImageCache: imageCache,
CleanupInterval: cleanupInterval,
CacheDir: cacheDir,
Privacy: map[string]interface{}{
"set": os.Getenv("PRIVACY_NOT_COLLECTED") != "",
"policy": os.Getenv("PRIVACY_POLICY"),
"message": os.Getenv("PRIVACY_MESSAGE"),
"country": os.Getenv("PRIVACY_COUNTRY"),
"provider": os.Getenv("PRIVACY_PROVIDER"),

28
views/privacy.hbs
View File

@ -14,18 +14,18 @@
<main>
<h1>Instance Privacy</h1>
{{#if config.privacy.policy}}
{{#if config.Privacy.policy}}
<p>The instance operator has indicated their instance's privacy practices below. For more information, see the
instance operator's <a href="{{config.privacy.policy}}">privacy policy</a>.</p>
instance operator's <a href="{{config.Privacy.policy}}">privacy policy</a>.</p>
{{else}}
<p>The instance operator has indicated their instance's privacy practices below.</p>
{{/if}}
{{#if config.privacy.message}}
<p>{{{config.privacy.message}}}</p>
{{#if config.Privacy.message}}
<p>{{{config.Privacy.message}}}</p>
{{/if}}
{{#if config.privacy.not_collected}}
{{#if config.Privacy.not_collected}}
<div class="badgeWrapper">
<div class="badge">
<span class="material-icons-outlined largeIcon">
@ -37,7 +37,7 @@
</div>
{{/if}}
{{#unless config.privacy.set}}
{{#unless config.Privacy.set}}
<div class="badgeWrapper">
<div class="badge">
<span class="material-icons-outlined largeIcon">
@ -49,7 +49,7 @@
</div>
</div>
{{else}}
{{#unless config.privacy.not_collected}}
{{#unless config.Privacy.not_collected}}
<div class="badgeWrapper">
<div class="badge">
<span class="material-icons-outlined largeIcon">
@ -58,25 +58,25 @@
<h3>Data Collected</h3>
<p>The following data may be collected:</p>
<ul>
{{#if config.privacy.ip}}
{{#if config.Privacy.ip}}
<li>
<span class="material-icons-outlined">password</span>
Internet address (IP Address)
</li>
{{/if}}
{{#if config.privacy.url}}
{{#if config.Privacy.url}}
<li>
<span class="material-icons-outlined">link</span>
Page viewed (Request URL)
</li>
{{/if}}
{{#if config.privacy.device}}
{{#if config.Privacy.device}}
<li>
<span class="material-icons-outlined">phonelink</span>
Device Type (User agent)
</li>
{{/if}}
{{#if config.privacy.diagnostics}}
{{#if config.Privacy.diagnostics}}
<li>
<span class="material-icons-outlined">settings</span>
Diagnostics
@ -119,9 +119,9 @@
<h2 class="addInfo">Additional information</h2>
<ul>
<li>Version: {{version}}</li>
<li>Country: {{config.privacy.country}}</li>
<li>Provider: {{config.privacy.provider}}</li>
{{#if config.privacy.cloudflare}}
<li>Country: {{config.Privacy.country}}</li>
<li>Provider: {{config.Privacy.provider}}</li>
{{#if config.Privacy.cloudflare}}
<li>Using Cloudflare?: Yes</li>
{{else}}
<li>Using Cloudflare?: No</li>