...
This commit is contained in:
parent
3eb18a416a
commit
ce70320a62
@ -7,6 +7,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -110,6 +111,9 @@ func parse_theme_metadata() error {
|
|||||||
for _, path := range paths {
|
for _, path := range paths {
|
||||||
if path != "" {
|
if path != "" {
|
||||||
metadata, _, err := themes.ParseThemeMetadata(path)
|
metadata, _, err := themes.ParseThemeMetadata(path)
|
||||||
|
if metadata.Name == "" {
|
||||||
|
metadata.Name = themes.ThemeNameFromFileName(filepath.Base(path))
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@ -784,7 +784,7 @@ var camel_case_pat = (&utils.Once[*regexp.Regexp]{Run: func() *regexp.Regexp {
|
|||||||
return regexp.MustCompile(`([a-z])([A-Z])`)
|
return regexp.MustCompile(`([a-z])([A-Z])`)
|
||||||
}}).Get
|
}}).Get
|
||||||
|
|
||||||
func theme_name_from_file_name(fname string) string {
|
func ThemeNameFromFileName(fname string) string {
|
||||||
fname = fname[:len(fname)-len(path.Ext(fname))]
|
fname = fname[:len(fname)-len(path.Ext(fname))]
|
||||||
fname = strings.ReplaceAll(fname, "_", " ")
|
fname = strings.ReplaceAll(fname, "_", " ")
|
||||||
fname = camel_case_pat().ReplaceAllString(fname, "$1 $2")
|
fname = camel_case_pat().ReplaceAllString(fname, "$1 $2")
|
||||||
@ -821,7 +821,7 @@ func (self *Themes) AddFromFile(path string) (*Theme, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if m.Name == "" {
|
if m.Name == "" {
|
||||||
m.Name = theme_name_from_file_name(filepath.Base(path))
|
m.Name = ThemeNameFromFileName(filepath.Base(path))
|
||||||
}
|
}
|
||||||
t := Theme{metadata: m, is_user_defined: true, settings: conf, path_for_user_defined_theme: path}
|
t := Theme{metadata: m, is_user_defined: true, settings: conf, path_for_user_defined_theme: path}
|
||||||
self.name_map[m.Name] = &t
|
self.name_map[m.Name] = &t
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user