projects
/
jSite.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add warning if a project is larger than 2 MiBs.
[jSite.git]
/
src
/
de
/
todesbaum
/
jsite
/
application
/
ProjectInserter.java
diff --git
a/src/de/todesbaum/jsite/application/ProjectInserter.java
b/src/de/todesbaum/jsite/application/ProjectInserter.java
index
70b485e
..
eb5abda
100644
(file)
--- a/
src/de/todesbaum/jsite/application/ProjectInserter.java
+++ b/
src/de/todesbaum/jsite/application/ProjectInserter.java
@@
-97,6
+97,9
@@
public class ProjectInserter implements FileScannerListener, Runnable {
/** The insert priority. */
private PriorityClass priority;
/** The insert priority. */
private PriorityClass priority;
+ /** The manifest putter. */
+ private ManifestPutter manifestPutter;
+
/**
* Adds a listener to the list of registered listeners.
*
/**
* Adds a listener to the list of registered listeners.
*
@@
-244,6
+247,16
@@
public class ProjectInserter implements FileScannerListener, Runnable {
}
/**
}
/**
+ * Sets the manifest putter to use for inserts.
+ *
+ * @param manifestPutter
+ * The manifest putter to use
+ */
+ public void setManifestPutter(ManifestPutter manifestPutter) {
+ this.manifestPutter = manifestPutter;
+ }
+
+ /**
* Starts the insert.
*
* @param progressListener
* Starts the insert.
*
* @param progressListener
@@
-313,18
+326,18
@@
public class ProjectInserter implements FileScannerListener, Runnable {
if (!fileOption.isForceInsert() && file.getHash().equals(fileOption.getLastInsertHash())) {
/* only insert a redirect. */
logger.log(Level.FINE, String.format("Inserting redirect to edition %d for %s.", fileOption.getLastInsertEdition(), filename));
if (!fileOption.isForceInsert() && file.getHash().equals(fileOption.getLastInsertHash())) {
/* only insert a redirect. */
logger.log(Level.FINE, String.format("Inserting redirect to edition %d for %s.", fileOption.getLastInsertEdition(), filename));
- return new RedirectFileEntry(file
name, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + fileOption.getLastInsertEdition() + "/" + filename
);
+ return new RedirectFileEntry(file
Option.hasChangedName() ? fileOption.getChangedName() : filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + fileOption.getLastInsertEdition() + "/" + fileOption.getLastInsertFilename()
);
}
try {
long[] fileLength = new long[1];
InputStream fileEntryInputStream = createFileInputStream(filename, fileOption, edition, fileLength);
}
try {
long[] fileLength = new long[1];
InputStream fileEntryInputStream = createFileInputStream(filename, fileOption, edition, fileLength);
- fileEntry = new DirectFileEntry(filename, fileOption.getMimeType(), fileEntryInputStream, fileLength[0]);
+ fileEntry = new DirectFileEntry(file
Option.hasChangedName() ? fileOption.getChangedName() : file
name, fileOption.getMimeType(), fileEntryInputStream, fileLength[0]);
} catch (IOException ioe1) {
/* ignore, null is returned. */
}
} else {
if (fileOption.isInsertRedirect()) {
} catch (IOException ioe1) {
/* ignore, null is returned. */
}
} else {
if (fileOption.isInsertRedirect()) {
- fileEntry = new RedirectFileEntry(filename, fileOption.getMimeType(), fileOption.getCustomKey());
+ fileEntry = new RedirectFileEntry(file
Option.hasChangedName() ? fileOption.getChangedName() : file
name, fileOption.getMimeType(), fileOption.getCustomKey());
}
}
return fileEntry;
}
}
return fileEntry;
@@
-379,6
+392,7
@@
public class ProjectInserter implements FileScannerListener, Runnable {
checkReport.addIssue("error.no-files-to-insert", true);
}
Set<String> fileNames = new HashSet<String>();
checkReport.addIssue("error.no-files-to-insert", true);
}
Set<String> fileNames = new HashSet<String>();
+ long totalSize = 0;
for (Entry<String, FileOption> fileOptionEntry : fileOptionEntries) {
FileOption fileOption = fileOptionEntry.getValue();
if (!fileOption.isInsert() && !fileOption.isInsertRedirect()) {
for (Entry<String, FileOption> fileOptionEntry : fileOptionEntries) {
FileOption fileOption = fileOptionEntry.getValue();
if (!fileOption.isInsert() && !fileOption.isInsertRedirect()) {
@@
-393,6
+407,12
@@
public class ProjectInserter implements FileScannerListener, Runnable {
if (!fileNames.add(fileName)) {
checkReport.addIssue("error.duplicate-file", true, fileName);
}
if (!fileNames.add(fileName)) {
checkReport.addIssue("error.duplicate-file", true, fileName);
}
+ if (fileOption.isInsert()) {
+ totalSize += new File(project.getLocalPath(), fileName).length();
+ }
+ }
+ if (totalSize > 2 * 1024 * 1024) {
+ checkReport.addIssue("warning.site-larger-than-2-mib", false);
}
return checkReport;
}
}
return checkReport;
}
@@
-435,7
+455,7
@@
public class ProjectInserter implements FileScannerListener, Runnable {
putDir.setMaxRetries(-1);
putDir.setEarlyEncode(useEarlyEncode);
putDir.setPriorityClass(priority);
putDir.setMaxRetries(-1);
putDir.setEarlyEncode(useEarlyEncode);
putDir.setPriorityClass(priority);
- putDir.setManifestPutter(
ManifestPutter.DEFAULT
);
+ putDir.setManifestPutter(
manifestPutter
);
for (ScannedFile file : files) {
FileEntry fileEntry = createFileEntry(file, edition);
if (fileEntry != null) {
for (ScannedFile file : files) {
FileEntry fileEntry = createFileEntry(file, edition);
if (fileEntry != null) {