Rename CPL/PKL files to be {cpl,pkl}_uuid.xml rather than

uuid_{cpl,pkl}.xml as this seems to be more conventional.

7 files changed, 5 insertions, 5 deletions

diff --git a/src/dcp.cc b/src/dcp.cc
index f98fa1d3..638ed707 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -235,7 +235,7 @@ boost::filesystem::path
 DCP::write_pkl (Standard standard, string pkl_uuid, XMLMetadata metadata, shared_ptr<const Signer> signer) const
 {
 	boost::filesystem::path p = _directory;
-	p /= String::compose ("%1_pkl.xml", pkl_uuid);
+	p /= String::compose ("pkl_%1.xml", pkl_uuid);
 
 	xmlpp::Document doc;
 	xmlpp::Element* pkl;
@@ -365,7 +365,7 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMeta
 	asset->add_child("PackingList")->add_child_text ("true");
 	xmlpp::Node* chunk_list = asset->add_child ("ChunkList");
 	xmlpp::Node* chunk = chunk_list->add_child ("Chunk");
-	chunk->add_child("Path")->add_child_text (pkl_uuid + "_pkl.xml");
+	chunk->add_child("Path")->add_child_text ("pkl_" + pkl_uuid + ".xml");
 	chunk->add_child("VolumeIndex")->add_child_text ("1");
 	chunk->add_child("Offset")->add_child_text ("0");
 	chunk->add_child("Length")->add_child_text (raw_convert<string> (pkl_length));
@@ -391,7 +391,7 @@ DCP::write_xml (
 	)
 {
 	BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
-		string const filename = i->id() + "_cpl.xml";
+		string const filename = "cpl_" + i->id() + ".xml";
 		i->write_xml (_directory / filename, standard, signer);
 	}
 
diff --git a/test/ref/DCP/bar/ASSETMAP.xml b/test/ref/DCP/bar/ASSETMAP.xml
index 8381385e..3919605d 100644
--- a/test/ref/DCP/bar/ASSETMAP.xml
+++ b/test/ref/DCP/bar/ASSETMAP.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:3e904ec6-2b99-4846-9eed-161eb6f2896c</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:bf315122-2cd2-448c-8b1b-9f4c85a21629</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>bf315122-2cd2-448c-8b1b-9f4c85a21629_pkl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>7691</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:11c45f5d-d465-4c41-b008-5284cf38a037</Id><ChunkList><Chunk><Path>11c45f5d-d465-4c41-b008-5284cf38a037_cpl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8614</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:3e904ec6-2b99-4846-9eed-161eb6f2896c</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:bf315122-2cd2-448c-8b1b-9f4c85a21629</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_bf315122-2cd2-448c-8b1b-9f4c85a21629.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>7691</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:11c45f5d-d465-4c41-b008-5284cf38a037</Id><ChunkList><Chunk><Path>cpl_11c45f5d-d465-4c41-b008-5284cf38a037.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8614</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
diff --git a/test/ref/DCP/bar/11c45f5d-d465-4c41-b008-5284cf38a037_cpl.xml b/test/ref/DCP/bar/cpl_11c45f5d-d465-4c41-b008-5284cf38a037.xml
index ae01acdc..ae01acdc 100644
--- a/test/ref/DCP/bar/11c45f5d-d465-4c41-b008-5284cf38a037_cpl.xml
+++ b/test/ref/DCP/bar/cpl_11c45f5d-d465-4c41-b008-5284cf38a037.xml
diff --git a/test/ref/DCP/bar/bf315122-2cd2-448c-8b1b-9f4c85a21629_pkl.xml b/test/ref/DCP/bar/pkl_bf315122-2cd2-448c-8b1b-9f4c85a21629.xml
index 09eeaa36..09eeaa36 100644
--- a/test/ref/DCP/bar/bf315122-2cd2-448c-8b1b-9f4c85a21629_pkl.xml
+++ b/test/ref/DCP/bar/pkl_bf315122-2cd2-448c-8b1b-9f4c85a21629.xml
diff --git a/test/ref/DCP/dcp_test1/ASSETMAP.xml b/test/ref/DCP/dcp_test1/ASSETMAP.xml
index 58e60c29..cddbbb4d 100644
--- a/test/ref/DCP/dcp_test1/ASSETMAP.xml
+++ b/test/ref/DCP/dcp_test1/ASSETMAP.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>18be072e-5a0f-44e1-b2eb-c8a52ae12789_pkl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1022</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><ChunkList><Chunk><Path>81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1374</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>161326</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1022</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><ChunkList><Chunk><Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>1374</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><ChunkList><Chunk><Path>video.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>26080</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><ChunkList><Chunk><Path>audio.mxf</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>161326</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
diff --git a/test/ref/DCP/dcp_test1/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index 2fc53fb1..2fc53fb1 100644
--- a/test/ref/DCP/dcp_test1/81fb54df-e1bf-4647-8788-ea7ba154375b_cpl.xml
+++ b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
diff --git a/test/ref/DCP/dcp_test1/18be072e-5a0f-44e1-b2eb-c8a52ae12789_pkl.xml b/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml
index 3e64ae8f..3e64ae8f 100644
--- a/test/ref/DCP/dcp_test1/18be072e-5a0f-44e1-b2eb-c8a52ae12789_pkl.xml
+++ b/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml