akkartik/wardley.love - Change CFJO3YN26VV7D57AVX57BFJDAPSA6ZRXQ2NW6L3TKMRS2TBNLVDAC

resolve conflicts

Created by akkartik on August 31, 2023

CFJO3YN26VV7D57AVX57BFJDAPSA6ZRXQ2NW6L3TKMRS2TBNLVDAC

Dependencies

In channels

main

Change contents

Insertion in app.lua at line 1 [4.2]
[4.2]
[5.8414]
```
nativefs = require 'nativefs'
```

Replacement in app.lua at line 55 [4.2]

B:BD[6.1342] → [6.1342:1641]

  App.open_for_reading = function(filename) return io.open(filename, 'r') end
  App.open_for_writing = function(filename) return io.open(filename, 'w') end
  App.getTime = love.timer.getTime
  App.getClipboardText = love.system.getClipboardText
  App.setClipboardText = love.system.setClipboardText

[6.1209]

[2.18]

  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
      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
      end
  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

Deletion in app.lua at line 472 [4.2]

B:BD[7.61193] → [8.567:598]

BD:BD[7.61193] → [8.567:598]

B:BD[10.8029] → [8.599:821]

BD:BD[10.8029] → [8.599:821]

B:BD[8.821] → [3.77:89]

BD:BD[8.821] → [3.77:89]

∅:D[3.89] → [8.822:1054]

B:BD[11.636] → [8.822:1054]

B:BD[8.1054] → [3.90:102]

BD:BD[8.1054] → [3.90:102]

∅:D[3.102] → [8.1055:1271]

B:BD[11.907] → [8.1055:1271]

BD:BD[11.907] → [8.1055:1271]

∅:D[8.1271] → [12.845:983]

B:BD[11.913] → [12.845:983]

BD:BD[11.913] → [12.845:983]

nativefs = require 'nativefs'
  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
      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
      end
  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