akkartik/pothi.love - Change ZXQ2MMPAOIA4TN3TWMFPXZUL7NUE3EWXLV2JHBQXEINE7WCKFSIQC

load in-memory data for a thread

Nothing displayed yet. I need to convert threads to Surface nodes.

Created by Kartik K. Agaram on June 18, 2023

ZXQ2MMPAOIA4TN3TWMFPXZUL7NUE3EWXLV2JHBQXEINE7WCKFSIQC

Dependencies

In channels

main

Change contents

File addition: 0123-save_dir_path (----------)

[3.2]

save_dir_path = function(id)
	return 'data/'..id
end

File addition: 0122-metadata_file (----------)

[3.2]

metadata_file = function(filename)
	return  filename:gsub('%.md$', '')..'.json'
end

File addition: 0121-full_path (----------)

[3.2]

full_path = function(id)
	return  love.filesystem.getSaveDirectory()..'/data/'..id
end

File addition: 0120-initialize_item (----------)

[3.2]

initialize_item = function(top, left, right, filename)
	local font = love.graphics.getFont()
	local result = edit.initialize_state(top, left, right, font:getHeight(), font:getHeight()*font:getLineHeight())
	result.id = filename
	result.filename = full_path(filename)
	result.editable = false
	result.replies = {}
	load_from_disk(result)
	Text.redraw_all(result)
	return result
end

File addition: 0119-load_metadata (----------)

[3.2]

load_metadata = function(filename)
	local mfile = metadata_file(filename)
	local mpath = save_dir_path(mfile)
	if not love.filesystem.getInfo(mpath) then
		return {replies={}}
	end
	return json.decode(love.filesystem.read(mpath))
end

File addition: 0118-load_subtree (----------)

[3.2]

load_subtree = function(filename, left, em_width)
	-- load a file and recursively all replies to it
--	print('load_subtree', filename)
	local state = initialize_item(0, left, left+40*em_width, filename)
	local replies = load_metadata(filename).replies
	for i,reply_id in ipairs(replies) do
		local reply = load_subtree(reply_id, left+2*em_width, em_width)
		table.insert(state.replies, reply)
	end
	return state
end

File addition: 0117-open_thread (----------)

[3.2]

open_thread = function(filename)
	local font = love.graphics.getFont()
	local em_width = font:getWidth('m')
	Global_state.root = load_subtree(filename, Margin_left, em_width)
	Global_state.root.top = Menu_bar_height + Margin_top
	-- HERE: Cursor_node needs to be set at the Surface level of abstraction
	--Cursor_node = Global_state.root
	love.window.setTitle('pothi.love - '..Global_state.root.id)
end

File addition: 0116-mouse_press_on_surface (----------)

[3.2]

mouse_press_on_surface = function(x,y, mouse_button)
	if Cursor_node then
		Cursor_node.show_cursor = nil
		Cursor_node = nil
	end
	if mouse_press_consumed_by_any_button_handler(HUD, x,y, mouse_button) then
		return
	end
	local node = on_text(x,y)
	if node then
		-- position cursor in node
		Cursor_node = node
		edit.mouse_press(node.editor, x,y, mouse_button)
		return
	end
	-- pan surface
	Pan = {x=Viewport.x+x/Viewport.zoom,y=Viewport.y+y/Viewport.zoom}
end

File addition: 0115-update_font_size (----------)

[3.2]

update_font_size = function(n)
	Font_height = n
	love.graphics.setFont(love.graphics.newFont(Font_height))
	local font = love.graphics.getFont()
	font:setLineHeight(1.3)
	Line_height = math.floor(Font_height*1.3)
	Menu_bar_height = 5 + Line_height + 5
	if Global_state.root then
		edit.update_font_settings(Global_state, n)
	end
end

File addition: 0114-draw_file_picker (----------)

[3.2]

draw_file_picker = function()
	local font = love.graphics.getFont()
	local y, x = Margin_top, Margin_left
	for _,f in ipairs(Files) do
		local w = font:getWidth(f)
		if x + w > App.screen.width then
			y = y + font:getHeight()*font:getLineHeight() + 10
			x = Margin_left
		end
		button(Global_state, f, {
			x=x-5, y=y-2, w=w+10, h=font:getHeight()*font:getLineHeight()+4,
			color={0.7,0.7,1.0},
			icon=function(p)
				App.color{r=0.4,g=0.4,b=0.7}
				love.graphics.rectangle('line', p.x,p.y, p.w,p.h, 5,5)
				App.color{r=0,g=0,b=0}
				love.graphics.print(f, x,y)
			end,
			onpress1 = function()
				open_thread(f)
			end,
		})
		x = x + App.width(f) + 15
	end
