diff --git a/libretroshare/src/file_sharing/directory_storage.cc b/libretroshare/src/file_sharing/directory_storage.cc index b574c4a2a..c4a46f4fb 100644 --- a/libretroshare/src/file_sharing/directory_storage.cc +++ b/libretroshare/src/file_sharing/directory_storage.cc @@ -35,7 +35,7 @@ # include "deep_search/filesindex.hpp" #endif // def RS_DEEP_FILES_INDEX -#define DEBUG_REMOTE_DIRECTORY_STORAGE 1 +//#define DEBUG_REMOTE_DIRECTORY_STORAGE 1 /******************************************************************************************************************/ /* Iterators */ @@ -235,7 +235,7 @@ bool DirectoryStorage::extractData(const EntryIndex& indx,DirDetails& d) d.type = DIR_TYPE_DIR; d.hash.clear() ; - d.count = dir_entry->dir_cumulated_size;//dir_entry->subdirs.size() + dir_entry->subfiles.size(); + d.size = dir_entry->dir_cumulated_size;//dir_entry->subdirs.size() + dir_entry->subfiles.size(); d.max_mtime = dir_entry->dir_most_recent_time ; d.mtime = dir_entry->dir_modtime ; d.name = dir_entry->dir_name; @@ -253,7 +253,7 @@ bool DirectoryStorage::extractData(const EntryIndex& indx,DirDetails& d) const InternalFileHierarchyStorage::FileEntry *file_entry = mFileHierarchy->getFileEntry(indx) ; d.type = DIR_TYPE_FILE; - d.count = file_entry->file_size; + d.size = file_entry->file_size; d.max_mtime = file_entry->file_modtime ; d.name = file_entry->file_name; d.hash = file_entry->file_hash; @@ -587,7 +587,7 @@ bool LocalDirectoryStorage::getFileInfo(DirectoryStorage::EntryIndex i,FileInfo& info.path = d.path + "/" + d.name; info.fname = d.name; info.hash = d.hash; - info.size = d.count; + info.size = d.size; // all this stuff below is not useful in this case. diff --git a/libretroshare/src/file_sharing/file_tree.cc b/libretroshare/src/file_sharing/file_tree.cc index ad34501e3..d34dc166b 100644 --- a/libretroshare/src/file_sharing/file_tree.cc +++ b/libretroshare/src/file_sharing/file_tree.cc @@ -138,7 +138,7 @@ void RsFileTree::recurs_buildFileTree( { FileData f ; f.name = dd2.name ; - f.size = dd2.count ; + f.size = dd2.size ; f.hash = dd2.hash ; ft.mDirs[index].subfiles.push_back(ft.mFiles.size()) ; @@ -186,7 +186,7 @@ std::unique_ptr RsFileTree::fromDirDetails( if(dd.type == DIR_TYPE_FILE) { FileData fd; - fd.name = dd.name; fd.hash = dd.hash; fd.size = dd.count; + fd.name = dd.name; fd.hash = dd.hash; fd.size = dd.size; ft->mFiles.push_back(fd); ft->mTotalFiles = 1; ft->mTotalSize = fd.size; diff --git a/libretroshare/src/file_sharing/p3filelists.cc b/libretroshare/src/file_sharing/p3filelists.cc index 55a28dec6..6eb3899e2 100644 --- a/libretroshare/src/file_sharing/p3filelists.cc +++ b/libretroshare/src/file_sharing/p3filelists.cc @@ -1004,7 +1004,7 @@ void p3FileDatabase::getExtraFilesDirDetails(void *ref,DirectoryStorage::EntryIn d.prow = 0;//fi-1 ; d.type = DIR_TYPE_PERSON; d.hash.clear() ; - d.count = mExtraFilesCache.size(); + d.size = mExtraFilesCache.size(); d.max_mtime = time(NULL); d.mtime = time(NULL); d.name = "[Extra List]"; @@ -1029,7 +1029,7 @@ void p3FileDatabase::getExtraFilesDirDetails(void *ref,DirectoryStorage::EntryIn FileInfo& f(mExtraFilesCache[(int)e-1]) ; d.hash = f.hash; - d.count = f.size; + d.size = f.size; 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. @@ -1116,7 +1116,7 @@ int p3FileDatabase::RequestDirDetails(void *ref, DirDetails& d, FileSearchFlags d.children.push_back(stub); } - d.count = d.children.size(); + d.size = 0; // non documented #ifdef DEBUG_FILE_HIERARCHY P3FILELISTS_DEBUG() << "ExtractData: ref=" << ref << ", flags=" << flags << " : returning this: " << std::endl; diff --git a/libretroshare/src/ft/ftserver.cc b/libretroshare/src/ft/ftserver.cc index f5442a620..8f13c91aa 100644 --- a/libretroshare/src/ft/ftserver.cc +++ b/libretroshare/src/ft/ftserver.cc @@ -2283,7 +2283,7 @@ std::error_condition ftServer::exportFileLink( tDirDet.type = DIR_TYPE_FILE; tDirDet.name = fileName; tDirDet.hash = fileHash; - tDirDet.count = fileSize; + tDirDet.size = fileSize; return dirDetailsToLink(link, tDirDet, fragSneak, baseUrl); } @@ -2308,7 +2308,7 @@ std::error_condition ftServer::parseFilesLink( dt.name = *tUrl.getQueryV("name"); try { - dt.count = std::stoull(*tUrl.getQueryV("size")); + dt.size = std::stoull(*tUrl.getQueryV("size")); std::unique_ptr ft; if( !dt.hash.isNull() && (ft = RsFileTree::fromDirDetails(dt, true)) ) diff --git a/libretroshare/src/retroshare/rstypes.h b/libretroshare/src/retroshare/rstypes.h index 59474c99c..97d97f565 100644 --- a/libretroshare/src/retroshare/rstypes.h +++ b/libretroshare/src/retroshare/rstypes.h @@ -300,7 +300,7 @@ struct DirStub : RsSerializable struct DirDetails : RsSerializable { DirDetails() : parent(nullptr), prow(0), ref(nullptr), - type(DIR_TYPE_UNKNOWN), count(0), mtime(0), max_mtime(0) {} + type(DIR_TYPE_UNKNOWN), size(0), mtime(0), max_mtime(0) {} /* G10h4ck do we still need to keep this as void* instead of uint64_t for @@ -318,7 +318,7 @@ struct DirDetails : RsSerializable std::string name; RsFileHash hash; std::string path; // full path of the parent directory, when it is a file; full path of the dir otherwise. - uint64_t count; + uint64_t size; // total size of directory, or size of the file. uint32_t mtime; // file/directory modification time, according to what the system reports FileStorageFlags flags; uint32_t max_mtime ; // maximum modification time of the whole hierarchy below. @@ -347,7 +347,7 @@ struct DirDetails : RsSerializable RS_SERIAL_PROCESS(name); RS_SERIAL_PROCESS(hash); RS_SERIAL_PROCESS(path); - RS_SERIAL_PROCESS(count); + RS_SERIAL_PROCESS(size); RS_SERIAL_PROCESS(mtime); RS_SERIAL_PROCESS(flags); RS_SERIAL_PROCESS(max_mtime); diff --git a/libretroshare/src/turtle/p3turtle.cc b/libretroshare/src/turtle/p3turtle.cc index 677b282cd..2b7148faf 100644 --- a/libretroshare/src/turtle/p3turtle.cc +++ b/libretroshare/src/turtle/p3turtle.cc @@ -1984,7 +1984,7 @@ void RsTurtleStringSearchRequestItem::search(std::list& result) TurtleFileInfo i ; i.hash = it->hash ; - i.size = it->count ; + i.size = it->size ; i.name = it->name ; result.push_back(i) ; @@ -2022,7 +2022,7 @@ void RsTurtleRegExpSearchRequestItem::search(std::list& result) } TurtleFileInfo i ; i.hash = it->hash ; - i.size = it->count ; + i.size = it->size ; i.name = it->name ; result.push_back(i) ; diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp index 61c4bb5c2..806743fc8 100644 --- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp @@ -479,7 +479,7 @@ void SearchDialog::collCreate() DirDetails details; details.name = name; details.hash = hash; - details.count = count; + details.size = count; details.type = DIR_TYPE_FILE; dirVec.push_back(details); @@ -1010,8 +1010,8 @@ void SearchDialog::insertDirectory(const QString &txt, qulonglong searchId, cons child->setText(SR_NAME_COL, QString::fromUtf8(dir.name.c_str())); child->setText(SR_HASH_COL, QString::fromStdString(dir.hash.toStdString())); - child->setText(SR_SIZE_COL, QString::number(dir.count)); - child->setData(SR_SIZE_COL, ROLE_SORT, (qulonglong) dir.count); + child->setText(SR_SIZE_COL, QString::number(dir.size)); + child->setData(SR_SIZE_COL, ROLE_SORT, (qulonglong) dir.size); child->setText(SR_AGE_COL, QString::number(dir.mtime)); child->setData(SR_AGE_COL, ROLE_SORT, dir.mtime); child->setTextAlignment( SR_SIZE_COL, Qt::AlignRight ); @@ -1036,8 +1036,8 @@ void SearchDialog::insertDirectory(const QString &txt, qulonglong searchId, cons child->setIcon(SR_NAME_COL, QIcon(IMAGE_DIRECTORY)); child->setText(SR_NAME_COL, QString::fromUtf8(dir.name.c_str())); child->setText(SR_HASH_COL, QString::fromStdString(dir.hash.toStdString())); - child->setText(SR_SIZE_COL, QString::number(dir.count)); - child->setData(SR_SIZE_COL, ROLE_SORT, (qulonglong) dir.count); + child->setText(SR_SIZE_COL, QString::number(dir.size)); + child->setData(SR_SIZE_COL, ROLE_SORT, (qulonglong) dir.size); child->setText(SR_AGE_COL, QString::number(dir.mtime)); child->setData(SR_AGE_COL, ROLE_SORT, dir.mtime); child->setTextAlignment( SR_SIZE_COL, Qt::AlignRight ); @@ -1105,8 +1105,8 @@ void SearchDialog::insertDirectory(const QString &txt, qulonglong searchId, cons child->setIcon(SR_NAME_COL, QIcon(IMAGE_DIRECTORY)); child->setText(SR_NAME_COL, QString::fromUtf8(dir.name.c_str())); child->setText(SR_HASH_COL, QString::fromStdString(dir.hash.toStdString())); - child->setText(SR_SIZE_COL, QString::number(dir.count)); - child->setData(SR_SIZE_COL, ROLE_SORT, (qulonglong) dir.count); + child->setText(SR_SIZE_COL, QString::number(dir.size)); + child->setData(SR_SIZE_COL, ROLE_SORT, (qulonglong) dir.size); child->setText(SR_AGE_COL, QString::number(dir.max_mtime)); child->setData(SR_AGE_COL, ROLE_SORT, dir.max_mtime); child->setTextAlignment( SR_SIZE_COL, Qt::AlignRight ); @@ -1389,7 +1389,7 @@ void SearchDialog::resultsToTree(const QString& txt,qulonglong searchId, const s fd.name = it->name; fd.hash = it->hash; fd.path = it->path; - fd.size = it->count; + fd.size = it->size; fd.age = it->mtime; fd.rank = 0; diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp index d33010bc3..974a2e5b1 100644 --- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp @@ -655,7 +655,7 @@ void SharedFilesDialog::copyLinks(const QModelIndexList& lst, bool remote,QList< } else name = QString::fromUtf8(details.name.c_str()); - RetroShareLink link = RetroShareLink::createFile(name, details.count, details.hash.toStdString().c_str()); + RetroShareLink link = RetroShareLink::createFile(name, details.size, details.hash.toStdString().c_str()); if (link.valid()) { urls.push_back(link) ; } diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp index cc2ef8938..22c5cea91 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp @@ -2468,7 +2468,7 @@ void TransfersDialog::collCreate() DirDetails details; details.name = info.fname; details.hash = info.hash; - details.count = info.size; + details.size = info.size; details.type = DIR_TYPE_FILE; dirVec.push_back(details); diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp index a5f4db8af..06eb809cd 100644 --- a/retroshare-gui/src/gui/RemoteDirModel.cpp +++ b/retroshare-gui/src/gui/RemoteDirModel.cpp @@ -202,7 +202,7 @@ bool TreeStyle_RDM::hasChildren(const QModelIndex &parent) const } /* PERSON/DIR*/ #ifdef RDM_DEBUG - std::cerr << "lookup PER/DIR #" << details.count; + std::cerr << "lookup PER/DIR #" << details.size; std::cerr << std::endl; #endif return (details.children.size() > 0); /* do we have children? */ @@ -261,7 +261,7 @@ int TreeStyle_RDM::rowCount(const QModelIndex &parent) const /* else PERSON/DIR*/ #ifdef RDM_DEBUG - std::cerr << "lookup PER/DIR #" << details.count; + std::cerr << "lookup PER/DIR #" << details.size; std::cerr << std::endl; #endif if ((details.type == DIR_TYPE_ROOT) && !_showEmpty && RemoteMode) @@ -551,7 +551,7 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const case COLUMN_FILENB: return QVariant(); case COLUMN_SIZE: - return misc::friendlyUnit(details.count); + return misc::friendlyUnit(details.size); case COLUMN_AGE: { if(details.type == DIR_TYPE_FILE) @@ -589,7 +589,7 @@ QVariant TreeStyle_RDM::displayRole(const DirDetails& details,int coln) const } return QString::number(details.children.size()) + " " + tr("File"); case COLUMN_SIZE: - return misc::friendlyUnit(details.count); + return misc::friendlyUnit(details.size); case COLUMN_AGE: return misc::timeRelativeToNow(details.max_mtime); case COLUMN_FRIEND_ACCESS: @@ -651,7 +651,7 @@ QVariant FlatStyle_RDM::displayRole(const DirDetails& details,int coln) const { case COLUMN_NAME: return QString::fromUtf8(details.name.c_str()); case COLUMN_FILENB: return QString(); - case COLUMN_SIZE: return misc::friendlyUnit(details.count); + case COLUMN_SIZE: return misc::friendlyUnit(details.size); case COLUMN_AGE: return misc::timeRelativeToNow(details.max_mtime); case COLUMN_FRIEND_ACCESS: return QString::fromUtf8(rsPeers->getPeerName(details.id).c_str()); case COLUMN_WN_VISU_DIR: return computeDirectoryPath(details); @@ -711,7 +711,7 @@ QVariant TreeStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails& case COLUMN_FILENB: return (qulonglong) 0; case COLUMN_SIZE: - return (qulonglong) details.count; + return (qulonglong) details.size; case COLUMN_AGE: return details.max_mtime; case COLUMN_FRIEND_ACCESS: @@ -761,7 +761,7 @@ QVariant FlatStyle_RDM::sortRole(const QModelIndex& /*index*/,const DirDetails& { case COLUMN_NAME: return QString::fromUtf8(details.name.c_str()); case COLUMN_FILENB: return (qulonglong) 0; - case COLUMN_SIZE: return (qulonglong) details.count; + case COLUMN_SIZE: return (qulonglong) details.size; case COLUMN_AGE: return details.max_mtime; case COLUMN_FRIEND_ACCESS: return QString::fromUtf8(rsPeers->getPeerName(details.id).c_str()); case COLUMN_WN_VISU_DIR: { @@ -1286,7 +1286,7 @@ void RetroshareDirModel::downloadSelected(const QModelIndexList &list,bool inter std::cerr << std::endl; std::list srcIds; srcIds.push_back(details.id); - rsFiles -> FileRequest(details.name, details.hash, details.count, "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds); + rsFiles -> FileRequest(details.name, details.hash, details.size, "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds); } /* if it is a dir, copy all files included*/ else if (details.type == DIR_TYPE_DIR) @@ -1307,7 +1307,7 @@ void RetroshareDirModel::downloadDirectory(const DirDetails & dirDetails, int pr QString cleanPath = QDir::cleanPath(QString::fromUtf8(rsFiles->getDownloadDirectory().c_str()) + "/" + QString::fromUtf8(dirDetails.path.substr(prefixLen).c_str())); srcIds.push_back(dirDetails.id); - rsFiles->FileRequest(dirDetails.name, dirDetails.hash, dirDetails.count, cleanPath.toUtf8().constData(), RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds); + rsFiles->FileRequest(dirDetails.name, dirDetails.hash, dirDetails.size, cleanPath.toUtf8().constData(), RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds); } else if (dirDetails.type & DIR_TYPE_DIR) { @@ -1392,7 +1392,7 @@ void RetroshareDirModel::getFileInfoFromIndexList(const QModelIndexList& list, s std::cerr << "::::::::::::FileRecommend:::: " << std::endl; std::cerr << "Name: " << details.name << std::endl; std::cerr << "Hash: " << details.hash << std::endl; - std::cerr << "Size: " << details.count << std::endl; + std::cerr << "Size: " << details.size << std::endl; std::cerr << "Path: " << details.path << std::endl; #endif // Note: for directories, the returned hash, is the peer id, so if we collect @@ -1590,7 +1590,7 @@ QMimeData * RetroshareDirModel::mimeData ( const QModelIndexList & indexes ) con std::cerr << "::::::::::::FileDrag:::: " << std::endl; std::cerr << "Name: " << details.name << std::endl; std::cerr << "Hash: " << details.hash << std::endl; - std::cerr << "Size: " << details.count << std::endl; + std::cerr << "Size: " << details.size << std::endl; std::cerr << "Path: " << details.path << std::endl; #endif @@ -1611,7 +1611,7 @@ QMimeData * RetroshareDirModel::mimeData ( const QModelIndexList & indexes ) con } drags[details.hash] = details.children.size(); - QString line = QString("%1/%2/%3/").arg(QString::fromUtf8(details.name.c_str()), QString::fromStdString(details.hash.toStdString()), QString::number(details.count)); + QString line = QString("%1/%2/%3/").arg(QString::fromUtf8(details.name.c_str()), QString::fromStdString(details.hash.toStdString()), QString::number(details.size)); if (RemoteMode) { diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp index 6a78a1cf8..c49296503 100644 --- a/retroshare-gui/src/gui/common/RsCollection.cpp +++ b/retroshare-gui/src/gui/common/RsCollection.cpp @@ -221,7 +221,7 @@ void RsCollection::recursAddElements(QDomDocument& doc,const DirDetails& details f.setAttribute(QString("name"),QString::fromUtf8(details.name.c_str())) ; f.setAttribute(QString("sha1"),QString::fromStdString(details.hash.toStdString())) ; - f.setAttribute(QString("size"),QString::number(details.count)) ; + f.setAttribute(QString("size"),QString::number(details.size)) ; e.appendChild(f) ; } diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index aae4814ba..bcfaf9c1f 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -831,7 +831,7 @@ void MessageComposer::setFileList(const std::list& dir_info) FileInfo info ; info.fname = it->name ; info.hash = it->hash ; - info.size = it->count ; + info.size = it->size ; files_info.push_back(info) ; }