Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 17:09:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed a few bugs in directory parsing

Browse Source
This commit is contained in:
mr-alice 2016-07-28 09:29:15 +02:00
parent 463f21c85c
commit 2aac88464d
3 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libretroshare/src/file_sharing/directory_storage.cc
View File

@ -32,7 +32,7 @@ class InternalFileHierarchyStorage
class FileEntry: public FileStorageNode class FileEntry: public FileStorageNode
{ {
public: public:
FileEntry(const std::string& name) : file_name(name) {} FileEntry(const std::string& name,uint64_t size,time_t modtime) : file_name(name),file_size(size),file_modtime(modtime) {}
virtual uint32_t type() const { return FileStorageNode::TYPE_FILE ; } virtual uint32_t type() const { return FileStorageNode::TYPE_FILE ; }
virtual ~FileEntry() {} virtual ~FileEntry() {}
@ -131,7 +131,7 @@ class InternalFileHierarchyStorage
return true; return true;
} }
bool updateSubFilesList(const DirectoryStorage::EntryIndex& indx,const std::set<std::string>& subfiles,std::set<std::string>& new_files) bool updateSubFilesList(const DirectoryStorage::EntryIndex& indx,const std::map<std::string,DirectoryStorage::FileTS>& subfiles,std::map<std::string,DirectoryStorage::FileTS>& new_files)
{ {
if(!checkIndex(indx,FileStorageNode::TYPE_DIR)) if(!checkIndex(indx,FileStorageNode::TYPE_DIR))
return false; return false;
@ -139,22 +139,33 @@ class InternalFileHierarchyStorage
DirEntry& d(*static_cast<DirEntry*>(mNodes[indx])) ; DirEntry& d(*static_cast<DirEntry*>(mNodes[indx])) ;
new_files = subfiles ; new_files = subfiles ;
// remove from new_files the ones that already exist and have a modf time that is not older.
for(uint32_t i=0;i<d.subfiles.size();) for(uint32_t i=0;i<d.subfiles.size();)
if(subfiles.find(static_cast<FileEntry*>(mNodes[d.subfiles[i]])->file_name) == subfiles.end()) {
FileEntry& f(*static_cast<FileEntry*>(mNodes[d.subfiles[i]])) ;
std::map<std::string,DirectoryStorage::FileTS>::const_iterator it = subfiles.find(f.file_name) ;
if(it == subfiles.end()) // file does not exist anymore => delete
{ {
d.subfiles[i] = d.subfiles[d.subfiles.size()-1] ; d.subfiles[i] = d.subfiles[d.subfiles.size()-1] ;
d.subfiles.pop_back(); d.subfiles.pop_back();
continue;
} }
if(it->second.modtime != f.file_modtime || it->second.size != f.file_size) // file is newer and/or has different size
f.file_hash.clear(); // hash needs recomputing
else else
{ new_files.erase(f.file_name) ;
new_files.erase(static_cast<FileEntry*>(mNodes[d.subfiles[i]])->file_name) ;
++i; ++i;
} }
for(std::set<std::string>::const_iterator it(new_files.begin());it!=new_files.end();++it) for(std::map<std::string,DirectoryStorage::FileTS>::const_iterator it(new_files.begin());it!=new_files.end();++it)
{ {
d.subfiles.push_back(mNodes.size()) ; d.subfiles.push_back(mNodes.size()) ;
mNodes.push_back(new FileEntry(*it)); mNodes.push_back(new FileEntry(it->first,it->second.size,it->second.modtime));
} }
return true; return true;
} }
@ -166,7 +177,7 @@ class InternalFileHierarchyStorage
static_cast<FileEntry*>(mNodes[file_index])->file_hash = hash ; static_cast<FileEntry*>(mNodes[file_index])->file_hash = hash ;
return true; return true;
} }
bool updateFile(const DirectoryStorage::EntryIndex& file_index,const RsFileHash& hash, const std::string& fname,uint64_t size, const uint32_t modf_time) bool updateFile(const DirectoryStorage::EntryIndex& file_index,const RsFileHash& hash, const std::string& fname,uint64_t size, const time_t modf_time)
{ {
if(!checkIndex(file_index,FileStorageNode::TYPE_FILE)) if(!checkIndex(file_index,FileStorageNode::TYPE_FILE))
return false; return false;
@ -273,15 +284,15 @@ private:
std::string indent(2*depth,' '); std::string indent(2*depth,' ');
DirEntry& d(*static_cast<DirEntry*>(mNodes[node])); DirEntry& d(*static_cast<DirEntry*>(mNodes[node]));
std::cerr << indent << d.dir_name << std::endl; std::cerr << indent << "dir:" << d.dir_name << std::endl;
for(int i=0;i<d.subdirs.size();++i) for(int i=0;i<d.subdirs.size();++i)
recursPrint(depth+1,d.subdirs[i]) ; recursPrint(depth+1,d.subdirs[i]) ;
for(int i=0;i<d.subfiles.size();++i) for(int i=0;i<d.subfiles.size();++i)
{ {
FileEntry& f(*static_cast<FileEntry*>(mNodes[i])); FileEntry& f(*static_cast<FileEntry*>(mNodes[d.subfiles[i]]));
std::cerr << indent << " " << f.file_hash << " " << f.file_modtime << " " << f.file_name << std::endl; std::cerr << indent << " hash:" << f.file_hash << " ts:" << std::fill(8) << (uint64_t)f.file_modtime << " " << f.file_size << " " << f.file_name << std::endl;
} }
} }
@ -369,7 +380,7 @@ bool DirectoryStorage::updateSubDirectoryList(const EntryIndex& indx,const std::
RS_STACK_MUTEX(mDirStorageMtx) ; RS_STACK_MUTEX(mDirStorageMtx) ;
return mFileHierarchy->updateSubDirectoryList(indx,subdirs) ; return mFileHierarchy->updateSubDirectoryList(indx,subdirs) ;
} }
bool DirectoryStorage::updateSubFilesList(const EntryIndex& indx,const std::set<std::string>& subfiles,std::set<std::string>& new_files) bool DirectoryStorage::updateSubFilesList(const EntryIndex& indx,const std::map<std::string,FileTS>& subfiles,std::map<std::string,FileTS>& new_files)
{ {
RS_STACK_MUTEX(mDirStorageMtx) ; RS_STACK_MUTEX(mDirStorageMtx) ;
return mFileHierarchy->updateSubFilesList(indx,subfiles,new_files) ; return mFileHierarchy->updateSubFilesList(indx,subfiles,new_files) ;

8
libretroshare/src/file_sharing/directory_storage.h
View File

@ -83,10 +83,16 @@ class DirectoryStorage
InternalFileHierarchyStorage *mStorage ; InternalFileHierarchyStorage *mStorage ;
}; };
struct FileTS
{
uint64_t size ;
time_t modtime;
};
EntryIndex root() const ; // returns the index of the root directory entry. EntryIndex root() const ; // returns the index of the root directory entry.
bool updateSubDirectoryList(const EntryIndex& indx,const std::set<std::string>& subdirs) ; bool updateSubDirectoryList(const EntryIndex& indx,const std::set<std::string>& subdirs) ;
bool updateSubFilesList(const EntryIndex& indx,const std::set<std::string>& subfiles,std::set<std::string>& new_files) ; bool updateSubFilesList(const EntryIndex& indx, const std::map<std::string, FileTS> &subfiles, std::map<std::string, FileTS> &new_files) ;
bool removeDirectory(const EntryIndex& indx) ; bool removeDirectory(const EntryIndex& indx) ;
bool updateFile(const EntryIndex& index,const RsFileHash& hash, const std::string& fname, uint64_t size, time_t modf_time) ; bool updateFile(const EntryIndex& index,const RsFileHash& hash, const std::string& fname, uint64_t size, time_t modf_time) ;

