Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ gha-creds-*.json
# Service Account Credentials

service-account.json
bun.lockb
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
bun install && \
npm install && \
go generate ./... && \
go run .
Binary file removed bun.lockb
Binary file not shown.
43 changes: 33 additions & 10 deletions database.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"encoding/json"
"errors"
"os"

"github.com/klauspost/compress/zstd"
Expand All @@ -10,38 +11,41 @@ import (
)

func initializeDatabase(dbFile string) (*DataStore, error) {
_, err := os.Stat(dbFile)
if err != nil && !os.IsNotExist(err) {
return nil, err
}

var f *os.File
if err != nil && os.IsNotExist(err) {
log.Info().Err(err).Msgf("database file %s does not exist, Creating new database file", dbFile)
_, err := os.Stat(dbFile)
if errors.Is(err, os.ErrNotExist) {
log.Info().Msgf("database file %s does not exist, Creating new database file", dbFile)
f, err = os.OpenFile(dbFile, os.O_CREATE|os.O_RDWR, 0644)
if err != nil {
return nil, err
}

w, err := zstd.NewWriter(f)
if err != nil {
f.Close()
return nil, err
}

_, err = w.Write([]byte("{}"))
if err != nil {
w.Close()
f.Close()
return nil, err
}

err = w.Close()
if err != nil {
f.Close()
return nil, err
}

_, err = f.Seek(0, 0)
if err != nil {
f.Close()
return nil, err
}
} else if err != nil {
return nil, err
} else {
f, err = os.OpenFile(dbFile, os.O_RDWR, 0644)
if err != nil {
Expand Down Expand Up @@ -71,11 +75,15 @@ func initializeDatabase(dbFile string) (*DataStore, error) {
}

func updateDatabase(dbFile string, ds *DataStore) error {
f, err := os.OpenFile(dbFile+".tmp", os.O_CREATE|os.O_RDWR|os.O_TRUNC|os.O_EXCL, 0644)
tmpFile := dbFile + ".tmp"

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): The deferred removal of the temp file can hide data if os.Rename fails and is unnecessary on success.

In updateDatabase, the deferred os.Remove(tmpFile) runs regardless of whether os.Rename succeeds. If os.Rename fails (e.g., permissions, concurrent access), the temp file containing the compressed database is deleted, losing potentially useful data for recovery or debugging. On success, the remove is unnecessary because the path is replaced by the renamed file. Consider removing the deferred os.Remove and instead only deleting the temp file after a successful rename, or retaining it on failure so callers can inspect or retry.

f, err := os.OpenFile(tmpFile, os.O_CREATE|os.O_RDWR|os.O_TRUNC|os.O_EXCL, 0644)
if err != nil {
return err
}
defer f.Close()
defer func() {
f.Close()
os.Remove(tmpFile)
}()

w, err := zstd.NewWriter(f, zstd.WithEncoderLevel(zstd.SpeedBestCompression))
if err != nil {
Expand All @@ -88,7 +96,22 @@ func updateDatabase(dbFile string, ds *DataStore) error {
return err
}

err = os.Rename(dbFile+".tmp", dbFile)
err = w.Close()
if err != nil {
return err
}

err = f.Sync()
if err != nil {
return err
}

err = f.Close()
if err != nil {
return err
}

err = os.Rename(tmpFile, dbFile)
if err != nil {
return err
}
Expand Down
55 changes: 25 additions & 30 deletions feeds.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"context"
"encoding/hex"
"os"
"path/filepath"
"time"

"github.com/gorilla/feeds"
Expand All @@ -20,6 +21,18 @@ func langFeedID(id string, lang types.Lang) string {
return hex.EncodeToString(buf[:])
}

func createFeedItem(post *types.Post, doc *types.Document, link string) *feeds.Item {
return &feeds.Item{
Id: langFeedID(post.ID, doc.Metadata.Language),
Title: doc.Metadata.Title,
Link: &feeds.Link{Href: link},
Author: &feeds.Author{Name: doc.Metadata.Author},
Description: doc.Metadata.Description,
Created: post.CreatedAt.UTC(),
Updated: post.UpdatedAt.UTC(),
}
}

func generateGlobalFeed(gc *GenerationContext) error {
log.Debug().Msg("start generating global RSS feed")
globalFeed := &feeds.Feed{
Expand All @@ -41,16 +54,7 @@ func generateGlobalFeed(gc *GenerationContext) error {
}
link := baseURL + post.Path

postFeed := &feeds.Item{
Id: langFeedID(post.ID, doc.Metadata.Language),
Title: doc.Metadata.Title,
Link: &feeds.Link{Href: link},
Author: &feeds.Author{Name: doc.Metadata.Author},
Description: doc.Metadata.Description,
Created: post.CreatedAt,
Updated: post.UpdatedAt,
}
globalFeed.Items = append(globalFeed.Items, postFeed)
globalFeed.Items = append(globalFeed.Items, createFeedItem(post, doc, link))
}

globalFeed.Items = append(globalFeed.Items, &feeds.Item{
Expand All @@ -73,17 +77,17 @@ func generateGlobalFeed(gc *GenerationContext) error {
return err
}

err = os.WriteFile(distDir+"/feed.rss", []byte(rss), 0644)
err = os.WriteFile(filepath.Join(distDir, "feed.rss"), []byte(rss), 0644)
if err != nil {
return err
}

err = os.WriteFile(distDir+"/en/feed.rss", []byte(rss), 0644)
err = os.WriteFile(filepath.Join(distDir, "en", "feed.rss"), []byte(rss), 0644)
if err != nil {
return err
}

err = os.WriteFile(distDir+"/sitemap.xml", []byte(sitemap), 0644)
err = os.WriteFile(filepath.Join(distDir, "sitemap.xml"), []byte(sitemap), 0644)
if err != nil {
return err
}
Expand All @@ -97,35 +101,26 @@ func generateLocalFeed(gc *GenerationContext, lang types.Lang) error {

feed := &feeds.Feed{
Title: "GoSuda Blog" + " - " + types.FullLangName(lang),
Link: &feeds.Link{Href: baseURL + "/" + lang + "/"},
Link: &feeds.Link{Href: baseURL + "/" + string(lang) + "/"},
Description: "Gosuda: A blog about software development, and other topics.",
Author: &feeds.Author{Name: "Gosuda", Email: "webmaster@gosuda.org"},
Created: time.Now().UTC(),
}

for _, post := range gc.DataStore.Posts {
doc, ok := post.Translated[lang]
doc, ok := post.Translated[string(lang)]
if !ok {
continue
}
link := baseURL + "/" + lang + post.Path

postFeed := &feeds.Item{
Id: langFeedID(post.ID, lang),
Title: doc.Metadata.Title,
Link: &feeds.Link{Href: link},
Author: &feeds.Author{Name: doc.Metadata.Author},
Description: doc.Metadata.Description,
Created: post.CreatedAt.UTC(),
Updated: post.UpdatedAt.UTC(),
}
feed.Items = append(feed.Items, postFeed)
link := baseURL + "/" + string(lang) + post.Path

feed.Items = append(feed.Items, createFeedItem(post, doc, link))
}

feed.Items = append(feed.Items, &feeds.Item{
Id: langFeedID("home", lang),
Title: "GoSuda | Home",
Link: &feeds.Link{Href: baseURL + "/" + lang + "/"},
Link: &feeds.Link{Href: baseURL + "/" + string(lang) + "/"},
Author: &feeds.Author{Name: "GoSuda"},
Description: "GoSuda is an industry-leading open source working group enabling developers to easily build, prototype, and deploy applications. Our comprehensive suite of tools and frameworks empowers developers to create robust, scalable solutions across various domains.",
Created: time.Date(2024, 10, 07, 0, 0, 0, 0, time.UTC),
Expand All @@ -142,12 +137,12 @@ func generateLocalFeed(gc *GenerationContext, lang types.Lang) error {
return err
}

err = os.WriteFile(distDir+"/"+lang+"/feed.rss", []byte(rss), 0644)
err = os.WriteFile(filepath.Join(distDir, string(lang), "feed.rss"), []byte(rss), 0644)
if err != nil {
return err
}

err = os.WriteFile(distDir+"/"+lang+"/sitemap.xml", sitemap, 0644)
err = os.WriteFile(filepath.Join(distDir, string(lang), "sitemap.xml"), sitemap, 0644)
if err != nil {
return err
}
Expand Down
82 changes: 41 additions & 41 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ module gosuda.org/website
go 1.26.1

require (
cloud.google.com/go/vertexai v0.15.0
github.com/a-h/templ v0.3.1001
github.com/alecthomas/chroma/v2 v2.23.1
cloud.google.com/go/vertexai v0.19.0
github.com/a-h/templ v0.3.1020
github.com/alecthomas/chroma/v2 v2.27.0
github.com/fogleman/gg v1.3.0
github.com/google/uuid v1.6.0
github.com/gorilla/feeds v1.2.0
github.com/klauspost/compress v1.18.4
github.com/lemon-mint/coord v0.4.0
github.com/klauspost/compress v1.19.0
github.com/lemon-mint/coord v0.5.0
github.com/pemistahl/lingua-go v1.4.0
github.com/rs/zerolog v1.34.0
github.com/tdewolff/minify/v2 v2.24.10
github.com/rs/zerolog v1.35.1
github.com/tdewolff/minify/v2 v2.24.13
github.com/wyatt915/goldmark-treeblood v0.0.1
github.com/yuin/goldmark v1.7.16
github.com/yuin/goldmark v1.8.2
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
github.com/yuin/goldmark-meta v1.1.0
github.com/zeebo/blake3 v0.2.4
golang.org/x/image v0.37.0
golang.org/x/image v0.44.0
golang.org/x/time v0.15.0
gopkg.eu.org/envloader v1.1.0
gopkg.in/yaml.v3 v3.0.1
Expand All @@ -28,60 +28,60 @@ require (

require (
cloud.google.com/go v0.123.0 // indirect
cloud.google.com/go/aiplatform v1.120.0 // indirect
cloud.google.com/go/auth v0.18.2 // indirect
cloud.google.com/go/aiplatform v1.125.0 // indirect
cloud.google.com/go/auth v0.21.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
cloud.google.com/go/compute/metadata v0.9.0 // indirect
cloud.google.com/go/iam v1.5.3 // indirect
cloud.google.com/go/longrunning v0.8.0 // indirect
cloud.google.com/go/texttospeech v1.16.0 // indirect
cloud.google.com/go/iam v1.11.0 // indirect
cloud.google.com/go/longrunning v1.2.0 // indirect
cloud.google.com/go/texttospeech v1.21.0 // indirect
github.com/a-h/parse v0.0.0-20250122154542-74294addb73e // indirect
github.com/andybalholm/brotli v1.2.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cli/browser v1.3.0 // indirect
github.com/dlclark/regexp2 v1.11.5 // indirect
github.com/dlclark/regexp2/v2 v2.5.0 // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/felixge/httpsnoop v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
github.com/googleapis/gax-go/v2 v2.18.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.18 // indirect
github.com/googleapis/gax-go/v2 v2.23.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/klauspost/cpuid/v2 v2.4.0 // indirect
github.com/mattn/go-colorable v0.1.15 // indirect
github.com/mattn/go-isatty v0.0.22 // indirect
github.com/natefinch/atomic v1.0.1 // indirect
github.com/sashabaranov/go-openai v1.41.2 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/tdewolff/parse/v2 v2.8.10 // indirect
github.com/tdewolff/parse/v2 v2.8.13 // indirect
github.com/valyala/fastjson v1.6.10 // indirect
github.com/wyatt915/treeblood v0.1.16 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
go.opentelemetry.io/otel v1.42.0 // indirect
go.opentelemetry.io/otel/metric v1.42.0 // indirect
go.opentelemetry.io/otel/trace v1.42.0 // indirect
golang.org/x/crypto v0.49.0 // indirect
golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
golang.org/x/mod v0.34.0 // indirect
golang.org/x/net v0.52.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.69.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.69.0 // indirect
go.opentelemetry.io/otel v1.44.0 // indirect
go.opentelemetry.io/otel/metric v1.44.0 // indirect
go.opentelemetry.io/otel/trace v1.44.0 // indirect
golang.org/x/crypto v0.54.0 // indirect
golang.org/x/exp v0.0.0-20260709172345-9ea1abe57597 // indirect
golang.org/x/mod v0.38.0 // indirect
golang.org/x/net v0.57.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/text v0.35.0 // indirect
golang.org/x/tools v0.43.0 // indirect
google.golang.org/api v0.271.0 // indirect
google.golang.org/genai v1.50.0 // indirect
google.golang.org/genproto v0.0.0-20260311181403-84a4fc48630c // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260311181403-84a4fc48630c // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260311181403-84a4fc48630c // indirect
google.golang.org/grpc v1.79.2 // indirect
golang.org/x/sync v0.22.0 // indirect
golang.org/x/sys v0.47.0 // indirect
golang.org/x/text v0.40.0 // indirect
golang.org/x/tools v0.48.0 // indirect
google.golang.org/api v0.288.0 // indirect
google.golang.org/genai v1.63.0 // indirect
google.golang.org/genproto v0.0.0-20260706201446-f0a921348800 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260706201446-f0a921348800 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260706201446-f0a921348800 // indirect
google.golang.org/grpc v1.82.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Expand Down
Loading
Loading