Generate resource graph on bundle

com.dynamo.cr/com.dynamo.cr.bob.test/src/com/dynamo/bob/archive/test/ArchiveTest.java

@@ -40,7 +40,7 @@
 import com.dynamo.bob.archive.ArchiveBuilder;
 import com.dynamo.bob.archive.ArchiveReader;
 import com.dynamo.bob.archive.ManifestBuilder;
-import com.dynamo.bob.pipeline.ResourceNode;
+import com.dynamo.bob.pipeline.graph.ResourceNode;
 import com.dynamo.liveupdate.proto.Manifest.HashAlgorithm;
 import com.dynamo.liveupdate.proto.Manifest.ResourceEntryFlag;
 

com.dynamo.cr/com.dynamo.cr.bob.test/src/com/dynamo/bob/archive/test/ManifestTest.java

@@ -42,7 +42,7 @@
 import org.junit.Test;
 
 import com.dynamo.bob.archive.ManifestBuilder;
-import com.dynamo.bob.pipeline.ResourceNode;
+import com.dynamo.bob.pipeline.graph.ResourceNode;
 import com.dynamo.liveupdate.proto.Manifest.HashAlgorithm;
 import com.dynamo.liveupdate.proto.Manifest.HashDigest;
 import com.dynamo.liveupdate.proto.Manifest.ManifestData;

com.dynamo.cr/com.dynamo.cr.bob.test/src/com/dynamo/bob/pipeline/CollectionBuilderTest.java

@@ -43,7 +43,7 @@
 import com.dynamo.proto.DdfMath.Quat;
 import com.dynamo.gamesys.proto.Sprite.SpriteDesc;
 import com.google.protobuf.Message;
