From 27efc7cd435e396f2e8e99787c52c0464b805277 Mon Sep 17 00:00:00 2001 From: Camilo Higuita Date: Mon, 24 Jun 2019 12:37:37 -0500 Subject: [PATCH] now ready for first stable release --- main.qml | 40 ++++++++++++++--------------- models/albums/albumsmodel.cpp | 25 +++++------------- models/playlists/playlistsmodel.cpp | 9 +------ models/tracks/tracksmodel.cpp | 9 +------ view_models/BabeTable/BabeTable.qml | 2 +- vvave.cpp | 2 -- widgets/AlbumsView.qml | 1 + widgets/FoldersView.qml | 37 +++++++++++++------------- 8 files changed, 50 insertions(+), 75 deletions(-) diff --git a/main.qml b/main.qml index 614d11b..8039eb2 100644 --- a/main.qml +++ b/main.qml @@ -1010,26 +1010,26 @@ Maui.ApplicationWindow onRefreshAlbums: H.refreshAlbums() onRefreshArtists: H.refreshArtists() - onCoverReady: - { - root.currentArtwork = path - currentTrack.artwork = currentArtwork - mainPlaylist.list.update(currentTrack, currentTrackIndex); - } - - onTrackLyricsReady: - { - console.log(lyrics) - if (url === currentTrack.url) - Player.setLyrics(lyrics) - } - - onSkipTrack: Player.nextTrack() - onBabeIt: if (!mainlistEmpty) - { - mainPlaylist.list.fav(currentTrackIndex, !(mainPlaylist.list.get(currentTrackIndex).fav == "1")) - currentBabe = mainPlaylist.list.get(currentTrackIndex).fav == "1" - } +// onCoverReady: +// { +// root.currentArtwork = path +// currentTrack.artwork = currentArtwork +// mainPlaylist.list.update(currentTrack, currentTrackIndex); +// } + +// onTrackLyricsReady: +// { +// console.log(lyrics) +// if (url === currentTrack.url) +// Player.setLyrics(lyrics) +// } + +// onSkipTrack: Player.nextTrack() +// onBabeIt: if (!mainlistEmpty) +// { +// mainPlaylist.list.fav(currentTrackIndex, !(mainPlaylist.list.get(currentTrackIndex).fav == "1")) +// currentBabe = mainPlaylist.list.get(currentTrackIndex).fav == "1" +// } onOpenFiles: { diff --git a/models/albums/albumsmodel.cpp b/models/albums/albumsmodel.cpp index eec099a..e3a9f38 100644 --- a/models/albums/albumsmodel.cpp +++ b/models/albums/albumsmodel.cpp @@ -192,20 +192,18 @@ void AlbumsModel::fetchInformation() QEventLoop loop; QObject::connect(&pulpo, &Pulpo::finished, &loop, &QEventLoop::quit); bool stop = false; -// QObject::connect(qApp, &QCoreApplication::aboutToQuit, [&]() -// { -// stop = true; -// loop.quit(); -// }); + QObject::connect(this, &AlbumsModel::destroyed, [&]() { - + qDebug()<< stop << &stop; stop = true; + qDebug()<< stop << &stop; + }); - for(auto i = 0; i < requests.size(); i++) + for(const auto &req : requests) { - pulpo.request(requests.at(i)); + pulpo.request(req); loop.exec(); if(stop) { @@ -232,14 +230,7 @@ QVariantMap AlbumsModel::get(const int &index) const { if(index >= this->list.size() || index < 0) return QVariantMap(); - - QVariantMap res; - const auto item = this->list.at(index); - - for(auto key : item.keys()) - res.insert(FMH::MODEL_NAME[key], item[key]); - - return res; + return FM::toMap(this->list.at(index)); } void AlbumsModel::append(const QVariantMap &item) @@ -283,5 +274,3 @@ void AlbumsModel::refresh() { this->setList(); } - - diff --git a/models/playlists/playlistsmodel.cpp b/models/playlists/playlistsmodel.cpp index 09c48fe..cc10cf2 100644 --- a/models/playlists/playlistsmodel.cpp +++ b/models/playlists/playlistsmodel.cpp @@ -157,14 +157,7 @@ QVariantMap PlaylistsModel::get(const int &index) const { if(index >= this->list.size() || index < 0) return QVariantMap(); - - QVariantMap res; - const auto item = this->list.at(index); - - for(auto key : item.keys()) - res.insert(FMH::MODEL_NAME[key], item[key]); - - return res; + return FM::toMap(this->list.at(index)); } void PlaylistsModel::append(const QVariantMap &item) diff --git a/models/tracks/tracksmodel.cpp b/models/tracks/tracksmodel.cpp index f45cac0..faa9ab3 100644 --- a/models/tracks/tracksmodel.cpp +++ b/models/tracks/tracksmodel.cpp @@ -127,14 +127,7 @@ QVariantMap TracksModel::get(const int &index) const { if(index >= this->list.size() || index < 0) return QVariantMap(); - - QVariantMap res; - const auto item = this->list.at(index); - - for(auto key : item.keys()) - res.insert(FMH::MODEL_NAME[key], item[key]); - - return res; + return FM::toMap(this->list.at(index)); } QVariantList TracksModel::getAll() diff --git a/view_models/BabeTable/BabeTable.qml b/view_models/BabeTable/BabeTable.qml index 32a9867..289b9bc 100644 --- a/view_models/BabeTable/BabeTable.qml +++ b/view_models/BabeTable/BabeTable.qml @@ -321,7 +321,7 @@ BabeList number : trackNumberVisible ? true : false quickPlay: quickPlayVisible - coverArt : coverArtVisible + coverArt : coverArtVisible ? (babeTableRoot.width > 300) : coverArtVisible trackDurationVisible : trackDuration trackRatingVisible : trackRating menuItem: menuItemVisible diff --git a/vvave.cpp b/vvave.cpp index 0a02200..4a09371 100644 --- a/vvave.cpp +++ b/vvave.cpp @@ -31,7 +31,6 @@ vvave::vvave(QObject *parent) : QObject(parent) for(const auto &path : {BAE::CachePath, BAE::YoutubeCachePath}) { QDir dirPath(path); - if (!dirPath.exists()) dirPath.mkpath("."); } @@ -81,7 +80,6 @@ void vvave::checkCollection(const QStringList &paths, std::function watcher->setFuture(t1); } - //// PUBLIC SLOTS QVariantList vvave::sourceFolders() { diff --git a/widgets/AlbumsView.qml b/widgets/AlbumsView.qml index e4f976e..c8f9f65 100644 --- a/widgets/AlbumsView.qml +++ b/widgets/AlbumsView.qml @@ -130,6 +130,7 @@ BabeGrid Layout.fillHeight: true Layout.fillWidth: true trackNumberVisible: true + trackRating: true headBar.visible: true headBarExit: false coverArtVisible: true diff --git a/widgets/FoldersView.qml b/widgets/FoldersView.qml index 91dd95e..b736929 100644 --- a/widgets/FoldersView.qml +++ b/widgets/FoldersView.qml @@ -6,13 +6,14 @@ import "../db/Queries.js" as Q Item { + id: control + property alias list : _filterList + property var tracks : [] + property string currentFolder : "" + Maui.GridBrowser { id: browser - - property alias list : _filterList - property var tracks : [] - property string currentFolder : "" // headBarTitle: qsTr("Source folders") anchors.margins: space.big anchors.fill: parent @@ -60,23 +61,23 @@ Item holder.emojiSize: iconSizes.huge } } + } - Component.onCompleted: populate() + Component.onCompleted: populate() - function populate() - { - browser.model.clear() - var folders = vvave.sourceFolders(); - if(folders.length > 0) - for(var i in folders) - browser.model.append(folders[i]) - } + function populate() + { + browser.model.clear() + var folders = vvave.sourceFolders(); + if(folders.length > 0) + for(var i in folders) + browser.model.append(folders[i]) + } - function filter() - { - var where = "source = \""+currentFolder+"\"" - _filterList.list.query = (Q.GET.tracksWhere_.arg(where)) + function filter() + { + var where = "source = \""+currentFolder+"\"" + _filterList.list.query = (Q.GET.tracksWhere_.arg(where)) - } } } -- GitLab