Skip to content

Commit

Permalink
refactor!: Remove Redis
Browse files Browse the repository at this point in the history 
refactor: Get Markdown post data in its own function
feat: Begin to implement support for removing deleted posts
  • Loading branch information
@slashtechno
slashtechno authored Jun 26, 2024
1 parent 7758548 commit 0fc9e46
Show file tree
Hide file tree
Showing 10 changed files with 208 additions and 362 deletions.
33 changes: 16 additions & 17 deletions cmd/publish.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"fmt"

"github.com/charmbracelet/log"
"github.com/redis/go-redis/v9"
"github.com/slashtechno/cross-blogger/internal"
"github.com/slashtechno/cross-blogger/internal/platforms"
"github.com/spf13/cobra"
Expand All @@ -22,23 +21,23 @@ var publishCmd = &cobra.Command{
// Arg 2: Specifier
// Arg 3+: Destinations
Args: cobra.MinimumNArgs(3),
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
var err error
var redisOptions *redis.Options
if redisOptions, err = internal.InitializeRedisOptions(internal.CredentialViper.GetStringMap("db")); err != nil {
return err
}
// https://github.com/spf13/viper?tab=readme-ov-file#accessing-nested-keys
if !internal.CredentialViper.GetBool("db.enable") {
log.Debug("DB is disabled")
return nil
}
if err := internal.InitializeDb("redis", redisOptions); err != nil {
return err
}
// PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
// var err error
// var redisOptions *redis.Options
// if redisOptions, err = internal.InitializeRedisOptions(internal.CredentialViper.GetStringMap("db")); err != nil {
// return err
// }
// // https://github.com/spf13/viper?tab=readme-ov-file#accessing-nested-keys
// if !internal.CredentialViper.GetBool("db.enable") {
// log.Debug("DB is disabled")
// return nil
// }
// if err := internal.InitializeDb("redis", redisOptions); err != nil {
// return err
// }

return nil
},
// return nil
// },
Run: func(cmd *cobra.Command, args []string) {
destinations := internal.ConfigViper.Get("destinations")
sources := internal.ConfigViper.Get("sources")
Expand Down
2 changes: 1 addition & 1 deletion cmd/watch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ var watchCmd = &cobra.Command{
// Check if overwriting is enabled
if markdownDest.Overwrite {
wg.Add(1)
go blogger.CleanMarkdownPosts(&wg, internal.ConfigViper.GetDuration("interval"), internal.RedisClient, markdownDest, options, errChan)
go blogger.CleanMarkdownPosts(&wg, internal.ConfigViper.GetDuration("interval"), markdownDest, options, errChan)
} else {
log.Debug("Overwriting is disabled; not cleaning up posts", "destination", dest.GetName())
}
Expand Down
37 changes: 0 additions & 37 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ go 1.22.3

require (
github.com/JohannesKaufmann/html-to-markdown v1.6.0
github.com/charmbracelet/charm v0.12.7-0.20240611121908-2785ee19555c
github.com/charmbracelet/log v0.4.0
github.com/dgraph-io/badger/v3 v3.2103.5
github.com/go-git/go-git/v5 v5.12.0
github.com/go-resty/resty/v2 v2.13.1
github.com/goccy/go-yaml v1.11.3
Expand All @@ -30,64 +28,34 @@ require (
github.com/PuerkitoBio/goquery v1.9.2 // indirect
github.com/andybalholm/cascadia v1.3.2 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/caarlos0/env/v6 v6.10.1 // indirect
github.com/calmh/randomart v1.1.0 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/charmbracelet/bubbles v0.18.0 // indirect
github.com/charmbracelet/bubbletea v0.26.6 // indirect
github.com/charmbracelet/keygen v0.5.0 // indirect
github.com/charmbracelet/lipgloss v0.11.0 // indirect
github.com/charmbracelet/x/ansi v0.1.2 // indirect
github.com/charmbracelet/x/input v0.1.2 // indirect
github.com/charmbracelet/x/term v0.1.1 // indirect
github.com/charmbracelet/x/windows v0.1.2 // indirect
github.com/cloudflare/circl v1.3.9 // indirect
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/dlclark/regexp2 v1.11.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/glog v1.2.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/flatbuffers v24.3.25+incompatible // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gosimple/unidecode v1.0.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/go-app-paths v0.2.2 // indirect
github.com/muesli/sasquatch v0.0.0-20220506032543-a98cc9b4d8ec // indirect
github.com/muesli/termenv v0.15.2 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkoukk/tiktoken-go v0.1.7 // indirect
github.com/redis/go-redis/v9 v9.5.3 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
Expand All @@ -97,18 +65,13 @@ require (
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 0fc9e46

Please sign in to comment.