akkartik/etch.love - Change P4AGA6W7EL5KMQGAWOS2EJR6ZB3IBQXDJDFUHDHUJL6R3LFM55QQC

new fork: some tweaks for mobile

First, on Android the app dies in the file_drop event when starting up.

Error file.lua:21: Could not open file /external_primary/downloads/100606. Does not exist. Traceback [love "callbacks.lua"]:228: in function 'handler' [C]: in function 'lines' file.lua:21: in function 'load_from_file' run.lua:109: in function 'file_drop' main.lua:117: in function <main.lua:115> app.lua:31: in function <app.lua:22> [C]: in function 'xpcall'

Just take out the event altogether; files are mostly meaningless on mobile.

Created by Kartik K. Agaram on March 25, 2023

P4AGA6W7EL5KMQGAWOS2EJR6ZB3IBQXDJDFUHDHUJL6R3LFM55QQC

Dependencies

In channels

main

Change contents

Deletion in source.lua at line 215 [5.165766]

B:BD[5.171934] → [6.3172:3204]

∅:D[6.3204] → [5.171968:172371]

B:BD[5.171968] → [5.171968:172371]

B:BD[5.172371] → [7.109:201]

∅:D[7.201] → [8.58:104]

B:BD[5.172371] → [8.58:104]

B:BD[8.104] → [7.202:205]

∅:D[8.104] → [5.172371:172376]

∅:D[7.205] → [5.172371:172376]

B:BD[5.172371] → [5.172371:172376]

function source.file_drop(file)
  -- first make sure to save edits on any existing file
  if Editor_state.next_save then
    save_to_disk(Editor_state)
  end
  -- clear the slate for the new file
  Editor_state.filename = file:getFilename()
  file:open('r')
  Editor_state.lines = load_from_file(file)
  file:close()
  Text.redraw_all(Editor_state)
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.cursor1 = {line=1, pos=1}
  -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
  love.window.setTitle('lines.love - source')
end

Deletion in run_tests.lua at line 18 [9.7]

B:BD[9.551] → [9.551:552]

B:BD[9.552] → [10.7:33]

B:BD[10.64] → [11.17142:17201]

B:BD[11.17201] → [12.7:53]

∅:D[12.53] → [10.117:631]

∅:D[11.17201] → [10.117:631]

∅:D[13.84825] → [10.117:631]

B:BD[10.117] → [10.117:631]

B:BD[10.631] → [3.48250:48466]

∅:D[3.48466] → [12.54:80]

B:BD[13.85118] → [12.54:80]

∅:D[12.80] → [14.7:53]

∅:D[13.85118] → [14.7:53]

B:BD[10.871] → [14.7:53]

B:BD[14.99] → [11.17202:17261]

∅:D[11.17261] → [14.152:234]

∅:D[13.85185] → [14.152:234]

B:BD[14.152] → [14.152:234]

B:BD[14.234] → [13.85186:85266]

B:BD[13.85266] → [15.167:197]

∅:D[15.197] → [14.306:916]

B:BD[14.306] → [14.306:916]

B:BD[14.916] → [3.48467:48524]

∅:D[3.48524] → [9.1120:1124]

B:BD[9.1120] → [9.1120:1124]


function test_drop_file()
  App.screen.init{width=Editor_state.left+300, height=300}
  Editor_state = edit.initialize_test_state()
  App.filesystem['foo'] = 'abc\ndef\nghi\n'
  local fake_dropped_file = {
    opened = false,
    getFilename = function(self)
                    return 'foo'
                  end,
    open = function(self)
             self.opened = true
           end,
    lines = function(self)
              assert(self.opened)
              return App.filesystem['foo']:gmatch('[^\n]+')
            end,
    close = function(self)
              self.opened = false
            end,
  }
  App.filedropped(fake_dropped_file)
  check_eq(#Editor_state.lines, 3, '#lines')
  check_eq(Editor_state.lines[1].data, 'abc', 'lines:1')
  check_eq(Editor_state.lines[2].data, 'def', 'lines:2')
  check_eq(Editor_state.lines[3].data, 'ghi', 'lines:3')
  edit.draw(Editor_state)
end
function test_drop_file_saves_previous()
  App.screen.init{width=Editor_state.left+300, height=300}
  -- initially editing a file called foo that hasn't been saved to filesystem yet
  Editor_state.lines = load_array{'abc', 'def'}
  Editor_state.filename = 'foo'
  schedule_save(Editor_state)
  -- now drag a new file bar from the filesystem
  App.filesystem['bar'] = 'abc\ndef\nghi\n'
  local fake_dropped_file = {
    opened = false,
    getFilename = function(self)
                    return 'bar'
                  end,
    open = function(self)
             self.opened = true
           end,
    lines = function(self)
              assert(self.opened)
              return App.filesystem['bar']:gmatch('[^\n]+')
            end,
    close = function(self)
              self.opened = false
            end,
  }
  App.filedropped(fake_dropped_file)
  -- filesystem now contains a file called foo
  check_eq(App.filesystem['foo'], 'abc\ndef\n', 'check')
end

Deletion in run.lua at line 111 [5.178044]

B:BD[5.181815] → [5.181815:181820]

B:BD[5.181820] → [6.4024:4053]

∅:D[6.4053] → [5.181851:182195]

B:BD[5.181851] → [5.181851:182195]

B:BD[5.182195] → [4.16:102]

∅:D[4.102] → [7.306:398]

B:BD[16.81] → [7.306:398]

∅:D[16.81] → [5.182229:182292]

∅:D[7.398] → [5.182229:182292]

B:BD[5.182229] → [5.182229:182292]

B:BD[5.182292] → [7.399:402]

end
function run.file_drop(file)
  -- first make sure to save edits on any existing file
  if Editor_state.next_save then
    save_to_disk(Editor_state)
  end
  -- clear the slate for the new file
  App.initialize_globals()
  Editor_state.filename = file:getFilename()
  file:open('r')
  Editor_state.lines = load_from_file(file)
  file:close()
  Text.redraw_all(Editor_state)
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.cursor1 = {line=1, pos=1}
  -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
  love.window.setTitle('lines.love - '..Editor_state.filename)

Deletion in main.lua at line 113 [18.2]
∅:D[2.449] → [17.625:629]
∅:D[19.595] → [17.625:629]
∅:D[20.1155] → [17.625:629]
∅:D[5.187669] → [17.625:629]
B:BD[17.625] → [17.625:629]
∅:D[17.629] → [21.40:41]
B:BD[22.57] → [21.40:41]
B:BD[21.41] → [5.187670:187732]
B:BD[5.187732] → [6.4429:4479]
∅:D[6.4479] → [5.187786:187824]
B:BD[5.187786] → [5.187786:187824]
B:BD[5.187824] → [6.4480:4536]
∅:D[6.4536] → [5.187884:187950]
B:BD[5.187884] → [5.187884:187950]
```
end
function App.filedropped(file)
  if Current_app == 'run' then
    if run.file_drop then run.file_drop(file) end
  elseif Current_app == 'source' then
    if source.file_drop then source.file_drop(file) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
```