oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-16 18:01:37 +00:00
Code Wiki Activity

Simplify locale package usage (refactoring)

Browse source
This commit is contained in:
Frédéric Guillot 2018-09-22 15:04:55 -07:00
parent aae9b4eb83
commit b1e8f534ef
26 changed files with 443 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

6
daemon/daemon.go
View file

@ -13,7 +13,6 @@ import (
"time"
"miniflux.app/config"
"miniflux.app/locale"
"miniflux.app/logger"
"miniflux.app/reader/feed"
"miniflux.app/scheduler"
@ -39,10 +38,9 @@ func Run(cfg *config.Config, store *storage.Storage) {
}
}()
translator := locale.Load()
feedHandler := feed.NewFeedHandler(store, translator)
feedHandler := feed.NewFeedHandler(store)
pool := scheduler.NewWorkerPool(feedHandler, cfg.WorkerPoolSize())
server := newServer(cfg, store, pool, feedHandler, translator)
server := newServer(cfg, store, pool, feedHandler)
scheduler.NewFeedScheduler(
store,

7
daemon/routes.go
View file

@ -10,7 +10,6 @@ import (
"miniflux.app/api"
"miniflux.app/config"
"miniflux.app/fever"
"miniflux.app/locale"
"miniflux.app/middleware"
"miniflux.app/reader/feed"
"miniflux.app/scheduler"
@ -21,12 +20,12 @@ import (
"github.com/gorilla/mux"
)
func routes(cfg *config.Config, store *storage.Storage, feedHandler *feed.Handler, pool *scheduler.WorkerPool, translator *locale.Translator) *mux.Router {
func routes(cfg *config.Config, store *storage.Storage, feedHandler *feed.Handler, pool *scheduler.WorkerPool) *mux.Router {
router := mux.NewRouter()
templateEngine := template.NewEngine(cfg, router, translator)
templateEngine := template.NewEngine(cfg, router)
apiController := api.NewController(store, feedHandler)
feverController := fever.NewController(cfg, store)
uiController := ui.NewController(cfg, store, pool, feedHandler, templateEngine, translator, router)
uiController := ui.NewController(cfg, store, pool, feedHandler, templateEngine, router)
middleware := middleware.New(cfg, store, router)
if cfg.BasePath() != "" {

5
daemon/server.go
View file

@ -10,7 +10,6 @@ import (
"time"
"miniflux.app/config"
"miniflux.app/locale"
"miniflux.app/logger"
"miniflux.app/reader/feed"
"miniflux.app/scheduler"
@ -19,7 +18,7 @@ import (
"golang.org/x/crypto/acme/autocert"
)
func newServer(cfg *config.Config, store *storage.Storage, pool *scheduler.WorkerPool, feedHandler *feed.Handler, translator *locale.Translator) *http.Server {
func newServer(cfg *config.Config, store *storage.Storage, pool *scheduler.WorkerPool, feedHandler *feed.Handler) *http.Server {
certFile := cfg.CertFile()
keyFile := cfg.KeyFile()
certDomain := cfg.CertDomain()
@ -29,7 +28,7 @@ func newServer(cfg *config.Config, store *storage.Storage, pool *scheduler.Worke
WriteTimeout: 30 * time.Second,
IdleTimeout: 60 * time.Second,
Addr: cfg.ListenAddr(),
Handler: routes(cfg, store, feedHandler, pool, translator),
Handler: routes(cfg, store, feedHandler, pool),
}
if certDomain != "" && certCache != "" {