akkartik/pothi.love - Change E6LI4DSVQTJOWXBPO4JIZ2FUSIJFCXQFK3TRRYGAE6SY46O24LKQC

Merge luaML.love

This merge required fixing a problem in driver.love: load_settings now only triggers when a settings file is present. It seems like better practice to perform business logic within on.initialize. on.load_settings should only be initializing globals.

Created by Kartik K. Agaram on July 10, 2023

E6LI4DSVQTJOWXBPO4JIZ2FUSIJFCXQFK3TRRYGAE6SY46O24LKQC

Dependencies

In channels

main

Change contents

File addition: 0111-Settings (----------)
[3.2]
```
Settings = {}
```

Replacement in 0106-on.load_settings at line 2 [4.1352]

B:BD[4.1391] → [4.1391:1419]

B:BD[4.1419] → [2.64:143]

∅:D[2.143] → [4.1458:2551]

B:BD[4.1458] → [4.1458:2551]

	App_name = load_manifest()
	print('app name', App_name)
	love.window.setTitle('driver.love - '..App_name)
	-- backstop any default settings for this app, and stash everything to a global for on.save_settings
	if settings == nil then
		Settings = {}
	else
		Settings = settings
	end
	if Settings[App_name] == nil then
		Settings[App_name] = {}
		Settings[App_name].viewport = Viewport
		Settings[App_name].definitions = get_default_map()
	end
	Viewport = Settings[App_name].viewport
	Definitions = Settings[App_name].definitions
	local names = {}
	for name, _ in pairs(Definitions) do
		table.insert(names, name)
	end
	local defs = get_multiple_definitions_from_app(names)
	for name, def_editor in pairs(Definitions) do
		if def_editor.type == nil then
			def_editor.type = 'text'
		end
		if def_editor.bg == nil then
			def_editor.bg = definition_background_color(name)
		end
		if def_editor.width == nil then
			def_editor.width = 600
		end
		if defs[name] then
			def_editor.data = load_from_iterator(defs[name]:gmatch("[^\r\n]+"))
		else
			-- app doesn't know about this definition
			-- just delete it from the driver for now
			print('deleting', name)
			Definitions[name] = nil
		end
	end
end

[4.1391]

	Settings = settings
end

Insertion in 0012-on.initialize at line 2 [5.2104]

[5.2132]

[4.9325]

	App_name = load_manifest()
	print('app name', App_name)
	love.window.setTitle('driver.love - '..App_name)
	-- backstop any default settings for this app, and stash everything to a global for on.save_settings
	if Settings[App_name] == nil then
		Settings[App_name] = {}
		Settings[App_name].viewport = Viewport
		Settings[App_name].definitions = get_default_map()
	end
	Viewport = Settings[App_name].viewport
	Definitions = Settings[App_name].definitions
	local names = {}
	for name, _ in pairs(Definitions) do
		table.insert(names, name)
	end
	local defs = get_multiple_definitions_from_app(names)
	for name, def_editor in pairs(Definitions) do
		if def_editor.type == nil then
			def_editor.type = 'text'
		end
		if def_editor.bg == nil then
			def_editor.bg = definition_background_color(name)
		end
		if def_editor.width == nil then
			def_editor.width = 600
		end
		if defs[name] then
			def_editor.data = load_from_iterator(defs[name]:gmatch("[^\r\n]+"))
		else
			-- app doesn't know about this definition
			-- just delete it from the driver for now
			print('deleting', name)
			Definitions[name] = nil
		end
	end

Replacement in 0012-on.initialize at line 43 [5.2104]
∅:D[4.9454] → [5.2137:2140]
B:BD[5.2137] → [5.2137:2140]
```
end
```
[4.9454]
```
end
```