end

File addition: 0113-draw_surface (----------)

[3.2]

draw_surface = function()
	for _,obj in ipairs(Surface) do
		love.graphics.setColor(obj.r or 0, obj.g or 0, obj.b or 0)
		if obj.type == 'rectangle' then
			love.graphics.rectangle(obj.drawmode or 'fill', vx(obj.x),vy(obj.y), scale(obj.w),scale(obj.h), scale(obj.rx or 5), scale(obj.ry or 5))
		elseif obj.type == 'line' then
			love.graphics.line(unpack(obj.zdata))
		elseif obj.type == 'circle' then
			love.graphics.circle(obj.drawmode or 'fill', vx(obj.x), vy(obj.y), scale(obj.radius))
		elseif obj.type == 'arc' then
			love.graphics.arc(obj.drawmode or 'line', obj.arctype or 'open', vx(obj.x), vy(obj.y), scale(obj.radius), obj.angle1, obj.angle2, obj.segments)
		elseif obj.type == 'ellipse' then
			love.graphics.ellipse(obj.drawmode or 'fill', vx(obj.x), vy(obj.y), scale(obj.radiusx), scale(obj.radiusy))
		elseif obj.type == 'bezier' then
			love.graphics.line(unpack(obj.zdata))
		elseif obj.type == 'text' then
			if obj.w == nil then
				love.graphics.draw(obj.text, vx(obj.x), vy(obj.y))
			else
				edit.draw(obj.editor, obj.fg, not obj.show_cursor)
			end
		end
	end
	draw_menu_bar()
end

File addition: 0112-Global_state (----------)

[3.2]

Global_state = {}
	-- button_handlers: for the file picker
	-- root: when reading a single thread

File addition: 0111-Files (----------)
[3.2]
```
Files = nil  -- array of filenames
```
Insertion in 0081-draw_menu_bar at line 9 [4.15582]
[4.15928]
[4.16145]
```
	add_hotkey_to_menu('ctrl+o: switch file')
```

Replacement in 0026-on.draw at line 2 [6.238692]

∅:D[5.217] → [6.238714:238842]

∅:D[7.1258] → [6.238714:238842]

∅:D[4.7888] → [6.238714:238842]

B:BD[6.238714] → [6.238714:238842]

B:BD[6.238842] → [2.149:288]

∅:D[2.288] → [6.238950:238983]

∅:D[5.317] → [6.238950:238983]

∅:D[8.1104] → [6.238950:238983]

B:BD[6.238950] → [6.238950:238983]

B:BD[6.239332] → [6.239332:239858]

B:BD[6.239858] → [5.318:359]

∅:D[5.359] → [6.240245:240278]

B:BD[6.240245] → [6.240245:240278]

B:BD[6.240278] → [5.360:447]

B:BD[4.8018] → [4.8018:8073]

∅:D[5.519] → [6.241330:241337]

∅:D[4.8103] → [6.241330:241337]

B:BD[6.241330] → [6.241330:241337]

B:BD[6.241387] → [6.241387:241393]

	for _,obj in ipairs(Surface) do
		love.graphics.setColor(obj.r or 0, obj.g or 0, obj.b or 0)
		if obj.type == 'rectangle' then
			love.graphics.rectangle(obj.drawmode or 'fill', vx(obj.x),vy(obj.y), scale(obj.w),scale(obj.h), scale(obj.rx or 5), scale(obj.ry or 5))
		elseif obj.type == 'line' then
			love.graphics.line(unpack(obj.zdata))
		elseif obj.type == 'circle' then
			love.graphics.circle(obj.drawmode or 'fill', vx(obj.x), vy(obj.y), scale(obj.radius))
		elseif obj.type == 'arc' then
			love.graphics.arc(obj.drawmode or 'line', obj.arctype or 'open', vx(obj.x), vy(obj.y), scale(obj.radius), obj.angle1, obj.angle2, obj.segments)
		elseif obj.type == 'ellipse' then
			love.graphics.ellipse(obj.drawmode or 'fill', vx(obj.x), vy(obj.y), scale(obj.radiusx), scale(obj.radiusy))
		elseif obj.type == 'bezier' then
			love.graphics.line(unpack(obj.zdata))
		elseif obj.type == 'text' then
			if obj.w == nil then
				love.graphics.draw(obj.text, vx(obj.x), vy(obj.y))
			else
				edit.draw(obj.editor, obj.fg, not obj.show_cursor)
			end
		end

