/*
- * jSite - Project.java - Copyright © 2006–2012 David Roden
+ * jSite - Project.java - Copyright © 2006–2019 David Roden
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
package de.todesbaum.jsite.application;
import java.io.File;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import de.todesbaum.util.mime.DefaultMIMETypes;
+import net.pterodactylus.util.io.MimeTypes;
/**
* Container for project information.
/** The edition to insert to. */
protected int edition;
+ /** Whether to always force inserts. */
+ private boolean alwaysForceInserts;
+
/** Whether to ignore hidden directory. */
private boolean ignoreHiddenFiles;
localPath = project.localPath;
indexFile = project.indexFile;
lastInsertionTime = project.lastInsertionTime;
+ alwaysForceInserts = project.alwaysForceInserts;
ignoreHiddenFiles = project.ignoreHiddenFiles;
- fileOptions = new HashMap<String, FileOption>(project.fileOptions);
+ for (Entry<String, FileOption> fileOption : fileOptions.entrySet()) {
+ fileOptions.put(fileOption.getKey(), new FileOption(fileOption.getValue()));
+ }
}
/**
}
/**
+ * Returns whether files for this project should always be inserted, even
+ * when unchanged.
+ *
+ * @return {@code true} to always force inserts on this project,
+ * {@code false} otherwise
+ */
+ public boolean isAlwaysForceInsert() {
+ return alwaysForceInserts;
+ }
+
+ /**
+ * Sets whether files for this project should always be inserted, even when
+ * unchanged.
+ *
+ * @param alwaysForceInsert
+ * {@code true} to always force inserts on this project,
+ * {@code false} otherwise
+ */
+ public void setAlwaysForceInsert(boolean alwaysForceInsert) {
+ this.alwaysForceInserts = alwaysForceInsert;
+ }
+
+ /**
* Returns whether hidden files are ignored, i.e. not inserted.
*
* @return {@code true} if hidden files are not inserted, {@code false}
* The URI to shorten
* @return The shortened URI
*/
- private String shortenURI(String uri) {
+ private static String shortenURI(String uri) {
String shortUri = uri;
if (shortUri.startsWith("freenet:")) {
shortUri = shortUri.substring("freenet:".length());
*/
public FileOption getFileOption(String filename) {
FileOption fileOption = fileOptions.get(filename);
+ String defaultMimeType = "application/octet-stream";
if (fileOption == null) {
- fileOption = new FileOption(DefaultMIMETypes.guessMIMEType(filename));
- fileOptions.put(filename, fileOption);
+ List<String> suffixes = getSuffixes(filename);
+ for (String suffix : suffixes) {
+ String mimeType = MimeTypes.getMimeType(suffix);
+ if (!mimeType.equals(defaultMimeType)) {
+ defaultMimeType = mimeType;
+ break;
+ }
+ }
+ fileOption = new FileOption(defaultMimeType);
}
+ fileOptions.put(filename, fileOption);
return fileOption;
}
+ private List<String> getSuffixes(String filename) {
+ List<String> suffixes = new ArrayList<>();
+ int dot = filename.lastIndexOf(".");
+ while (dot > -1) {
+ String suffix = filename.substring(dot + 1);
+ suffixes.add(0, suffix);
+ dot = filename.lastIndexOf(".", dot - 1);
+ }
+ return suffixes;
+ }
+
/**
* Sets options for a file.
*
* <p>
* Projects are compared by their name only.
*/
+ @Override
public int compareTo(Project project) {
return name.compareToIgnoreCase(project.name);
}
if ((fileOption.getCurrentHash() != null) && (fileOption.getCurrentHash().length() > 0) && (!fileOption.getCurrentHash().equals(fileOption.getLastInsertHash()) || fileOption.isForceInsert())) {
fileOption.setLastInsertEdition(edition);
fileOption.setLastInsertHash(fileOption.getCurrentHash());
- fileOption.setLastInsertFilename(fileOption.hasChangedName() ? fileOption.getChangedName() : fileOptionEntry.getKey());
+ fileOption.setLastInsertFilename(fileOption.getChangedName().orElse(fileOptionEntry.getKey()));
}
fileOption.setForceInsert(false);
}