commit c91fc337dd4c965a2c8f0d402cd1d8c8a4af10c2
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Feb 10 17:44:41 2017 -0800
committer Yukai Tu <ytu@cs.ucla.edu> Thu Mar 16 16:52:04 2017 -0700
tree e46e602611cb52e62ccf3f4ed62b5f7fd0a0e4dd
parent 729b289338e57c24f624075d616083e2e7740578

object-manager+fetcher: Use segmentNumber for file segments

Change-Id: Ib78ee034dba2a1ea9d140b091181694049655bb9

src/dispatcher.cpp

diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp
index cae79a2..d94c027 100644
--- a/src/dispatcher.cpp
+++ b/src/dispatcher.cpp
@@ -79,7 +79,7 @@
   m_actionFetcher =
     make_shared<FetchManager>(m_face, bind(&SyncLog::LookupLocator, &*m_syncLog, _1),
                               Name(BROADCAST_DOMAIN), // no appname suffix now
-                              3,
+                              3, false,
                               bind(&Dispatcher::Did_FetchManager_ActionFetch, this, _1, _2, _3, _4),
                               FetchManager::FinishCallback(), actionTaskDb);
 
@@ -87,7 +87,7 @@
   m_fileFetcher =
     make_shared<FetchManager>(m_face, bind(&SyncLog::LookupLocator, &*m_syncLog, _1),
                               Name(BROADCAST_DOMAIN), // no appname suffix now
-                              3, bind(&Dispatcher::Did_FetchManager_FileSegmentFetch, this, _1, _2,
+                              3, true, bind(&Dispatcher::Did_FetchManager_FileSegmentFetch, this, _1, _2,
                                       _3, _4),
                               bind(&Dispatcher::Did_FetchManager_FileFetchComplete, this, _1, _2),
                               fileTaskDb);
@@ -329,8 +329,7 @@
 
     Name fileNameBase = Name("/");
     fileNameBase.append(deviceName).append(CHRONOSHARE_APP).append("file");
-    //      fileNameBase.append(name::Component(hash));
-    fileNameBase.appendImplicitSha256Digest(hash);
+    fileNameBase.append(name::Component(hash));
 
     std::string hashStr = toHex(*hash);
     if (ObjectDb::doesExist(m_rootDir / ".chronoshare", deviceName, hashStr)) {