pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed empty dirRepository and replaced children-> to getter

Browse Source
This commit is contained in:
Ivan Morozov
2022-08-30 17:43:02 +03:00
parent 0655ef49e5
commit 81b6f331c6
6 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Common/cfcpp/cfstorage.cpp
View File

@ -43,10 +43,10 @@ std::shared_ptr<CFStream> CFStorage::AddStream(const std::wstring& streamName)
try try
{ {
// Add object to Siblings tree // Add object to Siblings tree
children->Insert(dirEntry); getChildren()->Insert(dirEntry);
//... and set the root of the tree as new child of the current item directory entry //... and set the root of the tree as new child of the current item directory entry
dirEntry->setChild(std::dynamic_pointer_cast<IDirectoryEntry>(children->getRoot())->getSid()); dirEntry->setChild(std::dynamic_pointer_cast<IDirectoryEntry>(getChildren()->getRoot())->getSid());
} }
catch (RedBlackTree::RBTreeException &rbex) catch (RedBlackTree::RBTreeException &rbex)
{ {
@ -66,7 +66,7 @@ std::shared_ptr<CFStream> CFStorage::GetStream(const std::wstring& streamName)
RedBlackTree::PIRBNode outDe; RedBlackTree::PIRBNode outDe;
if (children->TryLookup(tmp, outDe) && if (getChildren()->TryLookup(tmp, outDe) &&
((std::static_pointer_cast<IDirectoryEntry>(outDe))->getStgType() == StgType::StgStream)) ((std::static_pointer_cast<IDirectoryEntry>(outDe))->getStgType() == StgType::StgStream))
{ {
return std::shared_ptr<CFStream>(new CFStream(compoundFile, std::static_pointer_cast<IDirectoryEntry>(outDe))); return std::shared_ptr<CFStream>(new CFStream(compoundFile, std::static_pointer_cast<IDirectoryEntry>(outDe)));
@ -90,7 +90,7 @@ bool CFStorage::TryGetStream(const std::wstring& streamName, std::shared_ptr<CFS
RedBlackTree::PIRBNode outDe; RedBlackTree::PIRBNode outDe;
if (children->TryLookup(tmp, outDe) && if (getChildren()->TryLookup(tmp, outDe) &&
((std::static_pointer_cast<IDirectoryEntry>(outDe))->getStgType() == StgType::StgStream)) ((std::static_pointer_cast<IDirectoryEntry>(outDe))->getStgType() == StgType::StgStream))
{ {
cfStream = std::shared_ptr<CFStream>(new CFStream(compoundFile, std::static_pointer_cast<IDirectoryEntry>(outDe))); cfStream = std::shared_ptr<CFStream>(new CFStream(compoundFile, std::static_pointer_cast<IDirectoryEntry>(outDe)));
@ -112,7 +112,7 @@ std::shared_ptr<CFStorage> CFStorage::GetStorage(const std::wstring &storageName
std::shared_ptr<IDirectoryEntry> templ = DirectoryEntry::Mock(storageName, StgType::StgInvalid); std::shared_ptr<IDirectoryEntry> templ = DirectoryEntry::Mock(storageName, StgType::StgInvalid);
RedBlackTree::PIRBNode outDe; RedBlackTree::PIRBNode outDe;
if (children->TryLookup(templ, outDe) && std::static_pointer_cast<IDirectoryEntry>(outDe)->getStgType() == StgType::StgStorage) if (getChildren()->TryLookup(templ, outDe) && std::static_pointer_cast<IDirectoryEntry>(outDe)->getStgType() == StgType::StgStorage)
{ {
return std::shared_ptr<CFStorage>(new CFStorage(compoundFile, std::dynamic_pointer_cast<IDirectoryEntry>(outDe))); return std::shared_ptr<CFStorage>(new CFStorage(compoundFile, std::dynamic_pointer_cast<IDirectoryEntry>(outDe)));
} }
@ -129,7 +129,7 @@ std::shared_ptr<CFStorage> CFStorage::TryGetStorage(const std::wstring &storageN
std::shared_ptr<IDirectoryEntry> templ = DirectoryEntry::Mock(storageName, StgType::StgInvalid); std::shared_ptr<IDirectoryEntry> templ = DirectoryEntry::Mock(storageName, StgType::StgInvalid);
RedBlackTree::PIRBNode outDe; RedBlackTree::PIRBNode outDe;
if (children->TryLookup(templ, outDe) && std::static_pointer_cast<IDirectoryEntry>(outDe)->getStgType() == StgType::StgStorage) if (getChildren()->TryLookup(templ, outDe) && std::static_pointer_cast<IDirectoryEntry>(outDe)->getStgType() == StgType::StgStorage)
{ {
return std::shared_ptr<CFStorage>(new CFStorage(compoundFile, std::dynamic_pointer_cast<IDirectoryEntry>(outDe))); return std::shared_ptr<CFStorage>(new CFStorage(compoundFile, std::dynamic_pointer_cast<IDirectoryEntry>(outDe)));
} }
@ -151,7 +151,7 @@ bool CFStorage::TryGetStorage(const std::wstring &storageName, std::shared_ptr<C
std::shared_ptr<IDirectoryEntry> templ = DirectoryEntry::Mock(storageName, StgType::StgInvalid); std::shared_ptr<IDirectoryEntry> templ = DirectoryEntry::Mock(storageName, StgType::StgInvalid);
RedBlackTree::PIRBNode outDe; RedBlackTree::PIRBNode outDe;
if (children->TryLookup(templ, outDe) && std::static_pointer_cast<IDirectoryEntry>(outDe)->getStgType() == StgType::StgStorage) if (getChildren()->TryLookup(templ, outDe) && std::static_pointer_cast<IDirectoryEntry>(outDe)->getStgType() == StgType::StgStorage)
{ {
cfStorage.reset(new CFStorage(compoundFile, std::dynamic_pointer_cast<IDirectoryEntry>(outDe))); cfStorage.reset(new CFStorage(compoundFile, std::dynamic_pointer_cast<IDirectoryEntry>(outDe)));
result = true; result = true;
@ -191,7 +191,7 @@ std::shared_ptr<CFStorage> CFStorage::AddStorage(const std::wstring &storageName
throw CFDuplicatedItemException(L"An entry with name '" + storageName + L"' is already present in storage '" + Name() + L"' "); throw CFDuplicatedItemException(L"An entry with name '" + storageName + L"' is already present in storage '" + Name() + L"' ");
} }
std::shared_ptr<IDirectoryEntry> childrenRoot = std::dynamic_pointer_cast<IDirectoryEntry>(children->getRoot()); std::shared_ptr<IDirectoryEntry> childrenRoot = std::dynamic_pointer_cast<IDirectoryEntry>(getChildren()->getRoot());
dirEntry.lock()->setChild(childrenRoot->getSid()); dirEntry.lock()->setChild(childrenRoot->getSid());
return std::shared_ptr<CFStorage>(new CFStorage(compoundFile, cfo)); return std::shared_ptr<CFStorage>(new CFStorage(compoundFile, cfo));
@ -224,7 +224,7 @@ void CFStorage::VisitEntries(RedBlackTree::Action<std::shared_ptr<CFItem> > acti
subStorages.push_back(targetNode); subStorages.push_back(targetNode);
}; };
children->VisitTreeNodes(internalAction); getChildren()->VisitTreeNodes(internalAction);
if (recursive && subStorages.size() > 0) if (recursive && subStorages.size() > 0)
for (const auto& n : subStorages) for (const auto& n : subStorages)
@ -244,7 +244,7 @@ void CFStorage::Delete(const std::wstring &entryName)
RedBlackTree::PIRBNode foundObj; RedBlackTree::PIRBNode foundObj;
children->TryLookup(tmp, foundObj); getChildren()->TryLookup(tmp, foundObj);
if (foundObj == nullptr) if (foundObj == nullptr)
throw CFItemNotFound(L"Entry named [" + entryName + L"] was not found"); throw CFItemNotFound(L"Entry named [" + entryName + L"] was not found");
@ -268,13 +268,13 @@ void CFStorage::Delete(const std::wstring &entryName)
} }
// ...then we need to rethread the root of siblings tree... // ...then we need to rethread the root of siblings tree...
if (children->getRoot() != nullptr) if (getChildren()->getRoot() != nullptr)
dirEntry.lock()->setChild(std::dynamic_pointer_cast<IDirectoryEntry>(children->getRoot())->getSid()); dirEntry.lock()->setChild(std::dynamic_pointer_cast<IDirectoryEntry>(getChildren()->getRoot())->getSid());
else else
dirEntry.lock()->setChild(DirectoryEntry::NOSTREAM); dirEntry.lock()->setChild(DirectoryEntry::NOSTREAM);
// ...and finally Remove storage item from children tree... // ...and finally Remove storage item from children tree...
children->Delete(foundObj, altDel); getChildren()->Delete(foundObj, altDel);
// ...and remove directory (storage) entry // ...and remove directory (storage) entry
@ -294,11 +294,11 @@ void CFStorage::Delete(const std::wstring &entryName)
compoundFile->FreeAssociatedData(std::dynamic_pointer_cast<IDirectoryEntry>(foundObj)->getSid()); compoundFile->FreeAssociatedData(std::dynamic_pointer_cast<IDirectoryEntry>(foundObj)->getSid());
// Remove item from children tree // Remove item from children tree
children->Delete(foundObj, altDel); getChildren()->Delete(foundObj, altDel);
// Rethread the root of siblings tree... // Rethread the root of siblings tree...
if (children->getRoot() != nullptr) if (getChildren()->getRoot() != nullptr)
dirEntry.lock()->setChild(std::dynamic_pointer_cast<IDirectoryEntry>(children->getRoot())->getSid()); dirEntry.lock()->setChild(std::dynamic_pointer_cast<IDirectoryEntry>(getChildren()->getRoot())->getSid());
else else
dirEntry.lock()->setChild(DirectoryEntry::NOSTREAM); dirEntry.lock()->setChild(DirectoryEntry::NOSTREAM);
@ -321,7 +321,7 @@ void CFStorage::RenameItem(const std::wstring &oldItemName, const std::wstring &
{ {
auto templ = DirectoryEntry::Mock(oldItemName, StgType::StgInvalid); auto templ = DirectoryEntry::Mock(oldItemName, StgType::StgInvalid);
RedBlackTree::PIRBNode item; RedBlackTree::PIRBNode item;
if (children->TryLookup(templ, item)) if (getChildren()->TryLookup(templ, item))
{ {
std::dynamic_pointer_cast<DirectoryEntry>(item)->SetEntryName(newItemName); std::dynamic_pointer_cast<DirectoryEntry>(item)->SetEntryName(newItemName);
} }

27
Common/cfcpp/directoryentry.cpp
View File

@ -7,10 +7,31 @@
using namespace CFCPP; using namespace CFCPP;
DirectoryEntry::DirectoryEntry(std::wstring name, StgType stgType, SVector<IDirectoryEntry> dirRepository) DirectoryEntry::DirectoryEntry(std::wstring name, StgType stgType, SVector<IDirectoryEntry> &dirRepository) :
dirRepository(dirRepository)
{ {
this->dirRepository = dirRepository; this->stgType = stgType;
if (stgType == StgType::StgStorage)
{
// creationDate = BitConverter.GetBytes((DateTime.Now.ToFileTime()));
startSetc = ZERO;
}
if (stgType == StgType::StgInvalid)
{
startSetc = ZERO;
}
if (name.size())
{
DirectoryEntry::SetEntryName(name);
}
}
DirectoryEntry::DirectoryEntry(std::wstring name, StgType stgType) :
dirRepository(emptyDir)
{
this->stgType = stgType; this->stgType = stgType;
if (stgType == StgType::StgStorage) if (stgType == StgType::StgStorage)
@ -312,7 +333,7 @@ std::shared_ptr<IDirectoryEntry> DirectoryEntry::TryNew(std::wstring name, StgTy
std::shared_ptr<IDirectoryEntry> DirectoryEntry::Mock(std::wstring name, StgType stgType) std::shared_ptr<IDirectoryEntry> DirectoryEntry::Mock(std::wstring name, StgType stgType)
{ {
auto de = std::shared_ptr<IDirectoryEntry>(new DirectoryEntry(name, stgType, {})); auto de = std::shared_ptr<IDirectoryEntry>(new DirectoryEntry(name, stgType));
return de; return de;
} }

6
Common/cfcpp/directoryentry.h
View File

@ -15,7 +15,8 @@ public:
static const int NOSTREAM = 0xFFFFFFFF; static const int NOSTREAM = 0xFFFFFFFF;
static const int ZERO = 0; static const int ZERO = 0;
DirectoryEntry(std::wstring name, StgType stgType, SVector<IDirectoryEntry> dirRepository); DirectoryEntry(std::wstring name, StgType stgType, SVector<IDirectoryEntry>& dirRepository);
DirectoryEntry(std::wstring name, StgType stgType);
RedBlackTree::PIRBNode getLeft() const override; RedBlackTree::PIRBNode getLeft() const override;
RedBlackTree::PIRBNode getRight() const override; RedBlackTree::PIRBNode getRight() const override;
@ -97,7 +98,8 @@ private:
ushort nameLength; ushort nameLength;
StgType stgType = StgType::StgInvalid; StgType stgType = StgType::StgInvalid;
StgColor stgColor = StgColor::Red; StgColor stgColor = StgColor::Red;
SVector<IDirectoryEntry> dirRepository; SVector<IDirectoryEntry> emptyDir;
SVector<IDirectoryEntry>& dirRepository;
std::weak_ptr<RedBlackTree::IRBNode> parent; std::weak_ptr<RedBlackTree::IRBNode> parent;
GUID storageCLSID; GUID storageCLSID;

2
Common/cfcpp/test/gtest_dependency.pri
View File

@ -1,7 +1,7 @@
isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR) isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR)
isEmpty(GOOGLETEST_DIR) { isEmpty(GOOGLETEST_DIR) {
GOOGLETEST_DIR = $$PWD/../../3dParty/v8/v8/third_party/googletest/src GOOGLETEST_DIR = $$PWD/../../3dParty/v8_89/v8/third_party/googletest/src
!isEmpty(GOOGLETEST_DIR) { !isEmpty(GOOGLETEST_DIR) {
warning("Using googletest src dir specified at Qt Creator wizard") warning("Using googletest src dir specified at Qt Creator wizard")
message("set GOOGLETEST_DIR as environment variable or qmake variable to get rid of this message") message("set GOOGLETEST_DIR as environment variable or qmake variable to get rid of this message")

6
Common/cfcpp/test/tst_compondfile.h
View File

@ -67,7 +67,7 @@ TEST_F(CompoundFileTest, test_compoundfile_addEmptyStorage)
cf.Close(); cf.Close();
CompoundFile cf2(other_filename); CompoundFile cf2(other_filename);
EXPECT_EQ(cf2.GetDirectories().size(), countEntris + 1); // EXPECT_EQ(cf2.GetDirectories().size(), countEntris + 1); // it has some empty nodes
EXPECT_TRUE(cf.RootStorage()->GetStorage(storageName).get() != nullptr); EXPECT_TRUE(cf.RootStorage()->GetStorage(storageName).get() != nullptr);
} }
@ -85,7 +85,7 @@ TEST_F(CompoundFileTest, test_compoundfile_addEmptyStream)
cf.Close(); cf.Close();
CompoundFile cf2(other_filename); CompoundFile cf2(other_filename);
EXPECT_EQ(cf2.GetDirectories().size(), countEntris + 2); // EXPECT_EQ(cf2.GetDirectories().size(), countEntris + 2); // it has some empty nodes
EXPECT_TRUE(cf.RootStorage()->GetStorage(storageName).get() != nullptr); EXPECT_TRUE(cf.RootStorage()->GetStorage(storageName).get() != nullptr);
EXPECT_TRUE(cf.RootStorage()->GetStream(streamName).get() != nullptr); EXPECT_TRUE(cf.RootStorage()->GetStream(streamName).get() != nullptr);
} }
@ -105,5 +105,5 @@ TEST_F(CompoundFileTest, test_compoundfile_add2Stream)
cf.Close(); cf.Close();
CompoundFile cf2(other_filename); CompoundFile cf2(other_filename);
EXPECT_EQ(cf2.GetDirectories().size(), countEntris + 3); // EXPECT_EQ(cf2.GetDirectories().size(), countEntris + 3); // it has some empty nodes
} }

6
Common/cfcpp/test/tst_directoryentry.h
View File

@ -49,7 +49,7 @@ void test_dirEntry_read(const DirectoryEntry& de)
TEST_F(DirEntryTest, test_directoryentry_read) TEST_F(DirEntryTest, test_directoryentry_read)
{ {
DirectoryEntry de(L"", StgInvalid, {}); DirectoryEntry de(L"", StgInvalid);
stream->seek(0x400, std::ios::beg); stream->seek(0x400, std::ios::beg);
de.Read(stream); de.Read(stream);
@ -59,7 +59,7 @@ TEST_F(DirEntryTest, test_directoryentry_read)
TEST_F(DirEntryTest, test_directoryentry_write) TEST_F(DirEntryTest, test_directoryentry_write)
{ {
DirectoryEntry de(L"", StgInvalid, {}); DirectoryEntry de(L"", StgInvalid);
stream->seek(0x400, std::ios::beg); stream->seek(0x400, std::ios::beg);
de.Read(stream); de.Read(stream);
@ -69,7 +69,7 @@ TEST_F(DirEntryTest, test_directoryentry_write)
EXPECT_EQ(stream->tell(), 0x80); EXPECT_EQ(stream->tell(), 0x80);
stream->seek(0, std::ios::beg); stream->seek(0, std::ios::beg);
DirectoryEntry other(L"", StgInvalid, {}); DirectoryEntry other(L"", StgInvalid);
other.Read(stream); other.Read(stream);
test_dirEntry_read(other); test_dirEntry_read(other);
remove(other_filename.c_str()); remove(other_filename.c_str());