Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2025-05-01 20:42:01 +02:00
Code Issues Projects Releases Packages Wiki Activity

Have fake-editor send the content of the file itself

Browse source 
So we don't have to fetch the content from the outside.
This commit is contained in:
Sebastian Morr 2020-10-26 21:29:11 +01:00
parent 8f70770107
commit 448ed89ead
5 changed files with 41 additions and 50 deletions

31
scenes/game.gd
View file

@ -11,20 +11,12 @@ var _file = "user://savegame.json"
var state = {}
func _ready():
var dir = Directory.new()
var repo_dir = tmp_prefix+"repos/"
if not dir.dir_exists(tmp_prefix):
var err = dir.make_dir(tmp_prefix)
if err != OK:
helpers.crash("Could not create temporary directory %s." % tmp_prefix)
if not dir.dir_exists(repo_dir):
var err = dir.make_dir(repo_dir)
if err != OK:
helpers.crash("Could not create temporary directory %s." % repo_dir)
global_shell = Shell.new()
fake_editor = copy_file_to_game_env("fake-editor")
copy_file_to_game_env("fake-editor-noblock")
create_file_in_game_env("fake-editor", helpers.read_file("res://scripts/fake-editor"))
fake_editor = tmp_prefix + "fake-editor"
global_shell.run("chmod u+x '%s'" % fake_editor)
load_state()
func _initial_state():
@ -50,11 +42,8 @@ func load_state():
state[key] = new_state[key]
savegame.close()
func copy_file_to_game_env(filename):
# Copy fake-editor to tmp directory (because the original might be in a .pck file).
var file_outside = tmp_prefix + filename
var file_inside = tmp_prefix + filename
var content = helpers.read_file("res://scripts/"+filename)
helpers.write_file(file_outside, content)
global_shell.run("chmod u+x " + '"'+file_inside+'"')
return file_inside
# filename is relative to the tmp directory!
func create_file_in_game_env(filename, content):
global_shell.cd(tmp_prefix)
# Quoted HERE doc doesn't do any substitutions inside.
global_shell.run("cat > '%s' <<'HEREHEREHERE'\n%s\nHEREHEREHERE" % [filename, content])

3
scenes/shell.gd
View file

@ -7,6 +7,9 @@ var _cwd
var _os = OS.get_name()
func _init():
# Create required directories and move into the tmp directory.
_cwd = "/tmp"
run("mkdir -p '%s/repos'" % game.tmp_prefix)
_cwd = game.tmp_prefix
func cd(dir):

21
scenes/text_editor.gd
View file

@ -15,34 +15,31 @@ func _ready():
func _process(_delta):
if _server.is_connection_available():
_client_connection = _server.take_connection()
var length = _client_connection.get_u8()
var length = _client_connection.get_u32()
var filename = _client_connection.get_string(length)
filename = filename.replace("%srepos/" % game.tmp_prefix, "")
open(filename)
length = _client_connection.get_u32()
var content = _client_connection.get_string(length)
open(content)
func _input(event):
if event.is_action_pressed("save"):
save()
func open(filename):
path = filename
var fixme_path = game.tmp_prefix+"repos/"
var content = helpers.read_file(fixme_path+filename)
func open(content):
text = content
show()
grab_focus()
func save():
if visible:
var fixme_path = game.tmp_prefix+"repos/"
# Add a newline to the end of the file if there is none.
if text.length() > 0 and text.substr(text.length()-1, 1) != "\n":
text += "\n"
helpers.write_file(fixme_path+path, text)
_client_connection.put_string(text)
close()
emit_signal("saved")