From 234d3fd1cdf0595b167e7eb169d106c70483f24b Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sat, 17 Mar 2012 03:05:25 +0100 Subject: [PATCH] Calculate hashes when scanning files. --- .../jsite/application/ProjectInserter.java | 41 +++-- src/de/todesbaum/jsite/gui/FileScanner.java | 189 ++++++++++++++++++++- src/de/todesbaum/jsite/gui/ProjectFilesPage.java | 9 +- 3 files changed, 208 insertions(+), 31 deletions(-) diff --git a/src/de/todesbaum/jsite/application/ProjectInserter.java b/src/de/todesbaum/jsite/application/ProjectInserter.java index db4d514..acd93db 100644 --- a/src/de/todesbaum/jsite/application/ProjectInserter.java +++ b/src/de/todesbaum/jsite/application/ProjectInserter.java @@ -34,6 +34,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import de.todesbaum.jsite.gui.FileScanner; +import de.todesbaum.jsite.gui.FileScanner.ScannedFile; import de.todesbaum.jsite.gui.FileScannerListener; import de.todesbaum.util.freenet.fcp2.Client; import de.todesbaum.util.freenet.fcp2.ClientPutComplexDir; @@ -268,37 +269,35 @@ public class ProjectInserter implements FileScannerListener, Runnable { * Creates a file entry suitable for handing in to * {@link ClientPutComplexDir#addFileEntry(FileEntry)}. * - * @param filename - * The name of the file to insert + * @param file + * The name and hash of the file to insert * @param edition * The current edition - * @param containerFiles - * The container definitions * @return A file entry for the given file */ - private FileEntry createFileEntry(String filename, int edition, Map> containerFiles) { + private FileEntry createFileEntry(ScannedFile file, int edition) { FileEntry fileEntry = null; + String filename = file.getFilename(); FileOption fileOption = project.getFileOption(filename); + if (fileOption.isInsert()) { + /* check if file was modified. */ + if (file.getHash().equals(fileOption.getLastInsertHash())) { + /* only insert a redirect. */ + return new RedirectFileEntry(filename, fileOption.getMimeType(), "SSK@" + project.getRequestURI() + "/" + project.getPath() + "-" + project.getEdition() + "/" + filename); + } + fileOption.setCurrentHash(file.getHash()); try { - long[] containerLength = new long[1]; - InputStream containerInputStream = createContainerInputStream(containerFiles, containerName, edition, containerLength); - fileEntry = new DirectFileEntry(containerName + ".zip", "application/zip", containerInputStream, containerLength[0]); + long[] fileLength = new long[1]; + InputStream fileEntryInputStream = createFileInputStream(filename, fileOption, edition, fileLength); + fileEntry = new DirectFileEntry(filename, fileOption.getMimeType(), fileEntryInputStream, fileLength[0]); } catch (IOException ioe1) { /* ignore, null is returned. */ } } else { - if (fileOption.isInsert()) { - try { - long[] fileLength = new long[1]; - InputStream fileEntryInputStream = createFileInputStream(filename, fileOption, edition, fileLength); - fileEntry = new DirectFileEntry(filename, project.getFileOption(filename).getMimeType(), fileEntryInputStream, fileLength[0]); - } catch (IOException ioe1) { - /* ignore, null is returned. */ - } + if (fileOption.isInsertRedirect()) { + fileEntry = new RedirectFileEntry(filename, fileOption.getMimeType(), fileOption.getCustomKey()); } else { - if (fileOption.isInsertRedirect()) { - fileEntry = new RedirectFileEntry(filename, fileOption.getMimeType(), fileOption.getCustomKey()); - } + fileOption.setLastInsertHash(""); } } return fileEntry; @@ -409,8 +408,8 @@ public class ProjectInserter implements FileScannerListener, Runnable { putDir.setMaxRetries(-1); putDir.setEarlyEncode(false); putDir.setManifestPutter(ManifestPutter.DEFAULT); - for (String filename : files) { - FileEntry fileEntry = createFileEntry(filename, edition, containerFiles); + for (ScannedFile file : files) { + FileEntry fileEntry = createFileEntry(file, edition); if (fileEntry != null) { try { putDir.addFileEntry(fileEntry); diff --git a/src/de/todesbaum/jsite/gui/FileScanner.java b/src/de/todesbaum/jsite/gui/FileScanner.java index ede930d..86c9ff5 100644 --- a/src/de/todesbaum/jsite/gui/FileScanner.java +++ b/src/de/todesbaum/jsite/gui/FileScanner.java @@ -20,13 +20,23 @@ package de.todesbaum.jsite.gui; import java.io.File; import java.io.FileFilter; +import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.DigestOutputStream; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import de.todesbaum.jsite.application.Project; import de.todesbaum.jsite.i18n.I18n; +import de.todesbaum.util.io.Closer; +import de.todesbaum.util.io.StreamCopier; /** * Scans the local path of a project anychronously and returns the list of found @@ -38,6 +48,9 @@ import de.todesbaum.jsite.i18n.I18n; */ public class FileScanner implements Runnable { + /** The logger. */ + private final static Logger logger = Logger.getLogger(FileScanner.class.getName()); + /** The list of listeners. */ private final List fileScannerListeners = new ArrayList(); @@ -45,7 +58,7 @@ public class FileScanner implements Runnable { private final Project project; /** The list of found files. */ - private List files; + private List files; /** Wether there was an error. */ private boolean error = false; @@ -98,7 +111,7 @@ public class FileScanner implements Runnable { * @see FileScannerListener#fileScannerFinished(FileScanner) */ public void run() { - files = new ArrayList(); + files = new ArrayList(); error = false; try { scanFiles(new File(project.getLocalPath()), files); @@ -124,7 +137,7 @@ public class FileScanner implements Runnable { * * @return The list of found files */ - public List getFiles() { + public List getFiles() { return files; } @@ -138,7 +151,7 @@ public class FileScanner implements Runnable { * @throws IOException * if an I/O error occurs */ - private void scanFiles(File rootDir, List fileList) throws IOException { + private void scanFiles(File rootDir, List fileList) throws IOException { File[] files = rootDir.listFiles(new FileFilter() { @SuppressWarnings("synthetic-access") @@ -154,10 +167,170 @@ public class FileScanner implements Runnable { scanFiles(file, fileList); continue; } - String filename = project.shortenFilename(file); - filename = filename.replace('\\', '/'); - fileList.add(filename); + String filename = project.shortenFilename(file).replace('\\', '/'); + String hash = hashFile(project.getLocalPath(), filename); + fileList.add(new ScannedFile(filename, hash)); + } + } + + /** + * Hashes the given file. + * + * @param path + * The path of the project + * @param filename + * The name of the file, relative to the project path + * @return The hash of the file + */ + @SuppressWarnings("synthetic-access") + private static String hashFile(String path, String filename) { + InputStream fileInputStream = null; + DigestOutputStream digestOutputStream = null; + File file = new File(path, filename); + try { + fileInputStream = new FileInputStream(file); + digestOutputStream = new DigestOutputStream(new NullOutputStream(), MessageDigest.getInstance("SHA-256")); + StreamCopier.copy(fileInputStream, digestOutputStream, file.length()); + return toHex(digestOutputStream.getMessageDigest().digest()); + } catch (NoSuchAlgorithmException nsae1) { + logger.log(Level.WARNING, "Could not get SHA-256 digest!", nsae1); + } catch (IOException ioe1) { + logger.log(Level.WARNING, "Could not read file!", ioe1); + } finally { + Closer.close(digestOutputStream); + Closer.close(fileInputStream); + } + return toHex(new byte[32]); + } + + /** + * Converts the given byte array into a hexadecimal string. + * + * @param array + * The array to convert + * @return The hexadecimal string + */ + private static String toHex(byte[] array) { + StringBuilder hexString = new StringBuilder(array.length * 2); + for (byte b : array) { + hexString.append("0123456789abcdef".charAt((b >>> 4) & 0x0f)).append("0123456789abcdef".charAt(b & 0xf)); + } + return hexString.toString(); + } + + /** + * {@link OutputStream} that discards all written bytes. + * + * @author David ‘Bombe’ Roden <bombe@freenetproject.org> + */ + private static class NullOutputStream extends OutputStream { + + /** + * {@inheritDoc} + */ + @Override + public void write(int b) { + /* do nothing. */ + } + + /** + * {@inheritDoc} + */ + @Override + public void write(byte[] b) { + /* do nothing. */ + } + + /** + * {@inheritDoc} + */ + @Override + public void write(byte[] b, int off, int len) { + /* do nothing. */ } + + } + + /** + * Container for a scanned file, consisting of the name of the file and its + * hash. + * + * @author David ‘Bombe’ Roden <bombe@freenetproject.org> + */ + public static class ScannedFile implements Comparable { + + /** The name of the file. */ + private final String filename; + + /** The hash of the file. */ + private final String hash; + + /** + * Creates a new scanned file. + * + * @param filename + * The name of the file + * @param hash + * The hash of the file + */ + public ScannedFile(String filename, String hash) { + this.filename = filename; + this.hash = hash; + } + + // + // ACCESSORS + // + + /** + * Returns the name of the file. + * + * @return The name of the file + */ + public String getFilename() { + return filename; + } + + /** + * Returns the hash of the file. + * + * @return The hash of the file + */ + public String getHash() { + return hash; + } + + // + // OBJECT METHODS + // + + /** + * {@inheritDoc} + */ + @Override + public int hashCode() { + return filename.hashCode(); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean equals(Object obj) { + return filename.equals(obj); + } + + // + // COMPARABLE METHODS + // + + /** + * {@inheritDoc} + */ + public int compareTo(ScannedFile scannedFile) { + return filename.compareTo(scannedFile.filename); + } + } -} \ No newline at end of file +} diff --git a/src/de/todesbaum/jsite/gui/ProjectFilesPage.java b/src/de/todesbaum/jsite/gui/ProjectFilesPage.java index 2b19a72..0ca9508 100644 --- a/src/de/todesbaum/jsite/gui/ProjectFilesPage.java +++ b/src/de/todesbaum/jsite/gui/ProjectFilesPage.java @@ -56,6 +56,7 @@ import javax.swing.text.Document; import de.todesbaum.jsite.application.FileOption; import de.todesbaum.jsite.application.Project; +import de.todesbaum.jsite.gui.FileScanner.ScannedFile; import de.todesbaum.jsite.i18n.I18n; import de.todesbaum.jsite.i18n.I18nContainer; import de.todesbaum.util.mime.DefaultMIMETypes; @@ -360,12 +361,16 @@ public class ProjectFilesPage extends TWizardPage implements ActionListener, Lis public void fileScannerFinished(FileScanner fileScanner) { final boolean error = fileScanner.isError(); if (!error) { - final List files = fileScanner.getFiles(); + final List files = fileScanner.getFiles(); SwingUtilities.invokeLater(new Runnable() { @SuppressWarnings("synthetic-access") public void run() { - projectFileList.setListData(files.toArray(new String[files.size()])); + String[] filenames = new String[files.size()]; + for (int fileIndex = 0; fileIndex < files.size(); ++fileIndex) { + filenames[fileIndex] = files.get(fileIndex).getFilename(); + } + projectFileList.setListData(filenames); projectFileList.clearSelection(); } }); -- 2.7.4