8
libretroshare/src/file_sharing/directory_updater.cc
View File

@ -66,21 +66,21 @@ void LocalDirectoryUpdater::recursUpdateSharedDir(const std::string& cumulated_p
// collect subdirs and subfiles // collect subdirs and subfiles
std::set<std::string> subfiles ; std::map<std::string,DirectoryStorage::FileTS> subfiles ;
std::set<std::string> subdirs ; std::set<std::string> subdirs ;
for(;dirIt.isValid();dirIt.next()) for(;dirIt.isValid();dirIt.next())
{ {
switch(dirIt.file_type()) switch(dirIt.file_type())
{ {
case librs::util::FolderIterator::TYPE_FILE: subfiles.insert(dirIt.file_name()) ; case librs::util::FolderIterator::TYPE_FILE: subfiles[dirIt.file_name()].modtime = dirIt.file_modtime() ;
subfiles[dirIt.file_name()].size = dirIt.file_size();
std::cerr << " adding sub-file \"" << dirIt.file_name() << "\"" << std::endl; std::cerr << " adding sub-file \"" << dirIt.file_name() << "\"" << std::endl;
break; break;
case librs::util::FolderIterator::TYPE_DIR: subdirs.insert(dirIt.file_name()) ; case librs::util::FolderIterator::TYPE_DIR: subdirs.insert(dirIt.file_name()) ;
std::cerr << " adding sub-dir \"" << dirIt.file_name() << "\"" << std::endl; std::cerr << " adding sub-dir \"" << dirIt.file_name() << "\"" << std::endl;
break; break;
default: default:
std::cerr << "(EE) Dir entry of unknown type with path \"" << cumulated_path << "/" << dirIt.file_name() << "\"" << std::endl; std::cerr << "(EE) Dir entry of unknown type with path \"" << cumulated_path << "/" << dirIt.file_name() << "\"" << std::endl;
} }
@ -89,7 +89,7 @@ void LocalDirectoryUpdater::recursUpdateSharedDir(const std::string& cumulated_p
mSharedDirectories->updateSubDirectoryList(indx,subdirs) ; mSharedDirectories->updateSubDirectoryList(indx,subdirs) ;
std::set<std::string> new_files ; std::map<std::string,DirectoryStorage::FileTS> new_files ;
mSharedDirectories->updateSubFilesList(indx,subfiles,new_files) ; mSharedDirectories->updateSubFilesList(indx,subfiles,new_files) ;
// now go through list of subfiles and request the hash to hashcache // now go through list of subfiles and request the hash to hashcache