echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2psnark: Don't warn on failure to delete file if it's already gone

Browse Source
This commit is contained in:
zzz
2016-07-30 18:47:03 +00:00
parent a1fd8f49d7
commit c73a4a7983
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@ -1085,8 +1085,9 @@ public class I2PSnarkServlet extends BasicServlet {
// should be only one // should be only one
if (df.delete()) if (df.delete())
_manager.addMessage(_t("Data file deleted: {0}", df.getAbsolutePath())); _manager.addMessage(_t("Data file deleted: {0}", df.getAbsolutePath()));
else else if (df.exists())
_manager.addMessage(_t("Data file could not be deleted: {0}", df.getAbsolutePath())); _manager.addMessage(_t("Data file could not be deleted: {0}", df.getAbsolutePath()));
// else already gone
} }
break; break;
} }
@ -1094,8 +1095,9 @@ public class I2PSnarkServlet extends BasicServlet {
for (File df : storage.getFiles()) { for (File df : storage.getFiles()) {
if (df.delete()) { if (df.delete()) {
//_manager.addMessage(_t("Data file deleted: {0}", df.getAbsolutePath())); //_manager.addMessage(_t("Data file deleted: {0}", df.getAbsolutePath()));
} else { } else if (df.exists()) {
_manager.addMessage(_t("Data file could not be deleted: {0}", df.getAbsolutePath())); _manager.addMessage(_t("Data file could not be deleted: {0}", df.getAbsolutePath()));
// else already gone
} }
} }
// step 2 delete dirs bottom-up // step 2 delete dirs bottom-up
@ -1109,11 +1111,12 @@ public class I2PSnarkServlet extends BasicServlet {
if (df.delete()) { if (df.delete()) {
ok = true; ok = true;
//_manager.addMessage(_t("Data dir deleted: {0}", df.getAbsolutePath())); //_manager.addMessage(_t("Data dir deleted: {0}", df.getAbsolutePath()));
} else { } else if (df.exists()) {
ok = false; ok = false;
_manager.addMessage(_t("Directory could not be deleted: {0}", df.getAbsolutePath())); _manager.addMessage(_t("Directory could not be deleted: {0}", df.getAbsolutePath()));
if (_log.shouldLog(Log.WARN)) if (_log.shouldLog(Log.WARN))
_log.warn("Could not delete dir " + df); _log.warn("Could not delete dir " + df);
// else already gone
} }
} }
// step 3 message for base (last one) // step 3 message for base (last one)