commit 67133bfbf3464a74ff9c276826e2e72fe157acdb
author Mickey Sweatt <mickeysweatt@engineering.ucla.edu> Mon Apr 25 12:37:35 2016 -0700
committer Mickey Sweatt <mickeysweatt@engineering.ucla.edu> Tue Apr 26 14:32:47 2016 -0700
tree 5e705d513f9ffc8b1b4df7aa19d4be118d34d9fc
parent f91ced4e5bbdf93d1c05c419da355fc5b0ee9818

Minor bug fixes to allow basic function function of the application

Change-Id: I15e1e093451f199c569457058ed17389c32d12cf

src/sequential-data-fetcher.cpp

diff --git a/src/sequential-data-fetcher.cpp b/src/sequential-data-fetcher.cpp
index 5873374..06b3f02 100644
--- a/src/sequential-data-fetcher.cpp
+++ b/src/sequential-data-fetcher.cpp
@@ -66,8 +66,10 @@
 {
   std::vector<ndn::Name> returnedNames;
   returnedNames = m_manager->downloadTorrentFile(".appdata/torrent_files/");
-  std::cout << "Torrent File Received: "
-            << m_torrentFileName.getSubName(0, m_torrentFileName.size() - 1) << std::endl;
+  if (!returnedNames.empty() && IoUtil::NAME_TYPE::FILE_MANIFEST == IoUtil::findType(returnedNames[0])) {
+    std::cout << "Torrent File Received: "
+              << m_torrentFileName.getSubName(0, m_torrentFileName.size() - 1) << std::endl;
+  }
   return returnedNames;
 }
 
@@ -91,8 +93,8 @@
     m_manager->download_data_packet(*i,
                               bind(&SequentialDataFetcher::onDataPacketReceived, this, _1),
                               bind(&SequentialDataFetcher::onDataRetrievalFailure, this, _1, _2));
-    m_manager->processEvents();
   }
+  m_manager->processEvents();
 }
 
 void
@@ -134,26 +136,26 @@
 SequentialDataFetcher::onDataRetrievalFailure(const ndn::Interest& interest,
                                               const std::string& errorCode)
 {
-  std::cerr << "Data Retrieval Failed: " << interest.getName() << std::endl;
+  // std::cerr << "Data Retrieval Failed: " << interest.getName() << std::endl;
 
   // Data retrieval failure
   uint32_t nameType = IoUtil::findType(interest.getName());
   if (nameType == IoUtil::TORRENT_FILE) {
     // this should never happen
-    std::cerr << "Torrent File Segment Downloading Failed: " << interest.getName();
+    // std::cerr << "Torrent File Segment Downloading Failed: " << interest.getName();
     this->downloadTorrentFile();
   }
   else if (nameType == IoUtil::FILE_MANIFEST) {
-    std::cerr << "Manifest File Segment Downloading Failed: " << interest.getName();
+    // std::cerr << "Manifest File Segment Downloading Failed: " << interest.getName();
     this->downloadManifestFiles({ interest.getName() });
   }
   else if (nameType == IoUtil::DATA_PACKET) {
-    std::cerr << "Data Packet Downloading Failed: " << interest.getName();
+    // std::cerr << "Data Packet Downloading Failed: " << interest.getName();
     this->downloadPackets({ interest.getName() });
   }
   else {
     // This should never happen
-    std::cerr << "Unknown Packet Type Downloading Failed: " << interest.getName();
+    // std::cerr << "Unknown Packet Type Downloading Failed: " << interest.getName();
   }
 }