diff --git a/libretroshare/src/file_sharing/p3filelists.cc b/libretroshare/src/file_sharing/p3filelists.cc index c8b5749d9..8da837bc6 100644 --- a/libretroshare/src/file_sharing/p3filelists.cc +++ b/libretroshare/src/file_sharing/p3filelists.cc @@ -1019,8 +1019,8 @@ void p3FileDatabase::getExtraFilesDirDetails(void *ref,DirectoryStorage::EntryIn d.hash = f.hash; d.count = f.size; - d.max_mtime = time(NULL); - d.mtime = time(NULL); + d.max_mtime = 0; // this is irrelevant + d.mtime = 0; // this is irrelevant d.name = f.path; // so that the UI shows the complete path, since the parent directory is not really a directory. d.path = f.path; d.ref = ref ; diff --git a/libretroshare/src/ft/ftextralist.cc b/libretroshare/src/ft/ftextralist.cc index d15a848bb..2c8152d3e 100644 --- a/libretroshare/src/ft/ftextralist.cc +++ b/libretroshare/src/ft/ftextralist.cc @@ -113,8 +113,7 @@ void ftExtraList::hashAFile() /* hash it! */ std::string name, hash; //uint64_t size; - if (RsDirUtil::hashFile(details.info.path, details.info.fname, - details.info.hash, details.info.size)) + if (RsDirUtil::hashFile(details.info.path, details.info.fname, details.info.hash, details.info.size)) { RS_STACK_MUTEX(extMutex); diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp index 2d9820690..e0da77b2e 100644 --- a/retroshare-gui/src/gui/RemoteDirModel.cpp +++ b/retroshare-gui/src/gui/RemoteDirModel.cpp @@ -470,8 +470,10 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const if(RemoteMode) rsFiles->getSharedDirStatistics(details.id,stats) ; - else + else if(details.id == rsPeers->getOwnId()) rsFiles->getSharedDirStatistics(rsPeers->getOwnId(),stats) ; + else + stats.total_number_of_files = details.count; if(stats.total_number_of_files > 0) { @@ -487,8 +489,10 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const if(RemoteMode) rsFiles->getSharedDirStatistics(details.id,stats) ; - else + else if(details.id == rsPeers->getOwnId()) rsFiles->getSharedDirStatistics(rsPeers->getOwnId(),stats) ; + else + return QString(); if(stats.total_shared_size > 0) return misc::friendlyUnit(stats.total_shared_size) ; @@ -498,6 +502,8 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const case COLUMN_AGE: if(!isNewerThanEpoque(details.max_mtime)) return QString(); + else if(details.id != rsPeers->getOwnId()) + return QString(); else return misc::timeRelativeToNow(details.max_mtime); @@ -516,7 +522,7 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const case COLUMN_SIZE: return misc::friendlyUnit(details.count); case COLUMN_AGE: - return misc::timeRelativeToNow(details.max_mtime); + return (details.type == DIR_TYPE_FILE)?(misc::timeRelativeToNow(details.max_mtime)):QString(); case COLUMN_FRIEND_ACCESS: return QVariant(); case COLUMN_WN_VISU_DIR: @@ -795,7 +801,7 @@ QVariant RetroshareDirModel::data(const QModelIndex &index, int role) const return decorationRole(details,coln) ; if(role == Qt::ToolTipRole) - if(!isNewerThanEpoque(details.max_mtime)) + if(!isNewerThanEpoque(details.max_mtime) && details.type == DIR_TYPE_PERSON) return tr("This node hasn't sent any directory information yet.") ; /*****************