hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update old file filtering code (#6882)

Browse Source 
* Updated some old file filtering code.

I was trying to add a way to show/hide the .bak and other files with some
filter buttons when I noticed the code in FileBrowser::addItems was copy
pasta that had lava flowed from the much more modern Directory::addItems.
In addition, only, FileBrowser::addItems was not respecting the filter's
at all. I brought both of them into line with Qt 5 practices which
now respects the m_filter list of extensions for both FileBrowser
and Directory. In Directory::addItems I only needed to change where
the match was being done, FileBrowser::addItems didn't try to
filter/match at all.

* Set name filters inside entryInfoList call, const

Some fixes for const iterating the file list.
Setting file name filters along with the call instead of seperately.

* Style changes src/gui/FileBrowser.cpp

Co-authored-by: saker <sakertooth@gmail.com>

* Fixed style/format FileBrowser.cpp

---------

Co-authored-by: saker <sakertooth@gmail.com>
This commit is contained in:
consolegrl
2023-10-21 11:50:15 -04:00
committed by GitHub
parent 259d120725
commit 6bde53e4a9
2 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/gui/FileBrowser.cpp
View File

@@ -328,68 +328,63 @@ void FileBrowser::addItems(const QString & path )
}
// try to add all directories from file system alphabetically into the tree
QDir cdir( path );
QStringList files = cdir.entryList( QDir::Dirs, QDir::Name );
files.sort(Qt::CaseInsensitive);
for( QStringList::const_iterator it = files.constBegin();
it != files.constEnd(); ++it )
QDir cdir(path);
if (!cdir.isReadable()) { return; }
QFileInfoList entries = cdir.entryInfoList(
m_filter.split(' '),
QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot,
QDir::LocaleAware | QDir::DirsFirst | QDir::Name | QDir::IgnoreCase);
for (const auto& entry : entries)
{
QString cur_file = *it;
if( cur_file[0] != '.' )
QString fileName = entry.fileName();
if (entry.isDir())
{
// Merge dir's together
bool orphan = true;
for( int i = 0; i < m_fileBrowserTreeWidget->topLevelItemCount(); ++i )
for (int i = 0; i < m_fileBrowserTreeWidget->topLevelItemCount(); ++i)
{
auto d = dynamic_cast<Directory*>(m_fileBrowserTreeWidget->topLevelItem(i));
if( d == nullptr || cur_file < d->text( 0 ) )
if (d == nullptr || fileName < d->text(0))
{
// insert before item, we're done
auto dd = new Directory(cur_file, path, m_filter);
m_fileBrowserTreeWidget->insertTopLevelItem( i,dd );
auto dd = new Directory(fileName, path, m_filter);
m_fileBrowserTreeWidget->insertTopLevelItem(i,dd);
dd->update(); // add files to the directory
orphan = false;
break;
}
else if( cur_file == d->text( 0 ) )
else if (fileName == d->text(0))
{
// imagine we have subdirs named "TripleOscillator/xyz" in
// two directories from m_directories
// then only add one tree widget for both
// so we don't add a new Directory - we just
// add the path to the current directory
d->addDirectory( path );
d->addDirectory(path);
d->update();
orphan = false;
break;
}
}
if( orphan )
if (orphan)
{
// it has not yet been added yet, so it's (lexically)
// larger than all other dirs => append it at the bottom
auto d = new Directory(cur_file, path, m_filter);
auto d = new Directory(fileName, path, m_filter);
d->update();
m_fileBrowserTreeWidget->addTopLevelItem( d );
m_fileBrowserTreeWidget->addTopLevelItem(d);
}
}
}
files = cdir.entryList( QDir::Files, QDir::Name );
for( QStringList::const_iterator it = files.constBegin();
it != files.constEnd(); ++it )
{
QString cur_file = *it;
if( cur_file[0] != '.' )
else if (entry.isFile())
{
// TODO: don't insert instead of removing, order changed
// remove existing file-items
QList<QTreeWidgetItem *> existing = m_fileBrowserTreeWidget->findItems(
cur_file, Qt::MatchFixedString );
if( !existing.empty() )
QList<QTreeWidgetItem *> existing = m_fileBrowserTreeWidget->findItems(fileName, Qt::MatchFixedString);
if (!existing.empty())
{
delete existing.front();
}
(void) new FileItem( m_fileBrowserTreeWidget, cur_file, path );
(void) new FileItem(m_fileBrowserTreeWidget, fileName, path);
}
}
}
@@ -1063,8 +1058,11 @@ bool Directory::addItems(const QString& path)
treeWidget()->setUpdatesEnabled(false);
QFileInfoList entries = thisDir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware | QDir::DirsFirst | QDir::Name);
for (auto& entry : entries)
QFileInfoList entries = thisDir.entryInfoList(
m_filter.split(' '),
QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot,
QDir::LocaleAware | QDir::DirsFirst | QDir::Name | QDir::IgnoreCase);
for (const auto& entry : entries)
{
QString fileName = entry.fileName();
if (entry.isDir())
@@ -1073,7 +1071,7 @@ bool Directory::addItems(const QString& path)
addChild(dir);
m_dirCount++;
}
else if (entry.isFile() && thisDir.match(m_filter, fileName.toLower()))
else if (entry.isFile())
{
auto fileItem = new FileItem(fileName, path);
addChild(fileItem);

2
src/gui/MainWindow.cpp
View File

@@ -112,7 +112,7 @@ MainWindow::MainWindow() :
sideBar->appendTab( new FileBrowser(
confMgr->userProjectsDir() + "*" +
confMgr->factoryProjectsDir(),
"*.mmp *.mmpz *.xml *.mid",
"*.mmp *.mmpz *.xml *.mid *.mpt",
tr( "My Projects" ),
embed::getIconPixmap( "project_file" ).transformed( QTransform().rotate( 90 ) ),
splitter, false, true,