From f6884fe3d680b984e6ca117a0b479107bccf83e5 Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Fri, 28 Dec 2018 05:21:35 -0600 Subject: Allow some functions to pass in empty paths to check the root folder --- src/organizercore.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 1f4e3434..884b699c 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -1087,8 +1087,9 @@ QString OrganizerCore::resolvePath(const QString &fileName) const QStringList OrganizerCore::listDirectories(const QString &directoryName) const { QStringList result; - DirectoryEntry *dir = m_DirectoryStructure->findSubDirectoryRecursive( - ToWString(directoryName)); + DirectoryEntry *dir = m_DirectoryStructure; + if (!directoryName.isEmpty()) + dir = dir->findSubDirectoryRecursive(ToWString(directoryName)); if (dir != nullptr) { std::vector::iterator current, end; dir->getSubDirectories(current, end); @@ -1104,8 +1105,9 @@ QStringList OrganizerCore::findFiles( const std::function &filter) const { QStringList result; - DirectoryEntry *dir - = m_DirectoryStructure->findSubDirectoryRecursive(ToWString(path)); + DirectoryEntry *dir = m_DirectoryStructure; + if (!path.isEmpty()) + dir = dir->findSubDirectoryRecursive(ToWString(path)); if (dir != nullptr) { std::vector files = dir->getFiles(); foreach (FileEntry::Ptr file, files) { @@ -1144,8 +1146,9 @@ QList OrganizerCore::findFileInfos( const { QList result; - DirectoryEntry *dir - = m_DirectoryStructure->findSubDirectoryRecursive(ToWString(path)); + DirectoryEntry *dir = m_DirectoryStructure; + if (!path.isEmpty()) + dir = dir->findSubDirectoryRecursive(ToWString(path)); if (dir != nullptr) { std::vector files = dir->getFiles(); foreach (FileEntry::Ptr file, files) { -- cgit v1.3.1