jmr/lena_pi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't show folders that do not contain subfolders or audio files

Browse source 
hopefuly this will fix crash on RasPi
This commit is contained in:
Anika Raemer 2018-12-25 20:15:41 +01:00
parent 50deec22f1
commit d251120275
7 changed files with 333 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
LenaPi/controllers/NavigationController.cpp
View file

@ -54,6 +54,7 @@ void NavigationController::add(const QString &path, NavigationItemModel *parentI
for(const auto& name : subDirsNames){
if(name == "." || name == "..") continue;
if(!checkContent(path + "/" + name)) continue;
auto item = new NavigationItemModel(parentItem);
if(!item->setPath(path + "/" + name)) {
item->deleteLater();
@ -65,6 +66,26 @@ void NavigationController::add(const QString &path, NavigationItemModel *parentI
}
}
bool NavigationController::checkContent(const QString &path)
{
bool valid = false;
auto dir =QDir(path);
auto subDirsNames = dir.entryList(QDir::AllDirs);
if(subDirsNames.length() > 0) {
valid = true;
} else {
auto fileNames = dir.entryList(QDir::Files);
int numAudio = 0;
for(auto file:fileNames){
if(file.endsWith(".flac") || file.endsWith(".mp3")){
numAudio++;
}
}
if(numAudio > 0) valid = true;
}
return valid;
}
void NavigationController::onNavigationRequest()
{
auto item = qobject_cast<NavigationItemModel*>(QObject::sender());

1
LenaPi/controllers/NavigationController.h
View file

@ -22,6 +22,7 @@ public:
private:
void setContextProperties();
void add(const QString & path, NavigationItemModel* parentItem);
bool checkContent(const QString& path);
NavigationItemModel* mRootItem;
NavigationListModel* mNavList;