X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FProjectManager.java;h=dd124fb1441aea0fd6abcf62ce900ad059ecd4c4;hb=09fa8f788bc17540c5ee8910f927616da59ef44e;hp=ca07a4d62daad9cdcf3f0714d6366199029934c1;hpb=9030b0e6266f4962aee282fa3ec689547775b925;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/core/ProjectManager.java b/src/net/pterodactylus/jsite/core/ProjectManager.java index ca07a4d..dd124fb 100644 --- a/src/net/pterodactylus/jsite/core/ProjectManager.java +++ b/src/net/pterodactylus/jsite/core/ProjectManager.java @@ -19,29 +19,34 @@ package net.pterodactylus.jsite.core; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.FileWriter; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.Reader; +import java.io.Writer; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; -import java.util.Properties; +import java.util.Map; +import java.util.Map.Entry; +import java.util.logging.Level; import java.util.logging.Logger; +import net.pterodactylus.util.collection.MapWriter; import net.pterodactylus.util.io.Closer; import net.pterodactylus.util.logging.Logging; /** * Manages projects, taking care of persistence, lifetime statistics, and other * things. - * + * * @author David ‘Bombe’ Roden <bombe@freenetproject.org> - * @version $Id$ */ -public class ProjectManager { +public class ProjectManager implements PropertyChangeListener { /** Logger. */ private static final Logger logger = Logging.getLogger(ProjectManager.class.getName()); @@ -58,7 +63,7 @@ public class ProjectManager { /** * Creates a new project manager that saves and restores its state to/from * the given directory. - * + * * @param directory * The directory to save and restore states to/from */ @@ -72,7 +77,7 @@ public class ProjectManager { /** * Returns the directory the projects are loaded from and saved to. - * + * * @return The directory for storing the projects */ public String getDirectory() { @@ -81,7 +86,7 @@ public class ProjectManager { /** * Returns a list of all projects. - * + * * @return A list of all projects */ public List getProjects() { @@ -90,7 +95,7 @@ public class ProjectManager { /** * Sets the node manager to use. - * + * * @param nodeManager * The node manager to use */ @@ -104,7 +109,7 @@ public class ProjectManager { /** * Loads projects and statistics. - * + * * @throws IOException * if an I/O error occurs */ @@ -114,26 +119,47 @@ public class ProjectManager { if (!projectFile.exists() || !projectFile.isFile() || !projectFile.canRead()) { return; } - Properties projectProperties = new Properties(); - InputStream projectInputStream = null; + logger.log(Level.INFO, "Loading projects from “" + projectFile + "”..."); + Map projectProperties; + Reader reader = null; try { - projectInputStream = new FileInputStream(projectFile); - projectProperties.load(projectInputStream); + reader = new FileReader(projectFile); + projectProperties = MapWriter.read(reader); } finally { - Closer.close(projectInputStream); + Closer.close(reader); } int projectIndex = 0; while (projectProperties.containsKey("projects." + projectIndex + ".name")) { String projectPrefix = "projects." + projectIndex; - String projectName = projectProperties.getProperty(projectPrefix + ".name"); - String projectDescription = projectProperties.getProperty(projectPrefix + ".description"); - String projectPrivateKey = projectProperties.getProperty(projectPrefix + ".privateKey"); - String projectPublicKey = projectProperties.getProperty(projectPrefix + ".publicKey"); + String projectId = projectProperties.get(projectPrefix + ".id"); + String projectName = projectProperties.get(projectPrefix + ".name"); + String projectDescription = projectProperties.get(projectPrefix + ".description"); + String projectPrivateKey = projectProperties.get(projectPrefix + ".privateKey"); + String projectPublicKey = projectProperties.get(projectPrefix + ".publicKey"); + String projectBasePath = projectProperties.get(projectPrefix + ".basePath"); + String projectDefaultFile = projectProperties.get(projectPrefix + ".defaultFile"); + String projectNode = projectProperties.get(projectPrefix + ".node"); Project project = new Project(); + project.setId(projectId); project.setName(projectName); project.setDescription(projectDescription); project.setPrivateKey(projectPrivateKey); project.setPublicKey(projectPublicKey); + project.setBasePath(projectBasePath); + project.setDefaultFile(projectDefaultFile); + if (projectNode != null) { + Node node = nodeManager.getNode(projectNode); + project.setNode(node); + } + int overrideIndex = 0; + while (projectProperties.containsKey(projectPrefix + ".overrides." + overrideIndex + ".override")) { + String filePath = projectProperties.get(projectPrefix + ".overrides." + overrideIndex + ".filePath"); + FileOverride override = FileOverride.valueOf(projectProperties.get(projectPrefix + ".overrides." + overrideIndex + ".override")); + project.addFileOverride(filePath, override); + logger.log(Level.FINEST, "read override: " + filePath + ", " + override); + overrideIndex++; + } + project.addPropertyChangeListener(this); projects.add(project); logger.fine("loaded project “" + project.getName() + "”."); projectIndex++; @@ -142,7 +168,7 @@ public class ProjectManager { /** * Saves projects and statistics. - * + * * @throws IOException * if an I/O error occurs */ @@ -153,30 +179,42 @@ public class ProjectManager { throw new IOException("could not create directory: " + directory); } } - Properties projectProperties = new Properties(); + Map projectProperties = new HashMap(); int projectIndex = 0; - for (Project project: projects) { + for (Project project : projects) { String projectPrefix = "projects." + projectIndex; - projectProperties.setProperty(projectPrefix + ".name", project.getName()); - projectProperties.setProperty(projectPrefix + ".description", project.getDescription()); - projectProperties.setProperty(projectPrefix + ".privateKey", project.getPrivateKey()); - projectProperties.setProperty(projectPrefix + ".publicKey", project.getPublicKey()); + projectProperties.put(projectPrefix + ".id", project.getId()); + projectProperties.put(projectPrefix + ".name", project.getName()); + projectProperties.put(projectPrefix + ".description", project.getDescription()); + projectProperties.put(projectPrefix + ".privateKey", project.getPrivateKey()); + projectProperties.put(projectPrefix + ".publicKey", project.getPublicKey()); + projectProperties.put(projectPrefix + ".basePath", project.getBasePath()); + projectProperties.put(projectPrefix + ".defaultFile", project.getDefaultFile()); + if (project.getNode() != null) { + projectProperties.put(projectPrefix + ".node", project.getNode().getId()); + } + int overrideIndex = 0; + for (Entry overrideEntry : project.getFileOverrides().entrySet()) { + projectProperties.put(projectPrefix + ".overrides." + overrideIndex + ".filePath", overrideEntry.getKey()); + projectProperties.put(projectPrefix + ".overrides." + overrideIndex + ".override", overrideEntry.getValue().toString()); + overrideIndex++; + } projectIndex++; } File projectFile = new File(directoryFile, "projects.properties"); - OutputStream projectOutputStream = null; + Writer writer = null; try { - projectOutputStream = new FileOutputStream(projectFile); - projectProperties.store(projectOutputStream, "jSite projects"); + writer = new FileWriter(projectFile); + MapWriter.write(writer, projectProperties); } finally { - Closer.close(projectOutputStream); + Closer.close(writer); } } /** * Creates a new project. The returned {@link Project} will contain a newly * generated key pair. - * + * * @return A newly created project * @throws IOException * if an I/O error occured communicating with the node @@ -186,9 +224,71 @@ public class ProjectManager { public Project createProject() throws IOException, JSiteException { Project project = new Project(); String[] keyPair = nodeManager.generateKeyPair(); + project.setName(""); + project.setDescription(""); project.setPrivateKey(keyPair[0]); project.setPublicKey(keyPair[1]); + project.setBasePath(""); + project.setDefaultFile(""); projects.add(project); + project.addPropertyChangeListener(this); + try { + save(); + } catch (IOException ioe1) { + /* ignore. */ + } return project; } + + /** + * Clones the given project and returns the clone. The clone will be + * identical in all user-exposed fields, except for the project’s + * {@link Project#getId ID}. + * + * @param project + * The project to clone + * @return The cloned project + */ + public Project cloneProject(Project project) { + Project projectClone = new Project(project); + projects.add(projectClone); + projectClone.addPropertyChangeListener(this); + try { + save(); + } catch (IOException ioe1) { + /* ignore. */ + } + return projectClone; + } + + /** + * Removes the given project. + * + * @param project + * The project to remove + */ + public void removeProject(Project project) { + projects.remove(project); + try { + save(); + } catch (IOException ioe1) { + /* ignore. */ + } + } + + // + // INTERFACE PropertyChangeListener + // + + /** + * {@inheritDoc} + */ + public void propertyChange(PropertyChangeEvent propertyChangeEvent) { + try { + save(); + } catch (IOException ioe1) { + /* ignore. */ + } + } + }