From c9e7b4550919fd0c917f495c9b75e79c4a254eb8 Mon Sep 17 00:00:00 2001 From: Wilma456 Date: Fri, 28 Jul 2017 15:36:33 +0200 Subject: [PATCH 1/2] Show fs error in paint and edit --- .../assets/computercraft/lua/rom/programs/edit.lua | 12 ++++++++---- .../lua/rom/programs/fun/advanced/paint.lua | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/resources/assets/computercraft/lua/rom/programs/edit.lua b/src/main/resources/assets/computercraft/lua/rom/programs/edit.lua index 6a3b3b914c..bde230cf5f 100644 --- a/src/main/resources/assets/computercraft/lua/rom/programs/edit.lua +++ b/src/main/resources/assets/computercraft/lua/rom/programs/edit.lua @@ -93,7 +93,7 @@ local function save( _sPath ) -- Save local file = nil local function innerSave() - file = fs.open( _sPath, "w" ) + file, fileerr = fs.open( _sPath, "w" ) if file then for n, sLine in ipairs( tLines ) do file.write( sLine .. "\n" ) @@ -107,7 +107,7 @@ local function save( _sPath ) if file then file.close() end - return ok, err + return ok, err, fileerr end local tKeywords = { @@ -287,11 +287,15 @@ local tMenuFuncs = { if bReadOnly then sStatus = "Access denied" else - local ok, err = save( sPath ) + local ok, err, fileerr = save( sPath ) if ok then sStatus="Saved to "..sPath else - sStatus="Error saving to "..sPath + if fileerr then + sStatus="Error saving to "..sPath.." ("..fileerr..")" + else + sStatus="Error saving to "..sPath + end end end redrawMenu() diff --git a/src/main/resources/assets/computercraft/lua/rom/programs/fun/advanced/paint.lua b/src/main/resources/assets/computercraft/lua/rom/programs/fun/advanced/paint.lua index 59089054da..0893969301 100644 --- a/src/main/resources/assets/computercraft/lua/rom/programs/fun/advanced/paint.lua +++ b/src/main/resources/assets/computercraft/lua/rom/programs/fun/advanced/paint.lua @@ -128,9 +128,9 @@ local function save(path) fs.makeDir(sDir) end - local file = fs.open( path, "w" ) + local file, err = fs.open( path, "w" ) if not file then - return false + return false, err end -- Encode (and trim) @@ -313,11 +313,15 @@ local function accessMenu() fMessage = "Access denied" return false end - local success = save(sPath) + local success, err = save(sPath) if success then fMessage = "Saved to "..sPath else - fMessage = "Error saving to "..sPath + if err then + fMessage = "Error saving to "..sPath.." ("..err..")" + else + fMessage = "Error saving to "..sPath + end end return false elseif mChoices[selection]=="Exit" then From 0c1114edbcb21adcabb3b0d181bacbaf4801eb50 Mon Sep 17 00:00:00 2001 From: Wilma456 Date: Wed, 30 Aug 2017 17:29:06 +0200 Subject: [PATCH 2/2] Update to new Style --- .../resources/assets/computercraft/lua/rom/programs/edit.lua | 3 ++- .../computercraft/lua/rom/programs/fun/advanced/paint.lua | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/computercraft/lua/rom/programs/edit.lua b/src/main/resources/assets/computercraft/lua/rom/programs/edit.lua index bde230cf5f..f39cee1d9f 100644 --- a/src/main/resources/assets/computercraft/lua/rom/programs/edit.lua +++ b/src/main/resources/assets/computercraft/lua/rom/programs/edit.lua @@ -292,7 +292,7 @@ local tMenuFuncs = { sStatus="Saved to "..sPath else if fileerr then - sStatus="Error saving to "..sPath.." ("..fileerr..")" + sStatus="Error saving to "..fileerr else sStatus="Error saving to "..sPath end @@ -774,3 +774,4 @@ end term.clear() term.setCursorBlink( false ) term.setCursorPos( 1, 1 ) + diff --git a/src/main/resources/assets/computercraft/lua/rom/programs/fun/advanced/paint.lua b/src/main/resources/assets/computercraft/lua/rom/programs/fun/advanced/paint.lua index 0893969301..d57954a1d7 100644 --- a/src/main/resources/assets/computercraft/lua/rom/programs/fun/advanced/paint.lua +++ b/src/main/resources/assets/computercraft/lua/rom/programs/fun/advanced/paint.lua @@ -318,7 +318,7 @@ local function accessMenu() fMessage = "Saved to "..sPath else if err then - fMessage = "Error saving to "..sPath.." ("..err..")" + fMessage = "Error saving to "..err else fMessage = "Error saving to "..sPath end @@ -405,3 +405,4 @@ term.setBackgroundColour(colours.black) term.setTextColour(colours.white) term.clear() term.setCursorPos(1,1) +