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

i2psnark: Don't fail to start if data directory not found (ticket #2166)

Browse Source 
Try to create dir if doesn't exist
Hide add and create sections if dir not writable
Remove 403 handler, don't want it for standalone hostname check
This commit is contained in:
zzz
2018-03-15 15:50:33 +00:00
parent 1de82a6801
commit cfd84bdcdd
6 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
View File

@@ -1058,13 +1058,27 @@ public class SnarkManager implements CompleteListener, ClientApp {
} catch (NumberFormatException nfe) {}
}
// set this before we check the data dir
if (areFilesPublic() != filesPublic) {
_config.setProperty(PROP_FILES_PUBLIC, Boolean.toString(filesPublic));
_util.setFilesPublic(filesPublic);
if (filesPublic)
addMessage(_t("New files will be publicly readable"));
else
addMessage(_t("New files will not be publicly readable"));
changed = true;
}
if (dataDir != null && !dataDir.equals(getDataDir().getAbsolutePath())) {
dataDir = DataHelper.stripHTML(dataDir.trim());
File dd = new File(dataDir);
File dd = areFilesPublic() ? new File(dataDir) : new SecureDirectory(dataDir);
if (!dd.isAbsolute()) {
addMessage(_t("Data directory must be an absolute path") + ": " + dataDir);
} else if (!dd.exists()) {
addMessage(_t("Data directory does not exist") + ": " + dataDir);
} else if (!dd.exists() && !dd.mkdirs()) {
// save this tag for now, may need it again
if (false)
addMessage(_t("Data directory does not exist") + ": " + dataDir);
addMessage(_t("Data directory cannot be created") + ": " + dataDir);
} else if (!dd.isDirectory()) {
addMessage(_t("Not a directory") + ": " + dataDir);
} else if (!dd.canRead()) {
@@ -1196,16 +1210,6 @@ public class SnarkManager implements CompleteListener, ClientApp {
changed = true;
} // reconnect || changed options
if (areFilesPublic() != filesPublic) {
_config.setProperty(PROP_FILES_PUBLIC, Boolean.toString(filesPublic));
_util.setFilesPublic(filesPublic);
if (filesPublic)
addMessage(_t("New files will be publicly readable"));
else
addMessage(_t("New files will not be publicly readable"));
changed = true;
}
if (shouldAutoStart() != autoStart) {
_config.setProperty(PROP_AUTO_START, Boolean.toString(autoStart));
if (autoStart)