-import com.dynamo.bob.pipeline.ResourceNode;
+import com.dynamo.bob.pipeline.graph.ResourceNode;
 
 public class CollectionBuilderTest extends AbstractProtoBuilderTest {
 

com.dynamo.cr/com.dynamo.cr.bob/src/com/dynamo/bob/Project.java

@@ -238,6 +238,15 @@ public BobProjectProperties getProjectProperties() {
         return projectProperties;
     }
 
+    /**
+     * Convert an absolute path to a path relative to the project root
+     * @param path The path to relativize
+     * @return Relative path
+     */
+    public String getPathRelativeToRootDirectory(String path) {
+        return Path.of(rootDirectory).relativize(Path.of(path)).toString();
+    }
+
     public void setPublisher(Publisher publisher) {
         this.publisher = publisher;
     }

com.dynamo.cr/com.dynamo.cr.bob/src/com/dynamo/bob/archive/ArchiveBuilder.java

@@ -31,13 +31,15 @@
 import java.util.List;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.Map;
+import java.util.HashMap;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 
 import com.dynamo.bob.CompileExceptionError;
-import com.dynamo.bob.pipeline.ResourceNode;
+import com.dynamo.bob.pipeline.graph.ResourceNode;
 import com.dynamo.liveupdate.proto.Manifest.HashAlgorithm;
 import com.dynamo.liveupdate.proto.Manifest.SignAlgorithm;
 import com.dynamo.liveupdate.proto.Manifest.ResourceEntryFlag;
@@ -59,6 +61,7 @@ public class ArchiveBuilder {
     private List<ArchiveEntry> entries = new ArrayList<ArchiveEntry>();
     private List<ArchiveEntry> excludedEntries = new ArrayList<ArchiveEntry>();
     private Set<String> lookup = new HashSet<String>(); // To see if a resource has already been added
+    private Map<String, String> hexDigestCache = new HashMap<>();
     private String root;
     private ManifestBuilder manifestBuilder = null;
     private LZ4Compressor lz4Compressor;
@@ -101,10 +104,6 @@ public int getArchiveEntrySize() {
         return this.entries.size();
     }
 
-    public byte[] getArchiveIndexHash() {
-        return this.archiveIndexMD5;
-    }
-
     public byte[] loadResourceData(String filepath) throws IOException {
         File fhandle = new File(filepath);
         return FileUtils.readFileToByteArray(fhandle);
@@ -248,8 +247,8 @@ public void write(RandomAccessFile archiveIndex, RandomAccessFile archiveData, P
                 throw new IOException("Unable to create a Resource Pack, the hashing algorithm is not supported!");
             }
 
-            // Store association between hexdigest and original filename in a lookup table
             entry.setHexDigest(hexDigest);
+            hexDigestCache.put(entry.getFilename(), hexDigest);
 
             // Write resource to resource pack or data archive
             if (this.excludeResource(normalisedPath, excludedResources)) {
@@ -288,16 +287,17 @@ public void write(RandomAccessFile archiveIndex, RandomAccessFile archiveData, P
         }
         archiveIndex.write(indexBuffer.array());
 
+        byte[] archiveIndexMD5 = null;
         try {
             // Calc index file MD5 hash
             archiveIndex.seek(archiveIndexHeaderOffset);
             int num_bytes = (int) archiveIndex.length() - archiveIndexHeaderOffset;
             byte[] archiveIndexBytes = new byte[num_bytes];
             archiveIndex.readFully(archiveIndexBytes);
-            this.archiveIndexMD5 = ManifestBuilder.CryptographicOperations.hash(archiveIndexBytes, HashAlgorithm.HASH_MD5);
+            archiveIndexMD5 = ManifestBuilder.CryptographicOperations.hash(archiveIndexBytes, HashAlgorithm.HASH_MD5);
+            manifestBuilder.setArchiveIdentifier(archiveIndexMD5);
         } catch (NoSuchAlgorithmException e) {
-            System.err.println("The algorithm specified is not supported!");
-            e.printStackTrace();
+            throw new IOException("Unable to create a Resource Pack, the hashing algorithm is not supported!");
         }
 
         // Update index header with offsets
@@ -309,7 +309,7 @@ public void write(RandomAccessFile archiveIndex, RandomAccessFile archiveData, P
         archiveIndex.writeInt(entryOffset);
         archiveIndex.writeInt(hashOffset);
         archiveIndex.writeInt(ManifestBuilder.CryptographicOperations.getHashSize(manifestBuilder.getResourceHashAlgorithm()));
-        archiveIndex.write(this.archiveIndexMD5);
+        archiveIndex.write(archiveIndexMD5);
     }
 
     private void alignBuffer(RandomAccessFile outFile, int align) throws IOException {
@@ -322,6 +322,15 @@ private void alignBuffer(RandomAccessFile outFile, int align) throws IOException
         }
     }
 
+    /**
+     * Get all cached hex digests as a lookup between absolute filepath and
+     * digest.
+     * @return Map with hex digests, keyed on absolute filepath
+     */
+    public Map<String, String> getCachedHexDigests() {
+        return hexDigestCache;
+    }
+
     private static void printUsageAndTerminate(String message) {
         System.err.println("Usage: ArchiveBuilder <root> <output> [-c] <file> [<file> ...]\n");
         System.err.println("  <root>            - directorypath to root of input files (<file>)");
@@ -436,7 +445,6 @@ public static void main(String[] args) throws IOException, NoSuchAlgorithmExcept
             System.out.println("Writing " + filepathArchiveData.getCanonicalPath());
 
             archiveBuilder.write(archiveIndex, archiveData, resourcePackDirectory, excludedResources);
-            manifestBuilder.setArchiveIdentifier(archiveBuilder.getArchiveIndexHash());
 
             System.out.println("Writing " + filepathManifest.getCanonicalPath());
             byte[] manifestFile = manifestBuilder.buildManifest();

com.dynamo.cr/com.dynamo.cr.bob/src/com/dynamo/bob/archive/ManifestBuilder.java

@@ -47,7 +47,7 @@
 import javax.crypto.NoSuchPaddingException;
 import javax.security.auth.DestroyFailedException;
 
-import com.dynamo.bob.pipeline.ResourceNode;
+import com.dynamo.bob.pipeline.graph.ResourceNode;
 import com.dynamo.bob.util.MurmurHash;
 import com.dynamo.bob.logging.Logger;
 import com.dynamo.liveupdate.proto.Manifest.HashAlgorithm;
@@ -422,7 +422,7 @@ private void buildResourceOccurrancesMap(ResourceNode node) {
         // The resource may occur at many instances in the tree
         // This map contains the mapping url -> occurrances (i.e. nodes)
 
-        String key = node.relativeFilepath;
+        String key = node.getRelativePath();
         if (!pathToOccurrances.containsKey(key)) {
             pathToOccurrances.put(key, new ArrayList<ResourceNode>());
         }
@@ -457,9 +457,9 @@ public List<ArrayList<String>> getParentCollections(String filepath) {
             ResourceNode current = candidates.remove(0).getParent();
             result.add(new ArrayList<String>());
             while (current != null) {
-                if (current.relativeFilepath.endsWith("collectionproxyc") ||
-                    current.relativeFilepath.endsWith("collectionc")) {
-                    result.get(i).add(current.relativeFilepath);
+                if (current.getRelativePath().endsWith("collectionproxyc") ||
+                    current.getRelativePath().endsWith("collectionc")) {
+                    result.get(i).add(current.getRelativePath());
                 }
 
                 current = current.getParent();
@@ -495,10 +495,10 @@ and thus create a partial archive that has to be updated (through
         dependants = new ArrayList<String>();
 
         for (ResourceNode child : candidate.getChildren()) {
-            dependants.add(child.relativeFilepath);
+            dependants.add(child.getRelativePath());
 
-            if (!child.relativeFilepath.endsWith("collectionproxyc")) {
-                dependants.addAll(getDependants(child.relativeFilepath));
+            if (!child.getRelativePath().endsWith("collectionproxyc")) {
+                dependants.addAll(getDependants(child.getRelativePath()));
             }
         }
 
@@ -524,7 +524,7 @@ public ManifestHeader buildManifestHeader() throws IOException {
     }
 
     private void buildPathToNodeMap(ResourceNode node) {
-        pathToNode.put(node.relativeFilepath, node);
+        pathToNode.put(node.getRelativePath(), node);
         for (ResourceNode child : node.getChildren()) {
             buildPathToNodeMap(child);
         }