[6.238714]

[6.241393]

	Global_state.button_handlers = {}
	local font = love.graphics.getFont()
	font:setLineHeight(1.3)
	if Global_state.root == nil then
		-- TODO: use surface for file picker as well
		draw_file_picker()
	else
		draw_surface()

Deletion in 0026-on.draw at line 11 [6.238692]
B:BD[4.8172] → [4.8172:8189]
```
	draw_menu_bar()
```
Deletion in 0023-on.keychord_press at line 17 [9.26]
B:BD[4.479] → [4.479:534]
```
	elseif chord == 'C-q' then
		live.send_to_app('QUIT')
```

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

[10.2132]

[2.505]

	Files = love.filesystem.getDirectoryItems('data')
	for i=#Files,1,-1 do
		if (not Files[i]:match('%.md$')) or Files[i]:match('%-%d+.md$') then
			table.remove(Files, i)
		end
	end
	table.sort(Files)

Replacement in 0006-on.mouse_press at line 2 [11.703]

∅:D[4.13198] → [11.751:829]

∅:D[12.58905] → [11.751:829]

B:BD[11.751] → [11.751:829]

B:BD[11.829] → [4.13199:13275]

	if Cursor_node then
		Cursor_node.show_cursor = nil
		Cursor_node = nil
	end
	if mouse_press_consumed_by_any_button_handler(HUD, x,y, mouse_button) then

[12.58905]

[4.13275]

	if mouse_press_consumed_by_any_button_handler(Global_state, x,y, mouse_button) then

Replacement in 0006-on.mouse_press at line 5 [11.703]
B:BD[4.13289] → [4.13289:13316]
∅:D[4.13316] → [11.856:870]
B:BD[11.856] → [11.856:870]
B:BD[11.870] → [13.604:633]
∅:D[13.633] → [11.870:891]
∅:D[4.13346] → [11.870:891]
B:BD[11.870] → [11.870:891]
B:BD[11.891] → [14.378:429]
B:BD[14.429] → [4.13347:13356]
```
	local node = on_text(x,y)
	if node then
		-- position cursor in node
		Cursor_node = node
		edit.mouse_press(node.editor, x,y, mouse_button)
		return
```
[4.13289]
[4.13356]
```
	if Global_state.root then
		mouse_press_on_surface(x,y, mouse_button)
```

Deletion in 0006-on.mouse_press at line 8 [11.703]

B:BD[11.995] → [13.644:727]

	-- pan surface
	Pan = {x=Viewport.x+x/Viewport.zoom,y=Viewport.y+y/Viewport.zoom}

load in-memory data for a thread

Dependencies

In channels

Change contents

File addition: 0123-save_dir_path (----------)

File addition: 0122-metadata_file (----------)

File addition: 0121-full_path (----------)

File addition: 0120-initialize_item (----------)

File addition: 0119-load_metadata (----------)

File addition: 0118-load_subtree (----------)

File addition: 0117-open_thread (----------)

File addition: 0116-mouse_press_on_surface (----------)

File addition: 0115-update_font_size (----------)

File addition: 0114-draw_file_picker (----------)

File addition: 0113-draw_surface (----------)

File addition: 0112-Global_state (----------)

File addition: 0111-Files (----------)

Insertion in 0081-draw_menu_bar at line 9 [4.15582]

Replacement in 0026-on.draw at line 2 [6.238692]

Deletion in 0026-on.draw at line 11 [6.238692]

Deletion in 0023-on.keychord_press at line 17 [9.26]

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

Replacement in 0006-on.mouse_press at line 2 [11.703]

Replacement in 0006-on.mouse_press at line 5 [11.703]

Deletion in 0006-on.mouse_press at line 8 [11.703]