diff --git a/Zframework/file.lua b/Zframework/file.lua index b0689752..e6ea1177 100644 --- a/Zframework/file.lua +++ b/Zframework/file.lua @@ -44,15 +44,20 @@ function FILE.save(data,name,mode) data=tostring(data) end + if mode:find'd'and fs.getInfo(name)then + MES.new('error',text.saveError_duplicate) + return + end local F=fs.newFile(name) F:open'w' local success,mes=F:write(data) F:flush()F:close() - if not success then + if success then + return true + else MES.new('error',text.saveError..(mes or"unknown error")) MES.traceback() end - return success end function FILE.clear(path) if fs.getRealDirectory(path)~=SAVEDIR or fs.getInfo(path).type~='directory'then return end diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index c9b74f81..4a1e3306 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -62,6 +62,7 @@ return{ saveDone="Data Saved", saveError="Failed to save:", + saveError_duplicate="Duplicate filename", loadError="Failed to load:", exportSuccess="Exported successfully", importSuccess="Imported successfully", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index b3c5b533..645c0199 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -51,6 +51,7 @@ return{ saveDone="Datos guardados", saveError="Error al guardar:", + -- saveError_duplicate="Duplicate filename", loadError="Error al cargar:", exportSuccess="Exportado con éxito", importSuccess="Importado con éxito", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 171d09f2..129b2f1c 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -52,6 +52,7 @@ return{ saveDone="Données sauvegardées", saveError="Sauvegarde échouée : ", + -- saveError_duplicate="Duplicate filename", loadError="Lecture échouée : ", exportSuccess="Exporté avec succès", importSuccess="Importé avec succès", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index ecc0e73b..cb9fd1ab 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -52,6 +52,7 @@ return{ saveDone="Data Salva", saveError="Falha ao salvar:", + -- saveError_duplicate="Duplicate filename", loadError="Falha ao ler:", exportSuccess="Exportado com sucesso", importSuccess="Importado com sucesso", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 1dee24ae..7ee3a585 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -38,6 +38,7 @@ return{ saveDone="~~~", saveError="x!:", + saveError_duplicate="X←→X ?", loadError="x!:", exportSuccess="~Out~", importSuccess="~In~", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index b9d14f0d..3a2ca64b 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -62,6 +62,7 @@ return{ saveDone="保存成功!", saveError="保存失败:", + saveError_duplicate="文件名重复", loadError="读取失败:", exportSuccess="导出成功", importSuccess="导入成功",