akkartik/techmeet.love - Change 74C6RCXRROHRH6AYCDWZF4EBNLI6OZGUXZKPOF6RFK222GHBHNDQC

Merge lines.love

Created by Kartik K. Agaram on August 31, 2023

74C6RCXRROHRH6AYCDWZF4EBNLI6OZGUXZKPOF6RFK222GHBHNDQC

Dependencies

In channels

main

Change contents

Replacement in run.lua at line 144 [7.178044]

∅:D[2.213] → [6.17:108]

B:BD[8.8441] → [6.17:108]

  print_and_log('reading notes from '..love.filesystem.getSaveDirectory()..'/'..Directory)

[2.213]

[6.108]

  print_and_log('reading notes from '..App.save_dir..Directory)

Replacement in file.lua at line 13 [10.15083]

B:BD[9.145] → [9.145:199]

  local infile = App.open_for_reading(State.filename)

[9.145]

[9.199]

  local infile = App.open_for_reading(App.save_dir..State.filename)

Replacement in file.lua at line 41 [10.15083]
∅:D[11.176] → [9.268:323]
∅:D[12.275] → [9.268:323]
B:BD[9.268] → [9.268:323]
```
  local outfile = App.open_for_writing(State.filename)
```
[11.176]
[13.14]
```
  local outfile = App.open_for_writing(App.save_dir..State.filename)
```

Replacement in file.lua at line 65 [10.15083]

B:BD[14.70] → [14.70:166]

      local f, err = io.open(love.filesystem.getSaveDirectory()..'/'..Directory..'recent', 'a')

[14.70]

[14.166]

      local f, err = io.open(App.save_dir..Directory..'recent', 'a')

Replacement in file.lua at line 150 [10.15083]

∅:D[15.136] → [12.421:483]

∅:D[16.154] → [12.421:483]

B:BD[12.421] → [12.421:483]

B:BD[12.483] → [15.137:161]

  local infile = App.open_for_reading(Directory..id..'.json')
  if infile == nil then

[15.136]

[15.161]

  print(id)
  local infile = App.open_for_reading(App.save_dir..Directory..id..'.json')
  if not infile then

Replacement in file.lua at line 159 [10.15083]

∅:D[15.237] → [17.51:124]

∅:D[16.322] → [17.51:124]

B:BD[12.596] → [17.51:124]

  local status = love.filesystem.createDirectory(dirname(Directory..id))

[15.237]

[12.669]

  local status = love.filesystem.createDirectory(App.save_dir..dirname(Directory..id))

Deletion in app.lua at line 271 [19.2]

B:BD[18.4156] → [5.15820:15995]

  return {
    write = function(self, s)
              App.filesystem[filename] = App.filesystem[filename]..s
            end,
    close = function(self)
            end,
  }

Solving an order conflict in app.lua at line 271 [19.2]
[4.245]
[18.4733]
Resurrecting zombie bytes in app.lua at line 387 [19.2]
B:B[20.8162] → [21.1553:1603]
BD:B[20.8162] → [21.1553:1603]
```
  App.open_for_reading =
      function(filename)
```

Replacement in app.lua at line 389 [19.2]

B:BD[21.1603] → [21.1603:1660]

BD:BD[21.1603] → [21.1603:1660]

        local result = love.filesystem.newFile(filename)

[21.1603]

[23.62]

        local result = nativefs.newFile(filename)

Resurrecting zombie bytes in app.lua at line 396 [19.2]
∅:∅[23.196] → [21.1707:1767]
B:B[21.1707] → [21.1707:1767]
BD:B[21.1707] → [21.1707:1767]
```
      end
  App.open_for_writing =
      function(filename)
```
Replacement in app.lua at line 399 [19.2]
B:BD[21.1767] → [21.1767:1824]
BD:BD[21.1767] → [21.1767:1824]
```
        local result = love.filesystem.newFile(filename)
```
[21.1767]
[23.197]
```
        local result = nativefs.newFile(filename)
```
Resurrecting zombie bytes in app.lua at line 406 [19.2]
∅:∅[23.331] → [21.1871:1881]
B:B[21.1871] → [21.1871:1881]
BD:B[21.1871] → [21.1871:1881]
```
      end
```

Deletion in app.lua at line 407 [19.2]

B:BD[21.1881] → [24.1113:1113]

BD:BD[21.1881] → [24.1113:1113]

B:BD[20.8029] → [5.16028:16250]

BD:BD[20.8029] → [5.16028:16250]

B:BD[25.636] → [5.16251:16483]

BD:BD[25.636] → [5.16251:16483]

B:BD[25.907] → [5.16484:16494]

BD:BD[25.907] → [5.16484:16494]

  App.open_for_reading =
      function(filename)
        local result = nativefs.newFile(filename)
        local ok, err = result:open('r')
        if ok then
          return result
        else
          return ok, err
      end
  App.open_for_writing =
      function(filename)
        local result = nativefs.newFile(filename)
        local ok, err = result:open('w')
        if ok then
          return result
        else
          return ok, err
      end

Resurrecting zombie bytes in app.lua at line 407 [19.2]

B:B[5.16494] → [5.16494:16700]

BD:B[5.16494] → [5.16494:16700]

∅:∅[5.16700] → [22.880:1018]

B:B[25.913] → [22.880:1018]

BD:B[25.913] → [22.880:1018]

  App.files = nativefs.getDirectoryItems
  App.source_dir = love.filesystem.getSource()..'/'
  App.current_dir = nativefs.getWorkingDirectory()..'/'
  App.save_dir = love.filesystem.getSaveDirectory()..'/'
  App.get_time = love.timer.getTime
  App.get_clipboard = love.system.getClipboardText
  App.set_clipboard = love.system.setClipboardText

Solving an order conflict in app.lua at line 407 [19.2]
[21.1881]
[5.16494]

Merge lines.love

Dependencies

In channels

Change contents

Replacement in run.lua at line 144 [7.178044]

Replacement in file.lua at line 13 [10.15083]

Replacement in file.lua at line 41 [10.15083]

Replacement in file.lua at line 65 [10.15083]

Replacement in file.lua at line 150 [10.15083]

Replacement in file.lua at line 159 [10.15083]

Deletion in app.lua at line 271 [19.2]

Solving an order conflict in app.lua at line 271 [19.2]

Resurrecting zombie bytes in app.lua at line 387 [19.2]

Replacement in app.lua at line 389 [19.2]

Resurrecting zombie bytes in app.lua at line 396 [19.2]

Replacement in app.lua at line 399 [19.2]

Resurrecting zombie bytes in app.lua at line 406 [19.2]

Deletion in app.lua at line 407 [19.2]

Resurrecting zombie bytes in app.lua at line 407 [19.2]

Solving an order conflict in app.lua at line 407 [19.2]