diff --git a/recv_file.lua b/recv_file similarity index 53% rename from recv_file.lua rename to recv_file index 20b1115..6635372 100644 --- a/recv_file.lua +++ b/recv_file @@ -1,22 +1,18 @@ -local sides = peripheral.getNames() -for i = 1, #sides do - if peripheral.getType(sides[i]) == "modem" then - modemSide = sides[i] - break - end -end +dofile("utils") +modemSide = utils.getSideOf("modem") --get side the modem is on rednet.open(modemSide) +--get message, no timeout id, msg, dist = rednet.receive() -print("Received data:") -term.write("Filename: ") -name = tostring(read()) -print(msg) +print("Received data:") +term.write("Output filename: ") +name = tostring(read()) +--decompress string content = textutils.unserialize(msg) +--write to file local file = fs.open(name, "w") file.write(content) file.close() - rednet.close(modemSide) diff --git a/send_file.lua b/send_file similarity index 69% rename from send_file.lua rename to send_file index 422a841..789f6ce 100644 --- a/send_file.lua +++ b/send_file @@ -1,10 +1,5 @@ -local sides = peripheral.getNames() -for i = 1, #sides do - if peripheral.getType(sides[i]) == "modem" then - modemSide = sides[i] - break - end -end +dofile("utils") +modemSide = utils.getSideOf("modem") rednet.open(modemSide) @@ -30,4 +25,4 @@ else print("Aborted.") end -rednet.close(modemSide) \ No newline at end of file +rednet.close(modemSide) diff --git a/utils b/utils new file mode 100644 index 0000000..b5dabba --- /dev/null +++ b/utils @@ -0,0 +1,15 @@ +--lua module "utils" for random utilities +if utils then return end --avoid loading twice +utils = {} + +function utils.getSideOf(name) --get which side, if any, a peripheral p is connected to + local sides = peripheral.getNames() + for i = 1, #sides do + if peripheral.getType(sides[i]) == name then + --found it! + return sides[i] + end + end +end + +return utils