commit be4b51922cb0bcd3a94154735d66d683ae4a15c5
author Mickey Sweatt <mickeysweatt@engineering.ucla.edu> Mon Mar 28 16:46:34 2016 -0700
committer Mickey Sweatt <mickeysweatt@engineering.ucla.edu> Tue Mar 29 18:52:48 2016 -0700
tree f9aef0a7b6cd3772176a70e9f6cc391848963821
parent 22f51c5b2ed8d1eb0d9a7d43c29b780840cf77e9

Fixed bug of TorrentFile catalog not using full Names and fixed bug in FileManifest and torrent file inconsistency in manifest names.

Change-Id: I2ccb98c8d336cc69f0949a3d46796b807ed185b1

src/file-manifest.cpp

diff --git a/src/file-manifest.cpp b/src/file-manifest.cpp
index 40726e6..ca17148 100644
--- a/src/file-manifest.cpp
+++ b/src/file-manifest.cpp
@@ -63,7 +63,7 @@
                                               manifestPrefix.toUri() + " and "     +
                                               full_path.toUri()));
   }
-  ndn::Name manifestName;
+  ndn::Name manifestName = "/NTORRENT/";
   // Rebuild the name to be the suffix from the matching component
   for (auto it = (name_component_iter.base() - 1); full_path.end() != it; ++it) {
     manifestName.append(*it);
@@ -72,7 +72,7 @@
 }
 
 static std::vector<Data>
-packetize_file(const fs::path& filePath,
+packetize_file(const fs::path&  filePath,
                const ndn::Name& commonPrefix,
                size_t dataPacketSize,
                size_t subManifestSize,
@@ -111,7 +111,6 @@
     fs.read(&file_bytes.front(), buffer_size);
     auto read_size = fs.gcount();
     if (fs.bad() || read_size < 0) {
-
       BOOST_THROW_EXCEPTION(FileManifest::Error("IO Error when reading" + filePath.string()));
     }
     bytes_read += read_size;
@@ -174,14 +173,11 @@
   manifests.reserve(numSubManifests);
   for (auto subManifestNum : irange<size_t>(0, numSubManifests)) {
     auto curr_manifest_name = manifestName;
-    curr_manifest_name.append("manifest" + boost::lexical_cast<std::string>(subManifestNum));
     // append the packet number
     curr_manifest_name.appendSequenceNumber(manifests.size());
-    auto subManifestPrefix = manifestPrefix;
-    subManifestPrefix.appendNumber(subManifestNum);
     FileManifest curr_manifest(curr_manifest_name, dataPacketSize, manifestPrefix);
     auto packets = packetize_file(path,
-                                  subManifestPrefix,
+                                  curr_manifest_name,
                                   dataPacketSize,
                                   subManifestSize,
                                   subManifestNum);

src/torrent-file.cpp

diff --git a/src/torrent-file.cpp b/src/torrent-file.cpp
index c230401..dafeb41 100644
--- a/src/torrent-file.cpp
+++ b/src/torrent-file.cpp
@@ -275,7 +275,7 @@
       currentTorrentName.appendSequenceNumber(static_cast<int>(manifestFileCounter));
       currentTorrentFile = TorrentFile(currentTorrentName, commonPrefix, {});
     }
-    currentTorrentFile.insert(currentManifestPair.first[0].getName());
+    currentTorrentFile.insert(currentManifestPair.first[0].getFullName());
     currentManifestPair.first.shrink_to_fit();
     currentManifestPair.second.shrink_to_fit();
     manifestPairs.push_back(currentManifestPair);