Add param to InitRuntimeFiles() to init built-in files only

This commit is contained in:
Dmytro Maluka 2024-04-03 03:41:06 +02:00
parent d67ce731ed
commit baca0e5cb2
7 changed files with 13 additions and 9 deletions

View File

@ -254,7 +254,7 @@ func main() {
screen.TermMessage(err)
}
config.InitRuntimeFiles()
config.InitRuntimeFiles(true)
config.InitPlugins()
err = config.ReadSettings()

View File

@ -35,7 +35,7 @@ func startup(args []string) (tcell.SimulationScreen, error) {
return nil, err
}
config.InitRuntimeFiles()
config.InitRuntimeFiles(true)
config.InitPlugins()
err = config.ReadSettings()

View File

@ -348,7 +348,7 @@ func reloadRuntime(reloadPlugins bool) {
}
}
config.InitRuntimeFiles()
config.InitRuntimeFiles(true)
if reloadPlugins {
config.InitPlugins()

View File

@ -20,7 +20,7 @@ type operation struct {
func init() {
ulua.L = lua.NewState()
config.InitRuntimeFiles()
config.InitRuntimeFiles(true)
config.InitGlobalSettings()
config.GlobalSettings["backup"] = false
config.GlobalSettings["fastdirty"] = true

View File

@ -20,7 +20,7 @@ func (b *Buffer) SetOptionNative(option string, nativeValue interface{}) error {
} else if option == "statusline" {
screen.Redraw()
} else if option == "filetype" {
config.InitRuntimeFiles()
config.InitRuntimeFiles(true)
err := config.ReadSettings()
if err != nil {
screen.TermMessage(err)

View File

@ -166,10 +166,14 @@ func ListRealRuntimeFiles(fileType RTFiletype) []RuntimeFile {
return realFiles[fileType]
}
// InitRuntimeFiles initializes all assets file and the config directory
func InitRuntimeFiles() {
// InitRuntimeFiles initializes all assets files and the config directory.
// If `user` is false, InitRuntimeFiles ignores the config directory and
// initializes asset files only.
func InitRuntimeFiles(user bool) {
add := func(fileType RTFiletype, dir, pattern string) {
AddRuntimeFilesFromDirectory(fileType, filepath.Join(ConfigDir, dir), pattern)
if user {
AddRuntimeFilesFromDirectory(fileType, filepath.Join(ConfigDir, dir), pattern)
}
AddRuntimeFilesFromAssets(fileType, path.Join("runtime", dir), pattern)
}

View File

@ -7,7 +7,7 @@ import (
)
func init() {
InitRuntimeFiles()
InitRuntimeFiles(true)
}
func TestAddFile(t *testing.T) {