X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FConfiguration.java;h=e98a18dc51d7e445199bfc5a3d049cfde17cc388;hb=e44d9035a0f2e62d44d61be3c396a69d5049f58a;hp=64f3771f088dbc6c8ff3d1fe7c9f332c406c75f0;hpb=705ab7eee0d2b8194f6e8420ce3f588899f6da9a;p=jSite.git
diff --git a/src/de/todesbaum/jsite/main/Configuration.java b/src/de/todesbaum/jsite/main/Configuration.java
index 64f3771..e98a18d 100644
--- a/src/de/todesbaum/jsite/main/Configuration.java
+++ b/src/de/todesbaum/jsite/main/Configuration.java
@@ -37,52 +37,104 @@ import java.util.Map.Entry;
import de.todesbaum.jsite.application.FileOption;
import de.todesbaum.jsite.application.Node;
import de.todesbaum.jsite.application.Project;
+import de.todesbaum.util.io.Closer;
import de.todesbaum.util.io.StreamCopier;
import de.todesbaum.util.xml.SimpleXML;
import de.todesbaum.util.xml.XML;
/**
- * @author David Roden <droden@gmail.com>
- * @version $Id$
+ * The configuration.
+ *
+ * @author David âBombeâ Roden <bombe@freenetproject.org>
*/
public class Configuration {
+ /** The name of the file the configuration is stored to. */
private String filename;
+
+ /** The name of the lock file. */
private String lockFilename;
+
+ /** The root node of the configuration. */
private SimpleXML rootNode;
+ /**
+ * Creates a new configuration with the default name of the configuration
+ * file.
+ */
public Configuration() {
this(System.getProperty("user.home") + "/.jSite/config7");
}
-
+
+ /**
+ * Creates a new configuration that is read from the given file.
+ *
+ * @param filename
+ * The name of the configuration file
+ */
public Configuration(String filename) {
this(filename, filename + ".lock");
}
-
+
+ /**
+ * Creates a new configuration that is read from the given file and uses the
+ * given lock file.
+ *
+ * @param filename
+ * The name of the configuration file
+ * @param lockFilename
+ * The name of the lock file
+ */
public Configuration(String filename, String lockFilename) {
this.filename = filename;
this.lockFilename = lockFilename;
readConfiguration();
}
-
+
+ /**
+ * Creates the directory of the configuration file.
+ *
+ * @return true
if the directory exists, or if it could be
+ * created, false
otherwise
+ */
private boolean createConfigDirectory() {
File configDirectory = new File(filename).getAbsoluteFile().getParentFile();
return (configDirectory.exists() && configDirectory.isDirectory()) || configDirectory.mkdirs();
}
+ /**
+ * Creates the lock file.
+ *
+ * @return true
if the lock file did not already exist and
+ * could be created, false
otherwise
+ */
public boolean createLockFile() {
if (!createConfigDirectory()) {
return false;
}
File lockFile = new File(lockFilename);
- lockFile.deleteOnExit();
try {
- return lockFile.createNewFile();
+ boolean fileLocked = lockFile.createNewFile();
+ if (fileLocked) {
+ lockFile.deleteOnExit();
+ }
+ return fileLocked;
} catch (IOException e) {
+ /* ignore. */
}
return false;
}
+ /**
+ * Tells the VM to remove the lock file on program exit.
+ */
+ public void removeLockfileOnExit() {
+ new File(lockFilename).deleteOnExit();
+ }
+
+ /**
+ * Reads the configuration from the file.
+ */
private void readConfiguration() {
File configurationFile = new File(filename);
if (configurationFile.exists()) {
@@ -97,25 +149,23 @@ public class Configuration {
rootNode = SimpleXML.fromDocument(XML.transformToDocument(fileBytes));
return;
} catch (FileNotFoundException e) {
+ /* ignore. */
} catch (IOException e) {
+ /* ignore. */
} finally {
- if (fileInputStream != null) {
- try {
- fileInputStream.close();
- } catch (IOException ioe1) {
- }
- }
- if (fileByteOutputStream != null) {
- try {
- fileByteOutputStream.close();
- } catch (IOException ioe1) {
- }
- }
+ Closer.close(fileInputStream);
+ Closer.close(fileByteOutputStream);
}
}
rootNode = new SimpleXML("configuration");
}
+ /**
+ * Saves the configuration.
+ *
+ * @return true
if the configuration could be saved,
+ * false
otherwise
+ */
public boolean save() {
File configurationFile = new File(filename);
if (!configurationFile.exists()) {
@@ -133,23 +183,24 @@ public class Configuration {
StreamCopier.copy(configurationInputStream, fileOutputStream, configurationBytes.length);
return true;
} catch (IOException ioe1) {
+ /* ignore. */
} finally {
- if (configurationInputStream != null) {
- try {
- configurationInputStream.close();
- } catch (IOException ioe1) {
- }
- }
- if (fileOutputStream != null) {
- try {
- fileOutputStream.close();
- } catch (IOException ioe1) {
- }
- }
+ Closer.close(configurationInputStream);
+ Closer.close(fileOutputStream);
}
return false;
}
+ /**
+ * Returns the value of a node.
+ *
+ * @param nodeNames
+ * The name of all nodes in the chain
+ * @param defaultValue
+ * The default value to return if the node could not be found
+ * @return The value of the node, or the default value if the node could not
+ * be found
+ */
private String getNodeValue(String[] nodeNames, String defaultValue) {
SimpleXML node = rootNode;
int nodeIndex = 0;
@@ -162,14 +213,35 @@ public class Configuration {
return node.getValue();
}
+ /**
+ * Returns the integer value of a node.
+ *
+ * @param nodeNames
+ * The names of all nodes in the chain
+ * @param defaultValue
+ * The default value to return if the node can not be found
+ * @return The parsed integer value, or the default value if the node can
+ * not be found or the value can not be parsed into an integer
+ */
private int getNodeIntValue(String[] nodeNames, int defaultValue) {
try {
return Integer.parseInt(getNodeValue(nodeNames, String.valueOf(defaultValue)));
} catch (NumberFormatException nfe1) {
+ /* ignore. */
}
return defaultValue;
}
+ /**
+ * Returns the boolean value of a node.
+ *
+ * @param nodeNames
+ * The names of all nodes in the chain
+ * @param defaultValue
+ * The default value to return if the node can not be found
+ * @return The parsed boolean value, or the default value if the node can
+ * not be found
+ */
private boolean getNodeBooleanValue(String[] nodeNames, boolean defaultValue) {
String nodeValue = getNodeValue(nodeNames, null);
if (nodeValue == null) {
@@ -180,6 +252,7 @@ public class Configuration {
/**
* Returns the hostname of the node.
+ *
* @return The hostname of the node
* @deprecated Use {@link #getSelectedNode()} instead
*/
@@ -190,7 +263,9 @@ public class Configuration {
/**
* Sets the hostname of the node.
- * @param nodeAddress The hostname of the node
+ *
+ * @param nodeAddress
+ * The hostname of the node
* @deprecated Use {@link #setSelectedNode(Node)} instead
*/
@Deprecated
@@ -200,8 +275,9 @@ public class Configuration {
/**
* The port number of the node
+ *
* @return The port number of the node
- * @deprecated Use {@link #getSelectedNode()} instead.
+ * @deprecated Use {@link #getSelectedNode()} instead.
*/
@Deprecated
public int getNodePort() {
@@ -210,7 +286,9 @@ public class Configuration {
/**
* Sets the port number of the node.
- * @param nodePort The port number of the node
+ *
+ * @param nodePort
+ * The port number of the node
* @deprecated Use {@link #setSelectedNode(Node)} instead
*/
@Deprecated
@@ -218,45 +296,74 @@ public class Configuration {
rootNode.replace("node-port", String.valueOf(nodePort));
}
+ /**
+ * Returns whether the node configuration page should be skipped on startup.
+ *
+ * @return true
to skip the node configuration page on startup,
+ * false
to show it
+ */
public boolean isSkipNodePage() {
return getNodeBooleanValue(new String[] { "skip-node-page" }, false);
}
+ /**
+ * Sets whether the node configuration page should be skipped on startup.
+ *
+ * @param skipNodePage
+ * true
to skip the node configuration page on
+ * startup, false
to show it
+ */
public void setSkipNodePage(boolean skipNodePage) {
rootNode.replace("skip-node-page", String.valueOf(skipNodePage));
}
+ /**
+ * Returns all configured projects.
+ *
+ * @return A list of all projects
+ */
public Project[] getProjects() {
List projects = new ArrayList();
SimpleXML projectsNode = rootNode.getNode("project-list");
if (projectsNode != null) {
SimpleXML[] projectNodes = projectsNode.getNodes("project");
- for (SimpleXML projectNode: projectNodes) {
+ for (SimpleXML projectNode : projectNodes) {
try {
Project project = new Project();
projects.add(project);
- project.setDescription(projectNode.getNode("description").getValue());
- project.setIndexFile(projectNode.getNode("index-file").getValue());
- project.setLastInsertionTime(Long.parseLong(projectNode.getNode("last-insertion-time").getValue()));
- project.setLocalPath(projectNode.getNode("local-path").getValue());
- project.setName(projectNode.getNode("name").getValue());
- project.setPath(projectNode.getNode("path").getValue());
- if (project.getPath().indexOf("/") != -1) {
+ project.setDescription(projectNode.getNode("description").getValue(""));
+ project.setIndexFile(projectNode.getNode("index-file").getValue(""));
+ project.setLastInsertionTime(Long.parseLong(projectNode.getNode("last-insertion-time").getValue("0")));
+ project.setLocalPath(projectNode.getNode("local-path").getValue(""));
+ project.setName(projectNode.getNode("name").getValue(""));
+ project.setPath(projectNode.getNode("path").getValue(""));
+ if ((project.getPath() != null) && (project.getPath().indexOf("/") != -1)) {
project.setPath(project.getPath().replaceAll("/", ""));
}
- project.setEdition(Integer.parseInt(projectNode.getNode("edition").getValue()));
- project.setInsertURI(projectNode.getNode("insert-uri").getValue());
- project.setRequestURI(projectNode.getNode("request-uri").getValue());
+ project.setEdition(Integer.parseInt(projectNode.getNode("edition").getValue("0")));
+ project.setInsertURI(projectNode.getNode("insert-uri").getValue(""));
+ project.setRequestURI(projectNode.getNode("request-uri").getValue(""));
+ if (projectNode.getNode("ignore-hidden-files") != null) {
+ project.setIgnoreHiddenFiles(Boolean.parseBoolean(projectNode.getNode("ignore-hidden-files").getValue("true")));
+ } else {
+ project.setIgnoreHiddenFiles(true);
+ }
SimpleXML fileOptionsNode = projectNode.getNode("file-options");
Map fileOptions = new HashMap();
if (fileOptionsNode != null) {
SimpleXML[] fileOptionNodes = fileOptionsNode.getNodes("file-option");
- for (SimpleXML fileOptionNode: fileOptionNodes) {
+ for (SimpleXML fileOptionNode : fileOptionNodes) {
String filename = fileOptionNode.getNode("filename").getValue();
FileOption fileOption = project.getFileOption(filename);
fileOption.setInsert(Boolean.parseBoolean(fileOptionNode.getNode("insert").getValue()));
- fileOption.setCustomKey(fileOptionNode.getNode("custom-key").getValue());
- fileOption.setMimeType(fileOptionNode.getNode("mime-type").getValue());
+ if (fileOptionNode.getNode("insert-redirect") != null) {
+ fileOption.setInsertRedirect(Boolean.parseBoolean(fileOptionNode.getNode("insert-redirect").getValue()));
+ }
+ fileOption.setCustomKey(fileOptionNode.getNode("custom-key").getValue(""));
+ if (fileOptionNode.getNode("changed-name") != null) {
+ fileOption.setChangedName(fileOptionNode.getNode("changed-name").getValue());
+ }
+ fileOption.setMimeType(fileOptionNode.getNode("mime-type").getValue(""));
fileOption.setContainer(fileOptionNode.getNode("container").getValue());
if (fileOptionNode.getNode("replace-edition") != null) {
fileOption.setReplaceEdition(Boolean.parseBoolean(fileOptionNode.getNode("replace-edition").getValue()));
@@ -274,9 +381,15 @@ public class Configuration {
return projects.toArray(new Project[projects.size()]);
}
+ /**
+ * Sets the list of all projects.
+ *
+ * @param projects
+ * The list of all projects
+ */
public void setProjects(Project[] projects) {
SimpleXML projectsNode = new SimpleXML("project-list");
- for (Project project: projects) {
+ for (Project project : projects) {
SimpleXML projectNode = projectsNode.append("project");
projectNode.append("edition", String.valueOf(project.getEdition()));
projectNode.append("description", project.getDescription());
@@ -287,6 +400,7 @@ public class Configuration {
projectNode.append("path", project.getPath());
projectNode.append("insert-uri", project.getInsertURI());
projectNode.append("request-uri", project.getRequestURI());
+ projectNode.append("ignore-hidden-files", String.valueOf(project.isIgnoreHiddenFiles()));
SimpleXML fileOptionsNode = projectNode.append("file-options");
Iterator> entries = project.getFileOptions().entrySet().iterator();
while (entries.hasNext()) {
@@ -296,7 +410,9 @@ public class Configuration {
SimpleXML fileOptionNode = fileOptionsNode.append("file-option");
fileOptionNode.append("filename", entry.getKey());
fileOptionNode.append("insert", String.valueOf(fileOption.isInsert()));
+ fileOptionNode.append("insert-redirect", String.valueOf(fileOption.isInsertRedirect()));
fileOptionNode.append("custom-key", fileOption.getCustomKey());
+ fileOptionNode.append("changed-name", fileOption.getChangedName());
fileOptionNode.append("mime-type", fileOption.getMimeType());
fileOptionNode.append("container", fileOption.getContainer());
fileOptionNode.append("replace-edition", String.valueOf(fileOption.getReplaceEdition()));
@@ -307,6 +423,11 @@ public class Configuration {
rootNode.replace(projectsNode);
}
+ /**
+ * Returns the stored locale.
+ *
+ * @return The stored locale
+ */
public Locale getLocale() {
String language = getNodeValue(new String[] { "i18n", "language" }, "en");
String country = getNodeValue(new String[] { "i18n", "country" }, null);
@@ -316,6 +437,12 @@ public class Configuration {
return new Locale(language);
}
+ /**
+ * Sets the locale to store.
+ *
+ * @param locale
+ * The locale to store
+ */
public void setLocale(Locale locale) {
SimpleXML i18nNode = new SimpleXML("i18n");
if (locale.getCountry().length() != 0) {
@@ -325,7 +452,12 @@ public class Configuration {
rootNode.replace(i18nNode);
return;
}
-
+
+ /**
+ * Returns a list of configured nodes.
+ *
+ * @return The list of the configured nodes
+ */
public Node[] getNodes() {
SimpleXML nodesNode = rootNode.getNode("nodes");
if (nodesNode == null) {
@@ -340,7 +472,7 @@ public class Configuration {
SimpleXML[] nodeNodes = nodesNode.getNodes("node");
Node[] returnNodes = new Node[nodeNodes.length];
int nodeIndex = 0;
- for (SimpleXML nodeNode: nodeNodes) {
+ for (SimpleXML nodeNode : nodeNodes) {
String name = nodeNode.getNode("name").getValue();
String hostname = nodeNode.getNode("hostname").getValue();
int port = Integer.parseInt(nodeNode.getNode("port").getValue());
@@ -349,10 +481,16 @@ public class Configuration {
}
return returnNodes;
}
-
+
+ /**
+ * Sets the list of configured nodes.
+ *
+ * @param nodes
+ * The list of configured nodes
+ */
public void setNodes(Node[] nodes) {
SimpleXML nodesNode = new SimpleXML("nodes");
- for (Node node: nodes) {
+ for (Node node : nodes) {
SimpleXML nodeNode = nodesNode.append("node");
nodeNode.append("name", node.getName());
nodeNode.append("hostname", node.getHostname());
@@ -363,6 +501,12 @@ public class Configuration {
rootNode.remove("node-port");
}
+ /**
+ * Sets the selected node.
+ *
+ * @param selectedNode
+ * The selected node
+ */
public void setSelectedNode(Node selectedNode) {
SimpleXML selectedNodeNode = new SimpleXML("selected-node");
selectedNodeNode.append("name", selectedNode.getName());
@@ -370,7 +514,12 @@ public class Configuration {
selectedNodeNode.append("port", String.valueOf(selectedNode.getPort()));
rootNode.replace(selectedNodeNode);
}
-
+
+ /**
+ * Returns the selected node.
+ *
+ * @return The selected node
+ */
public Node getSelectedNode() {
SimpleXML selectedNodeNode = rootNode.getNode("selected-node");
if (selectedNodeNode == null) {
@@ -387,5 +536,32 @@ public class Configuration {
int port = Integer.valueOf(selectedNodeNode.getNode("port").getValue());
return new Node(hostname, port, name);
}
-
+
+ /**
+ * Returns the temp directory to use.
+ *
+ * @return The temp directoy, or {@code null} to use the default temp
+ * directory
+ */
+ public String getTempDirectory() {
+ return getNodeValue(new String[] { "temp-directory" }, null);
+ }
+
+ /**
+ * Sets the temp directory to use.
+ *
+ * @param tempDirectory
+ * The temp directory to use, or {@code null} to use the default
+ * temp directory
+ */
+ public void setTempDirectory(String tempDirectory) {
+ if (tempDirectory != null) {
+ SimpleXML tempDirectoryNode = new SimpleXML("temp-directory");
+ tempDirectoryNode.setValue(tempDirectory);
+ rootNode.replace(tempDirectoryNode);
+ } else {
+ rootNode.remove("temp-directory");
+ }
+ }
+
}