renun/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-08-10 00:52:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Simplify resources code, enabling any resource to be overridden (not just translations)

Browse Source
This commit is contained in:
Deluan
2021-10-28 10:25:25 -04:00
parent 9072412812
commit fa3471f527
6 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/nativeapi/translations.go
View File

@@ -6,17 +6,14 @@ import (
"encoding/json"
"io"
"io/fs"
"os"
"path"
"strings"
"sync"
"github.com/deluan/rest"
"github.com/navidrome/navidrome/conf"
"github.com/navidrome/navidrome/consts"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/resources"
"github.com/navidrome/navidrome/utils"
)
type translation struct {
@@ -31,11 +28,7 @@ var (
)
func newTranslationRepository(context.Context) rest.Repository {
dir := utils.MergeFS{
Base: resources.FS,
Overlay: os.DirFS(path.Join(conf.Server.DataFolder, "resources")),
}
if err := loadTranslations(dir); err != nil {
if err := loadTranslations(resources.FS); err != nil {
log.Error("Error loading translation files", err)
}
return &translationRepository{}
@@ -50,13 +43,13 @@ func (r *translationRepository) Read(id string) (interface{}, error) {
return nil, rest.ErrNotFound
}
// Simple Count implementation. Does not support any `options`
func (r *translationRepository) Count(options ...rest.QueryOptions) (int64, error) {
// Count simple implementation, does not support any `options`
func (r *translationRepository) Count(...rest.QueryOptions) (int64, error) {
return int64(len(translations)), nil
}
// Simple ReadAll implementation, only returns IDs. Does not support any `options`
func (r *translationRepository) ReadAll(options ...rest.QueryOptions) (interface{}, error) {
// ReadAll simple implementation, only returns IDs. Does not support any `options`
func (r *translationRepository) ReadAll(...rest.QueryOptions) (interface{}, error) {
var result []translation
for _, t := range translations {
t.Data = ""