diff --git a/CMakeLists.txt b/CMakeLists.txt index ec72339..fecefed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,96 +1,95 @@ project(vvave) cmake_minimum_required(VERSION 3.0) find_package(ECM 1.7.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${ECM_MODULE_PATH}) find_package(MauiKit REQUIRED) find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Qml Quick Network WebSockets Sql QuickControls2 Xml Multimedia Widgets DBus Svg) include(KDEInstallDirs) include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMInstallIcons) include(FeatureSummary) include(ECMAddAppIcon) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTORCC ON) add_executable(vvave qml.qrc main.cpp # babe.cpp vvave.cpp # pulpo/services/geniusService.cpp # pulpo/services/deezerService.cpp pulpo/services/lastfmService.cpp # pulpo/services/lyricwikiaService.cpp # pulpo/services/spotifyService.cpp # pulpo/services/musicbrainzService.cpp pulpo/pulpo.cpp pulpo/htmlparser.cpp pulpo/service.cpp services/local/taginfo.cpp services/local/player.cpp services/local/youtubedl.cpp services/local/linking.cpp services/local/socket.cpp services/web/babeit.cpp services/web/youtube.cpp services/web/Spotify/spotify.cpp - db/conthread.cpp db/collectionDB.cpp # settings/BabeSettings.cpp # settings/fileloader.cpp # utils/brain.cpp utils/babeconsole.cpp models/tracks/tracksmodel.cpp models/basemodel.cpp models/baselist.cpp models/playlists/playlistsmodel.cpp models/albums/albumsmodel.cpp models/cloud/cloud.cpp ) if (ANDROID) find_package(Qt5 REQUIRED COMPONENTS AndroidExtras WebView Xml) find_package(OpenSSL REQUIRED) include(ExternalProject) externalproject_add(taglib URL http://taglib.org/releases/taglib-1.11.1.tar.gz CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} ) set(TAGLIB_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include ${CMAKE_INSTALL_PREFIX}/include/taglib) set(TAGLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libtag.a) target_link_libraries(vvave Qt5::AndroidExtras Qt5::WebView Qt5::Xml OpenSSL::SSL) add_dependencies(vvave taglib) kde_source_files_enable_exceptions(vvave babe.cpp) else() find_package(Taglib REQUIRED) find_package(Qt5 REQUIRED COMPONENTS WebEngine) find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO Attica) target_sources(vvave PRIVATE kde/mpris2.cpp kde/notify.cpp ) target_link_libraries(vvave Qt5::WebEngine KF5::ConfigCore KF5::Notifications KF5::KIOCore KF5::I18n Qt5::DBus KF5::Attica) endif() if (TARGET create-apk-vvave) set_target_properties(create-apk-vvave PROPERTIES ANDROID_APK_DIR "${MAUIKIT_ANDROID_DIR}") endif() target_include_directories(vvave PRIVATE ${TAGLIB_INCLUDE_DIRS}) target_link_libraries(vvave MauiKit Qt5::Network Qt5::Sql Qt5::WebSockets Qt5::Qml Qt5::Xml Qt5::Multimedia Qt5::Widgets Qt5::QuickControls2 ${TAGLIB_LIBRARIES}) install(TARGETS vvave ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES org.kde.vvave.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) #TODO: port to ecm_install_icons() install(FILES assets/vvave.svg DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor/scalable/apps) install(FILES org.kde.vvave.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/db/collectionDB.cpp b/db/collectionDB.cpp index 9d9fbd4..359f90c 100644 --- a/db/collectionDB.cpp +++ b/db/collectionDB.cpp @@ -1,1122 +1,1098 @@ /* Babe - tiny music player Copyright (C) 2017 Camilo Higuita This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "collectionDB.h" #include #include #include #include "../utils/babeconsole.h" using namespace BAE; CollectionDB::CollectionDB(QObject *parent) : QObject(parent) { QObject::connect(qApp, &QCoreApplication::aboutToQuit, [this]() { this->m_db.close(); this->instance->deleteLater(); this->instance = nullptr; }); this->name = QUuid::createUuid().toString(); if(!BAE::fileExists(BAE::CollectionDBPath + BAE::DBName)) { QDir collectionDBPath_dir(BAE::CollectionDBPath); if (!collectionDBPath_dir.exists()) collectionDBPath_dir.mkpath("."); this->openDB(this->name); qDebug()<<"Collection doesn't exists, trying to create it" << BAE::CollectionDBPath + BAE::DBName; this->prepareCollectionDB(); }else this->openDB(this->name); } CollectionDB::~CollectionDB() { qDebug()<< "DELETING COLLECTIONDB SINGLETON"; } CollectionDB *CollectionDB::instance = nullptr; CollectionDB *CollectionDB::getInstance() { if(!instance) { instance = new CollectionDB(); qDebug() << "getInstance(): First DBActions instance\n"; return instance; } else { qDebug()<< "getInstance(): previous DBActions instance\n"; return instance; } } void CollectionDB::deleteInstance() { delete this; } void CollectionDB::prepareCollectionDB() { QSqlQuery query(this->m_db); QFile file(":/db/script.sql"); qDebug()<< file.exists(); if (!file.exists()) { QString log = QStringLiteral("Fatal error on build database. The file '"); log.append(file.fileName() + QStringLiteral("' for database and tables creation query cannot be not found!")); qDebug()<getQuery(queryStr); if (!query.exec()) { qDebug()<m_db); query.prepare(sqlQueryString); int k = 0; foreach (const QVariant &value, values) query.bindValue(k++, value); return query.exec(); } bool CollectionDB::update(const QString &tableName, const FMH::MODEL &updateData, const QVariantMap &where) { if (tableName.isEmpty()) { qDebug()<getQuery(sqlQueryString); qDebug()<getQuery(queryStr); return query.exec(); } bool CollectionDB::remove(const QString &table, const QString &column, const QVariantMap &where) { return false;} bool CollectionDB::execQuery(QSqlQuery &query) const { if(query.exec()) return true; qDebug()<<"ERROR ON EXEC QUERY"; qDebug()<getQuery(queryTxt); return query.exec(); } void CollectionDB::openDB(const QString &name) { if(!QSqlDatabase::contains(name)) { this->m_db = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"), name); this->m_db.setDatabaseName(BAE::CollectionDBPath + BAE::DBName); } if (!this->m_db.isOpen()) { if(!this->m_db.open()) qDebug()<<"ERROR OPENING DB"<m_db.lastError().text()<execQuery("PRAGMA journal_mode=WAL"); } } } bool CollectionDB::addTrack(const FMH::MODEL &track) { auto url = track[FMH::MODEL_KEY::URL]; auto title = track[FMH::MODEL_KEY::TITLE]; auto artist = track[FMH::MODEL_KEY::ARTIST]; auto album = track[FMH::MODEL_KEY::ALBUM]; auto genre = track[FMH::MODEL_KEY::GENRE]; auto year = track[FMH::MODEL_KEY::RELEASEDATE]; auto sourceUrl = track[FMH::MODEL_KEY::SOURCE]; auto duration = track[FMH::MODEL_KEY::DURATION]; auto fav = track[FMH::MODEL_KEY::FAV]; auto trackNumber = track[FMH::MODEL_KEY::TRACK]; auto artwork = track[FMH::MODEL_KEY::ARTWORK].isEmpty() ? "" : track[FMH::MODEL_KEY::ARTWORK]; auto artistTrack = track; artistTrack[FMH::MODEL_KEY::ARTWORK] = ""; BAE::artworkCache(artistTrack, FMH::MODEL_KEY::ARTIST); auto artistArtwork = artistTrack[FMH::MODEL_KEY::ARTWORK]; /* first needs to insert the source, album and artist*/ QVariantMap sourceMap {{FMH::MODEL_NAME[FMH::MODEL_KEY::URL], sourceUrl}, {FMH::MODEL_NAME[FMH::MODEL_KEY::SOURCETYPE], sourceType(url)}}; insert(TABLEMAP[BAE::TABLE::SOURCES], sourceMap); QVariantMap artistMap {{FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], artist}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ARTWORK], artistArtwork}, {FMH::MODEL_NAME[FMH::MODEL_KEY::WIKI], ""}}; insert(TABLEMAP[TABLE::ARTISTS],artistMap); QVariantMap albumMap {{FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM], album}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], artist}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ARTWORK], artwork}, {FMH::MODEL_NAME[FMH::MODEL_KEY::WIKI],""}}; insert(TABLEMAP[TABLE::ALBUMS],albumMap); QVariantMap trackMap {{FMH::MODEL_NAME[FMH::MODEL_KEY::URL], url}, {FMH::MODEL_NAME[FMH::MODEL_KEY::SOURCE], sourceUrl}, {FMH::MODEL_NAME[FMH::MODEL_KEY::TRACK], trackNumber}, {FMH::MODEL_NAME[FMH::MODEL_KEY::TITLE], title}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], artist}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM], album}, {FMH::MODEL_NAME[FMH::MODEL_KEY::DURATION], duration}, {FMH::MODEL_NAME[FMH::MODEL_KEY::COUNT], 0}, {FMH::MODEL_NAME[FMH::MODEL_KEY::FAV], fav}, {FMH::MODEL_NAME[FMH::MODEL_KEY::RATE], 0}, {FMH::MODEL_NAME[FMH::MODEL_KEY::RELEASEDATE], year}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ADDDATE], QDateTime::currentDateTime()}, {FMH::MODEL_NAME[FMH::MODEL_KEY::LYRICS],""}, {FMH::MODEL_NAME[FMH::MODEL_KEY::GENRE], genre}, {FMH::MODEL_NAME[FMH::MODEL_KEY::COLOR], ""}, {FMH::MODEL_NAME[FMH::MODEL_KEY::WIKI], ""}, {FMH::MODEL_NAME[FMH::MODEL_KEY::COMMENT], ""}}; return this->insert(BAE::TABLEMAP[BAE::TABLE::TRACKS], trackMap); } bool CollectionDB::updateTrack(const FMH::MODEL &track) { if(this->check_existance(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::URL], track[FMH::MODEL_KEY::URL])) { QVariantMap artistMap {{FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], track[FMH::MODEL_KEY::ARTIST]}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ARTWORK], ""}, {FMH::MODEL_NAME[FMH::MODEL_KEY::WIKI],""}}; insert(TABLEMAP[TABLE::ARTISTS],artistMap); QVariantMap albumMap {{FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM], track[FMH::MODEL_KEY::ALBUM]}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], track[FMH::MODEL_KEY::ARTIST]}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ARTWORK], ""}, {FMH::MODEL_NAME[FMH::MODEL_KEY::WIKI],""}}; insert(TABLEMAP[TABLE::ALBUMS],albumMap); QVariantMap condition {{FMH::MODEL_NAME[FMH::MODEL_KEY::URL], track[FMH::MODEL_KEY::URL]}}; if(this->update(TABLEMAP[TABLE::TRACKS], track, condition)) if(cleanAlbums()) cleanArtists(); return true; } return false; } bool CollectionDB::rateTrack(const QString &path, const int &value) { if(update(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::RATE], value, FMH::MODEL_NAME[FMH::MODEL_KEY::URL], path)) return true; return false; } bool CollectionDB::colorTagTrack(const QString &path, const QString &value) { if(update(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::COLOR], value, FMH::MODEL_NAME[FMH::MODEL_KEY::URL], path)) return true; return false; } bool CollectionDB::lyricsTrack(const FMH::MODEL &track, const QString &value) { if(update(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::LYRICS], value, FMH::MODEL_NAME[FMH::MODEL_KEY::URL], track[FMH::MODEL_KEY::URL])) return true; return false; } bool CollectionDB::tagsTrack(const FMH::MODEL &track, const QString &value, const QString &context) { auto url = track[FMH::MODEL_KEY::URL]; qDebug()<<"INSERTIN TRACK TAG"<getDBData(queryTxt); if(result.isEmpty()) return false; auto oldAlbum = result.first(); QVariantMap albumMap {{FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM],value}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], oldAlbum[FMH::MODEL_KEY::ARTIST]}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ARTWORK], oldAlbum[FMH::MODEL_KEY::ARTWORK]}, {FMH::MODEL_NAME[FMH::MODEL_KEY::WIKI], oldAlbum[FMH::MODEL_KEY::WIKI]}}; if (!insert(TABLEMAP[TABLE::ALBUMS],albumMap)) return false; // update albums SET album = "newalbumname" WHERE album = "albumname" NAD artist = "aretist name"; queryTxt = QString("UPDATE %1 SET %2 = %3 AND %4 = %5 WHERE %2 = %6 AND %4 = %5").arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM],value, FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], oldAlbum[FMH::MODEL_KEY::ARTIST], oldAlbum[FMH::MODEL_KEY::ALBUM]); auto query = this->getQuery(queryTxt); if(!execQuery(query)) return false; queryTxt = QString("DELETE FROM %1 WHERE %2 = %3 AND %4 = %5").arg(TABLEMAP[TABLE::ALBUMS], FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM], oldAlbum[FMH::MODEL_KEY::ALBUM], FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], artist); query.prepare(queryTxt); if(!execQuery(query)) return false; return true; } bool CollectionDB::playedTrack(const QString &url, const int &increment) { auto queryTxt = QString("UPDATE %1 SET %2 = %2 + %3 WHERE %4 = \"%5\"").arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::COUNT], QString::number(increment), FMH::MODEL_NAME[FMH::MODEL_KEY::URL], url); auto query = this->getQuery(queryTxt); if(query.exec()) return true; return false; } bool CollectionDB::wikiTrack(const FMH::MODEL &track, const QString &value) { auto url = track[FMH::MODEL_KEY::URL]; if(update(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::WIKI], value, FMH::MODEL_NAME[FMH::MODEL_KEY::URL], url)) return true; return false; } bool CollectionDB::wikiArtist(const FMH::MODEL &track, const QString &value) { auto artist = track[FMH::MODEL_KEY::ARTIST]; if(update(TABLEMAP[TABLE::ARTISTS], FMH::MODEL_NAME[FMH::MODEL_KEY::WIKI], value, FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], artist)) return true; return false; } bool CollectionDB::tagsArtist(const FMH::MODEL &track, const QString &value, const QString &context) { auto artist = track[FMH::MODEL_KEY::ARTIST]; QVariantMap tagMap {{FMH::MODEL_NAME[FMH::MODEL_KEY::TAG], value}, {FMH::MODEL_NAME[FMH::MODEL_KEY::CONTEXT], context}}; QVariantMap artistTagMap {{FMH::MODEL_NAME[FMH::MODEL_KEY::TAG], value}, {FMH::MODEL_NAME[FMH::MODEL_KEY::CONTEXT], context}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], artist}}; insert(TABLEMAP[TABLE::TAGS],tagMap); insert(TABLEMAP[TABLE::ARTISTS_TAGS],artistTagMap); return true; } bool CollectionDB::wikiAlbum(const FMH::MODEL &track, QString value) { auto artist = track[FMH::MODEL_KEY::ARTIST]; auto album = track[FMH::MODEL_KEY::ALBUM]; auto queryStr = QString("UPDATE %1 SET %2 = \"%3\" WHERE %4 = \"%5\" AND %6 = \"%7\"").arg( TABLEMAP[TABLE::ALBUMS], FMH::MODEL_NAME[FMH::MODEL_KEY::WIKI], value.replace("\"","\"\""), FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM], album,FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], artist); qDebug()<getQuery(queryStr); return query.exec(); } bool CollectionDB::tagsAlbum(const FMH::MODEL &track, const QString &value, const QString &context) { auto artist = track[FMH::MODEL_KEY::ARTIST]; auto album = track[FMH::MODEL_KEY::ALBUM]; QVariantMap tagMap {{FMH::MODEL_NAME[FMH::MODEL_KEY::TAG],value},{FMH::MODEL_NAME[FMH::MODEL_KEY::CONTEXT],context}}; QVariantMap albumsTagMap {{FMH::MODEL_NAME[FMH::MODEL_KEY::TAG],value}, {FMH::MODEL_NAME[FMH::MODEL_KEY::CONTEXT],context}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST],artist}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM],album}}; insert(TABLEMAP[TABLE::TAGS],tagMap); insert(TABLEMAP[TABLE::ALBUMS_TAGS],albumsTagMap); return true; } bool CollectionDB::addPlaylist(const QString &title) { if(!title.isEmpty()) { QVariantMap playlist {{FMH::MODEL_NAME[FMH::MODEL_KEY::PLAYLIST], title}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ADDDATE], QDateTime::currentDateTime()}}; if(insert(TABLEMAP[TABLE::PLAYLISTS],playlist)) return true; } return false; } bool CollectionDB::trackPlaylist(const QString &url, const QString &playlist) { QVariantMap map {{FMH::MODEL_NAME[FMH::MODEL_KEY::PLAYLIST],playlist}, {FMH::MODEL_NAME[FMH::MODEL_KEY::URL],url}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ADDDATE],QDate::currentDate()}}; if(insert(TABLEMAP[TABLE::TRACKS_PLAYLISTS],map)) return true; return false; } bool CollectionDB::addFolder(const QString &url) { QVariantMap map {{FMH::MODEL_NAME[FMH::MODEL_KEY::URL],url}, {FMH::MODEL_NAME[FMH::MODEL_KEY::ADDDATE],QDateTime::currentDateTime()}}; if(insert(TABLEMAP[TABLE::FOLDERS],map)) return true; return false; } FMH::MODEL_LIST CollectionDB::getDBData(const QStringList &urls) { FMH::MODEL_LIST mapList; - for(auto url : urls) + for(const auto &url : urls) { - auto queryTxt = QString("SELECT * FROM %1 t INNER JOIN albums a on a.album = t.album and a.artist = t.artist WHERE t.%2 = \"%3\"").arg(TABLEMAP[TABLE::TRACKS], + const auto queryTxt = QString("SELECT * FROM %1 t INNER JOIN albums a on a.album = t.album and a.artist = t.artist WHERE t.%2 = \"%3\"").arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::URL], url); mapList << this->getDBData(queryTxt); } return mapList; } FMH::MODEL_LIST CollectionDB::getDBData(const QString &queryTxt, std::function modifier) { FMH::MODEL_LIST mapList; auto query = this->getQuery(queryTxt); if(query.exec()) { while(query.next()) { FMH::MODEL data; - for(auto key : FMH::MODEL_NAME.keys()) + for(const auto &key : FMH::MODEL_NAME.keys()) if(query.record().indexOf(FMH::MODEL_NAME[key]) > -1) data.insert(key, query.value(FMH::MODEL_NAME[key]).toString()); if(modifier) modifier(data); mapList << data; } }else qDebug()<< query.lastError()<< query.lastQuery(); return mapList; } -QVariantList CollectionDB::getDBDataQML(const QString &queryTxt) -{ - QVariantList mapList; - - auto query = this->getQuery(queryTxt); - - if(query.exec()) - { - while(query.next()) - { - QVariantMap data; - for(auto key : FMH::MODEL_NAME.keys()) - if(query.record().indexOf(FMH::MODEL_NAME[key])>-1) - data[FMH::MODEL_NAME[key]] = query.value(FMH::MODEL_NAME[key]).toString(); - - mapList<< data; - } - - }else qDebug()<< (query.lastError().text()+" "+query.lastQuery()); - - return mapList; -} - QStringList CollectionDB::dataToList(const FMH::MODEL_LIST &list, const FMH::MODEL_KEY &key) { - if(list.isEmpty()) return QStringList(); + QStringList res; - QStringList response; - for(auto track : list) - response << track[key]; + if(list.isEmpty()) + return res; - return response; + for(const auto &item : list) + res << item[key]; + + return res; } FMH::MODEL_LIST CollectionDB::getAlbumTracks(const QString &album, const QString &artist, const FMH::MODEL_KEY &orderBy, const BAE::W &order) { - auto queryTxt = QString("SELECT * FROM %1 WHERE %2 = \"%3\" AND %4 = \"%5\" ORDER by %6 %7").arg(TABLEMAP[TABLE::TRACKS], + const auto queryTxt = QString("SELECT * FROM %1 WHERE %2 = \"%3\" AND %4 = \"%5\" ORDER by %6 %7").arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], artist, FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM], album, FMH::MODEL_NAME[orderBy], SLANG[order]); return this->getDBData(queryTxt); } FMH::MODEL_LIST CollectionDB::getArtistTracks(const QString &artist, const FMH::MODEL_KEY &orderBy, const BAE::W &order) { - auto queryTxt = QString("SELECT * FROM %1 WHERE %2 = \"%3\" ORDER by %4 %5, %6 %5").arg(TABLEMAP[TABLE::TRACKS], + const auto queryTxt = QString("SELECT * FROM %1 WHERE %2 = \"%3\" ORDER by %4 %5, %6 %5").arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], artist, FMH::MODEL_NAME[orderBy], SLANG[order], FMH::MODEL_NAME[FMH::MODEL_KEY::TRACK]); return this->getDBData(queryTxt); } QStringList CollectionDB::getArtistAlbums(const QString &artist) { QStringList albums; - auto queryTxt = QString("SELECT %4 FROM %1 WHERE %2 = \"%3\" ORDER BY %4 ASC").arg(TABLEMAP[TABLE::ALBUMS], + const auto queryTxt = QString("SELECT %4 FROM %1 WHERE %2 = \"%3\" ORDER BY %4 ASC").arg(TABLEMAP[TABLE::ALBUMS], FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], artist, FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM]); auto query = this->getDBData(queryTxt); - for(auto track : query) + for(const auto &track : query) albums << track[FMH::MODEL_KEY::ALBUM]; return albums; } FMH::MODEL_LIST CollectionDB::getBabedTracks(const FMH::MODEL_KEY &orderBy, const BAE::W &order) { - auto queryTxt = QString("SELECT * FROM %1 WHERE %2 = 1 ORDER by %3 %4").arg(TABLEMAP[TABLE::TRACKS], + const auto queryTxt = QString("SELECT * FROM %1 WHERE %2 = 1 ORDER by %3 %4").arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::FAV], FMH::MODEL_NAME[orderBy], SLANG[order]); return this->getDBData(queryTxt); } FMH::MODEL_LIST CollectionDB::getSearchedTracks(const FMH::MODEL_KEY &where, const QString &search) { QString queryTxt; if(where == FMH::MODEL_KEY::COUNT || where == FMH::MODEL_KEY::RATE || where == FMH::MODEL_KEY::FAV) queryTxt = QString("SELECT t.*, al.artwork FROM %1 t inner join albums al on al.album = t.album and t.artist = al.artist WHERE %2 = \"%3\"").arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[where], search); else if(where == FMH::MODEL_KEY::WIKI) queryTxt = QString("SELECT DISTINCT t.*, al.artwork FROM %1 t INNER JOIN %2 al ON t.%3 = al.%3 INNER JOIN %4 ar ON t.%5 = ar.%5 WHERE al.%6 LIKE \"%%7%\" OR ar.%6 LIKE \"%%7%\" COLLATE NOCASE").arg(TABLEMAP[TABLE::TRACKS], TABLEMAP[TABLE::ALBUMS], FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM], TABLEMAP[TABLE::ARTISTS], FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], FMH::MODEL_NAME[where], search); else if(where == FMH::MODEL_KEY::PLAYLIST) queryTxt = QString("SELECT t.* FROM %1 t INNER JOIN %2 tp ON t.%3 = tp.%3 WHERE tp.%4 = \"%5\"").arg(TABLEMAP[TABLE::TRACKS], TABLEMAP[TABLE::TRACKS_PLAYLISTS], FMH::MODEL_NAME[FMH::MODEL_KEY::URL], FMH::MODEL_NAME[where], search); else if(where == FMH::MODEL_KEY::TAG) queryTxt = QString("SELECT t.* FROM %1 t INNER JOIN %2 tt ON t.%3 = tt.%3 WHERE tt.%4 = \"%5\" COLLATE NOCASE " "UNION " "SELECT t.* FROM %1 t INNER JOIN %6 at ON t.%7 = at.%7 AND t.%8 = at.%8 WHERE at.%4 = \"%5\" COLLATE NOCASE " "UNION " "SELECT t.* FROM %1 t INNER JOIN %9 art ON t.%8 = art.%8 WHERE art.%4 LIKE \"%%5%\" COLLATE NOCASE " "UNION " "SELECT DISTINCT t.* FROM %1 t INNER JOIN %9 at ON t.%8 = at.%4 WHERE at.%8 LIKE \"%%5%\" COLLATE NOCASE").arg( TABLEMAP[TABLE::TRACKS], TABLEMAP[TABLE::TRACKS_TAGS], FMH::MODEL_NAME[FMH::MODEL_KEY::URL], FMH::MODEL_NAME[where], search, TABLEMAP[TABLE::ALBUMS_TAGS], FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM], FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], TABLEMAP[TABLE::ARTISTS_TAGS]); // else if(where == FMH::MODEL_KEY::SQL) // queryTxt = search; else queryTxt = QString("SELECT t.*, al.artwork FROM %1 t inner join albums al on al.album = t.album and t.artist = al.artist WHERE t.%2 LIKE \"%%3%\" ORDER BY strftime(\"%s\", t.addDate) desc LIMIT 1000").arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[where], search); return this->getDBData(queryTxt); } FMH::MODEL_LIST CollectionDB::getPlaylistTracks(const QString &playlist, const FMH::MODEL_KEY &orderBy, const BAE::W &order) { - auto queryTxt= QString("SELECT t.* FROM %1 t INNER JOIN %2 tp ON t.%3 = tp.%3 WHERE tp.%4 = '%5' ORDER BY tp.%6 %7").arg(TABLEMAP[TABLE::TRACKS], + const auto queryTxt= QString("SELECT t.* FROM %1 t INNER JOIN %2 tp ON t.%3 = tp.%3 WHERE tp.%4 = '%5' ORDER BY tp.%6 %7").arg(TABLEMAP[TABLE::TRACKS], TABLEMAP[TABLE::TRACKS_PLAYLISTS], FMH::MODEL_NAME[FMH::MODEL_KEY::URL], FMH::MODEL_NAME[FMH::MODEL_KEY::PLAYLIST], playlist, FMH::MODEL_NAME[orderBy], SLANG[order]); return this->getDBData(queryTxt); } FMH::MODEL_LIST CollectionDB::getFavTracks(const int &stars, const int &limit, const FMH::MODEL_KEY &orderBy, const BAE::W &order) { - auto queryTxt= QString("SELECT * FROM %1 WHERE %2 >= %3 ORDER BY %4 %5 LIMIT %6" ).arg(TABLEMAP[TABLE::TRACKS], + const auto queryTxt= QString("SELECT * FROM %1 WHERE %2 >= %3 ORDER BY %4 %5 LIMIT %6" ).arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::RATE], QString::number(stars), FMH::MODEL_NAME[orderBy],SLANG[order],QString::number(limit)); return this->getDBData(queryTxt); } FMH::MODEL_LIST CollectionDB::getRecentTracks(const int &limit, const FMH::MODEL_KEY &orderBy, const BAE::W &order) { - auto queryTxt= QString("SELECT * FROM %1 ORDER BY strftime(\"%s\",%2) %3 LIMIT %4" ).arg(TABLEMAP[TABLE::TRACKS], + const auto queryTxt= QString("SELECT * FROM %1 ORDER BY strftime(\"%s\",%2) %3 LIMIT %4" ).arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[orderBy],SLANG[order],QString::number(limit)); return this->getDBData(queryTxt); } FMH::MODEL_LIST CollectionDB::getOnlineTracks(const FMH::MODEL_KEY &orderBy, const BAE::W &order) { - auto queryTxt= QString("SELECT * FROM %1 WHERE %2 LIKE \"%3%\" ORDER BY %4 %5" ).arg(TABLEMAP[TABLE::TRACKS], + const auto queryTxt= QString("SELECT * FROM %1 WHERE %2 LIKE \"%3%\" ORDER BY %4 %5" ).arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::URL], YoutubeCachePath, FMH::MODEL_NAME[orderBy], SLANG[order]); return this->getDBData(queryTxt); } QStringList CollectionDB::getSourcesFolders() { - auto data = this->getDBData("select * from folders order by strftime(\"%s\", addDate) desc"); - - if(data.isEmpty()) return QStringList(); - + const auto data = this->getDBData("select * from folders order by strftime(\"%s\", addDate) desc"); return this->dataToList(data, FMH::MODEL_KEY::URL); } FMH::MODEL_LIST CollectionDB::getMostPlayedTracks(const int &greaterThan, const int &limit, const FMH::MODEL_KEY &orderBy, const BAE::W &order) { auto queryTxt = QString("SELECT * FROM %1 WHERE %2 > %3 ORDER BY %4 %5 LIMIT %6" ).arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::COUNT], QString::number(greaterThan), FMH::MODEL_NAME[orderBy], SLANG[order], QString::number(limit)); return this->getDBData(queryTxt); } QString CollectionDB::trackColorTag(const QString &path) { QString color; auto query = this->getDBData(QString("SELECT %1 FROM %2 WHERE %3 = \"%4\"").arg(FMH::MODEL_NAME[FMH::MODEL_KEY::COLOR], TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::URL],path)); for(auto track : query) color = track[FMH::MODEL_KEY::COLOR]; return color; } QStringList CollectionDB::getTrackTags(const QString &path) { Q_UNUSED(path); return {}; } int CollectionDB::getTrackStars(const QString &path) { int stars = 0; auto query = this->getDBData(QString("SELECT %1 FROM %2 WHERE %3 = \"%4\"").arg(FMH::MODEL_NAME[FMH::MODEL_KEY::RATE], TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::URL],path)); for(auto track : query) stars = track[FMH::MODEL_KEY::RATE].toInt(); return stars; } //QStringList CollectionDB::getArtistTags(const QString &artist) //{ // QStringList tags; // auto queryStr = QString("SELECT at.%1 FROM %2 at " // "INNER JOIN %3 ta ON ta.%1 = at.%1 " // "WHERE ta.%4 = '%5' " // "AND at.%6 = \"%7\"").arg(FMH::MODEL_NAME[KEY::TAG], // TABLEMAP[TABLE::ARTISTS_TAGS], // TABLEMAP[TABLE::TAGS], // FMH::MODEL_NAME[KEY::CONTEXT], // PULPO::CONTEXT_MAP[PULPO::CONTEXT::ARTIST_SIMILAR], // FMH::MODEL_NAME[KEY::ARTIST],artist); // auto query = this->getDBData(queryStr); // for(auto track : query) // tags << track[KEY::TAG]; // return tags; //} //QStringList CollectionDB::getAlbumTags(const QString &album, const QString &artist) //{ // QStringList tags; // auto queryStr = QString("SELECT at.%1 FROM %2 at " // "INNER JOIN %3 ta ON ta.%1 = at.%1 " // "WHERE ta.%4 = '%5' AND at.%6 = \"%7\" AND at.%8 = \"%9\"").arg(FMH::MODEL_NAME[KEY::TAG], // TABLEMAP[TABLE::ALBUMS_TAGS], // TABLEMAP[TABLE::TAGS], // FMH::MODEL_NAME[KEY::CONTEXT], // PULPO::CONTEXT_MAP[PULPO::CONTEXT::TAG], // FMH::MODEL_NAME[KEY::ALBUM],album, // FMH::MODEL_NAME[KEY::ARTIST],artist); // auto query = this->getDBData(queryStr); // for(auto track : query) // tags << track[KEY::TAG]; // return tags; //} QStringList CollectionDB::getPlaylistsList() { QStringList playlists; auto queryTxt = QString("SELECT %1, %2 FROM %3 ORDER BY %2 DESC").arg(FMH::MODEL_NAME[FMH::MODEL_KEY::PLAYLIST], FMH::MODEL_NAME[FMH::MODEL_KEY::ADDDATE], TABLEMAP[TABLE::PLAYLISTS]); for(auto data : this->getDBData(queryTxt)) playlists << data[FMH::MODEL_KEY::PLAYLIST]; return playlists; } FMH::MODEL_LIST CollectionDB::getPlaylists() { auto queryTxt = QString("SELECT %1, %2 FROM %3 ORDER BY %2 DESC").arg(FMH::MODEL_NAME[FMH::MODEL_KEY::PLAYLIST], FMH::MODEL_NAME[FMH::MODEL_KEY::ADDDATE], TABLEMAP[TABLE::PLAYLISTS]); return this->getDBData(queryTxt); } bool CollectionDB::removeTrack(const QString &path) { auto queryTxt = QString("DELETE FROM %1 WHERE %2 = \"%3\"").arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::URL],path); auto query = this->getQuery(queryTxt); if(query.exec()) { if(cleanAlbums()) cleanArtists(); return true; } return false; } QSqlQuery CollectionDB::getQuery(const QString &queryTxt) { return QSqlQuery(queryTxt, this->m_db); } bool CollectionDB::removeSource(const QString &url) { const auto path = url.endsWith("/") ? url.chopped(1) : url; auto queryTxt = QString("DELETE FROM %1 WHERE %2 LIKE \"%3%\"").arg(TABLEMAP[TABLE::TRACKS_PLAYLISTS], FMH::MODEL_NAME[FMH::MODEL_KEY::URL], path); qDebug() << queryTxt; auto query = this->getQuery(queryTxt); if(query.exec()) { queryTxt = QString("DELETE FROM %1 WHERE %2 LIKE \"%3%\"").arg(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::SOURCE], path); query.prepare(queryTxt); if(query.exec()) { queryTxt = QString("DELETE FROM %1 WHERE %2 LIKE \"%3%\"").arg(TABLEMAP[TABLE::SOURCES], FMH::MODEL_NAME[FMH::MODEL_KEY::URL],path); query.prepare(queryTxt); if(query.exec()) { this->removeFolder(path); if(cleanAlbums()) cleanArtists(); return true; } } } return false; } sourceTypes CollectionDB::sourceType(const QString &url) { /*for now*/ Q_UNUSED(url); return sourceTypes::LOCAL; } /*******************OLD STUFF********************/ void CollectionDB::insertArtwork(const FMH::MODEL &track) { auto artist = track[FMH::MODEL_KEY::ARTIST]; auto album =track[FMH::MODEL_KEY::ALBUM]; auto path = track[FMH::MODEL_KEY::ARTWORK]; switch(BAE::albumType(track)) { case TABLE::ALBUMS : { auto queryStr = QString("UPDATE %1 SET %2 = \"%3\" WHERE %4 = \"%5\" AND %6 = \"%7\"").arg(TABLEMAP[TABLE::ALBUMS], FMH::MODEL_NAME[FMH::MODEL_KEY::ARTWORK], path.isEmpty() ? SLANG[W::NONE] : path, FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM], album, FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], artist); auto query = this->getQuery(queryStr); if(!query.exec())qDebug()<<"COULDNT Artwork[cover] inerted into DB"<getQuery(queryStr); if(!query.exec())qDebug()<<"COULDNT Artwork[head] inerted into DB"<getQuery(queryTxt); return query.exec(); } bool CollectionDB::removePlaylist(const QString &playlist) { QString queryTxt; queryTxt = QString("DELETE FROM %1 WHERE %2 = \"%3\"").arg(TABLEMAP[TABLE::TRACKS_PLAYLISTS], FMH::MODEL_NAME[FMH::MODEL_KEY::PLAYLIST],playlist); auto query = this->getQuery(queryTxt); if(!query.exec()) return false; queryTxt = QString("DELETE FROM %1 WHERE %2 = \"%3\"").arg(TABLEMAP[TABLE::PLAYLISTS], FMH::MODEL_NAME[FMH::MODEL_KEY::PLAYLIST],playlist); query.prepare(queryTxt); return query.exec(); } void CollectionDB::removeMissingTracks() { auto tracks = this->getDBData("select url from tracks"); for(auto track : tracks) if(!BAE::fileExists(track[FMH::MODEL_KEY::URL])) this->removeTrack(track[FMH::MODEL_KEY::URL]); } bool CollectionDB::removeArtwork(const QString &table, const QVariantMap &item) { return this->update(table, {{FMH::MODEL_KEY::ARTWORK, ""}}, item); } bool CollectionDB::removeArtist(const QString &artist) { const auto queryTxt = QString("DELETE FROM %1 WHERE %2 = \"%3\" ").arg(TABLEMAP[TABLE::ARTISTS], FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST],artist); auto query = this->getQuery(queryTxt); return query.exec(); } bool CollectionDB::cleanArtists() { // delete from artists where artist in (select artist from artists except select distinct artist from tracks); const auto queryTxt=QString("DELETE FROM %1 WHERE %2 IN (SELECT %2 FROM %1 EXCEPT SELECT DISTINCT %2 FROM %3)").arg( TABLEMAP[TABLE::ARTISTS], FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], TABLEMAP[TABLE::TRACKS] ); qDebug()<getQuery(queryTxt); emit this->artistsCleaned(query.numRowsAffected()); return query.exec(); } bool CollectionDB::removeFolder(const QString &url) { const auto queryTxt=QString("DELETE FROM %1 WHERE %2 LIKE \"%3%\"").arg( TABLEMAP[TABLE::FOLDERS], FMH::MODEL_NAME[FMH::MODEL_KEY::URL], url); qDebug()<getQuery(queryTxt); return query.exec(); } bool CollectionDB::favTrack(const QString &path, const bool &value) { if(this->update(TABLEMAP[TABLE::TRACKS], FMH::MODEL_NAME[FMH::MODEL_KEY::FAV], value ? 1 : 0, FMH::MODEL_NAME[FMH::MODEL_KEY::URL], path)) return true; return false; } bool CollectionDB::removeAlbum(const QString &album, const QString &artist) { - auto queryTxt = QString("DELETE FROM %1 WHERE %2 = \"%3\" AND %4 = \"%5\"").arg(TABLEMAP[TABLE::ALBUMS], + const auto queryTxt = QString("DELETE FROM %1 WHERE %2 = \"%3\" AND %4 = \"%5\"").arg(TABLEMAP[TABLE::ALBUMS], FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM], album, FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], artist); auto query = this->getQuery(queryTxt); return query.exec(); } bool CollectionDB::cleanAlbums() { // delete from albums where (album, artist) in (select a.album, a.artist from albums a except select distinct album, artist from tracks); - auto queryTxt=QString("DELETE FROM %1 WHERE (%2, %3) IN (SELECT %2, %3 FROM %1 EXCEPT SELECT DISTINCT %2, %3 FROM %4)").arg( + const auto queryTxt=QString("DELETE FROM %1 WHERE (%2, %3) IN (SELECT %2, %3 FROM %1 EXCEPT SELECT DISTINCT %2, %3 FROM %4)").arg( TABLEMAP[TABLE::ALBUMS], FMH::MODEL_NAME[FMH::MODEL_KEY::ALBUM], FMH::MODEL_NAME[FMH::MODEL_KEY::ARTIST], TABLEMAP[TABLE::TRACKS] ); qDebug()<getQuery(queryTxt); emit albumsCleaned(query.numRowsAffected()); return query.exec(); } diff --git a/main.qml b/main.qml index 69e09e5..3162d48 100644 --- a/main.qml +++ b/main.qml @@ -1,1040 +1,1040 @@ import QtQuick 2.9 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 import QtQuick.Controls.Material 2.1 import "utils" import "widgets" import "widgets/PlaylistsView" import "widgets/MainPlaylist" import "widgets/SettingsView" import "widgets/SearchView" //import "widgets/CloudView" import "view_models" import "view_models/BabeTable" import "services/local" import "services/web" //import "services/web/Spotify" import "view_models/BabeGrid" import "widgets/InfoView" import "db/Queries.js" as Q import "utils/Help.js" as H import "utils/Player.js" as Player import org.kde.kirigami 2.6 as Kirigami import org.kde.mauikit 1.0 as Maui import FMList 1.0 import Player 1.0 import AlbumsList 1.0 import TracksList 1.0 import BaseModel 1.0 import TracksList 1.0 Maui.ApplicationWindow { id: root title: qsTr("vvave") /***************************************************/ /******************** ALIASES ********************/ /*************************************************/ property alias mainPlaylist: mainPlaylist property alias selectionBar: _selectionBar property alias progressBar: progressBar about.appIcon: "qrc:/assets/vvave.svg" about.appDescription: qsTr("VVAVE will handle your whole music collection by retreaving semantic information from the web. Just relax, enjoy and discover your new music ") showAccounts: false /***************************************************/ /******************** PLAYBACK ********************/ /*************************************************/ property bool isShuffle: Maui.FM.loadSettings("SHUFFLE","PLAYBACK", false) property var currentTrack: ({ fav: "0", stars: "0" }) property int currentTrackIndex: -1 property int prevTrackIndex: 0 property string currentArtwork: !mainlistEmpty ? mainPlaylist.list.get(0).artwork : "" property bool currentBabe: currentTrack.fav == "0" ? false : true property alias durationTimeLabel: player.duration property string progressTimeLabel: player.transformTime(player.position/1000) property alias isPlaying: player.playing property int onQueue: 0 property bool mainlistEmpty: !mainPlaylist.table.count > 0 /***************************************************/ /******************** HANDLERS ********************/ /*************************************************/ property int currentView: viewsIndex.tracks readonly property var viewsIndex: ({ tracks: 0, albums: 1, artists: 2, playlists: 3, search: 4, folders: 5, // cloud: 6, // vvave: 7, // linking: 8, youtube: 6, // spotify: 10 }) property string syncPlaylist: "" property bool sync: false property string infoMsg: "" property bool infoLabels: Maui.FM.loadSettings("LABELS", "PLAYBACK", false) == "true" ? true : false // property bool isLinked: false // property bool isServing: false // property bool focusMode : false property bool selectionMode : false /***************************************************/ /******************** UI COLORS *******************/ /*************************************************/ readonly property color babeColor: "#f84172" /*SIGNALS*/ signal missingAlert(var track) /*HANDLE EVENTS*/ onClosing: Player.savePlaylist() onMissingAlert: { var message = track.title + " by " + track.artist + " is missing" var messageBody = "Do you want to remove it from your collection?" notify("alert", message, messageBody, function () { // bae.removeTrack(currentTrack.url) //todo mainPlaylist.table.model.remove(mainPlaylist.table.currentIndex) }) } /*COMPONENTS*/ Player { id: player volume: 100 onFinishedChanged: if (!mainlistEmpty) { if (currentTrack.url) mainPlaylist.list.countUp(currentTrackIndex) Player.nextTrack() } } // BabeNotify // { // id: babeNotify //todo // } /* UI */ altToolBars: false accentColor: babeColor headBarFGColor: altColorText headBarBGColor: "#212121" altColorText: darkTextColor floatingBar: false headBar.spacing: space.big headBar.middleContent : [ Maui.ToolButton { iconName: "view-media-track" active: currentView === viewsIndex.tracks showIndicator: true iconColor: active ? babeColor : altColorText onClicked: currentView = viewsIndex.tracks text: qsTr("Tracks") colorScheme.highlightColor: babeColor spacing: 0 }, Maui.ToolButton { text: qsTr("Albums") active: currentView === viewsIndex.albums iconName: /*"album"*/ "view-media-album-cover" iconColor: currentView === viewsIndex.albums ? babeColor : altColorText onClicked: currentView = viewsIndex.albums colorScheme.highlightColor: babeColor showIndicator: true }, Maui.ToolButton { text: qsTr("Artists") active: currentView === viewsIndex.artists iconName: "view-media-artist" iconColor: currentView === viewsIndex.artists ? babeColor : altColorText onClicked: currentView = viewsIndex.artists colorScheme.highlightColor: babeColor showIndicator: true }, Maui.ToolButton { text: qsTr("Playlists") active: currentView === viewsIndex.playlists iconName: "view-media-playlist" iconColor: currentView === viewsIndex.playlists ? babeColor : altColorText onClicked: currentView = viewsIndex.playlists colorScheme.highlightColor: babeColor showIndicator: true } ] footBar.visible: !mainlistEmpty footBar.implicitHeight: footBar.visible ? toolBarHeight * 1.2 : 0 page.footBarItem: ColumnLayout { id: _footerLayout height: footBar.height width: root.width spacing: 0 Slider { id: progressBar Layout.preferredHeight: unit * (isMobile ? 6 : 8) Layout.fillWidth: true padding: 0 from: 0 to: 1000 value: player.pos spacing: 0 focus: true onMoved: { player.pos = value } background: Rectangle { implicitWidth: progressBar.width implicitHeight: progressBar.height width: progressBar.availableWidth height: implicitHeight color: "transparent" Rectangle { width: progressBar.visualPosition * parent.width height: progressBar.height color: babeColor } } handle: Rectangle { x: progressBar.leftPadding + progressBar.visualPosition * (progressBar.availableWidth - width) y: -(progressBar.height * 0.8) implicitWidth: progressBar.pressed ? iconSizes.medium : 0 implicitHeight: progressBar.pressed ? iconSizes.medium : 0 radius: progressBar.pressed ? iconSizes.medium : 0 color: babeColor } } Kirigami.Separator { Layout.fillWidth: true color: borderColor } Maui.ToolBar { Layout.fillHeight: true Layout.fillWidth: true leftContent: Maui.ToolButton { iconName: "headphones" visible: _drawer.modal iconColor: _drawer.visible ? babeColor : textColor onClicked: _drawer.visible = !_drawer.visible colorScheme.highlightColor: babeColor // text: qsTr("Now") } middleContent: [ Maui.ToolButton { id: babeBtnIcon iconName: "love" iconColor: currentBabe ? babeColor : textColor onClicked: if (!mainlistEmpty) { mainPlaylist.list.fav(currentTrackIndex, !(mainPlaylist.list.get(currentTrackIndex).fav == "1")) currentBabe = mainPlaylist.list.get(currentTrackIndex).fav == "1" } }, Maui.ToolButton { iconName: "media-skip-backward" iconColor: textColor onClicked: Player.previousTrack() onPressAndHold: Player.playAt(prevTrackIndex) }, Maui.ToolButton { id: playIcon iconColor: textColor iconName: isPlaying ? "media-playback-pause" : "media-playback-start" onClicked: player.playing = !player.playing }, Maui.ToolButton { id: nextBtn iconColor: textColor iconName: "media-skip-forward" onClicked: Player.nextTrack() onPressAndHold: Player.playAt(Player.shuffle()) }, Maui.ToolButton { id: shuffleBtn iconColor: babeColor iconName: isShuffle ? "media-playlist-shuffle" : "media-playlist-normal" onClicked: { isShuffle = !isShuffle Maui.FM.saveSettings("SHUFFLE", isShuffle, "PLAYBACK") } } ] } } leftIcon.iconColor: currentView === viewsIndex.search ? babeColor : altColorText onSearchButtonClicked: { currentView = viewsIndex.search searchView.searchInput.forceActiveFocus() } InfoView { id: infoView maxWidth: parent.width * 0.8 maxHeight: parent.height * 0.9 } Maui.ShareDialog { id: shareDialog } Maui.FileDialog { id: fmDialog } SourcesDialog { id: sourcesDialog } mainMenu: [ // Maui.MenuItem // { // text: "Vvave Stream" // icon.name: "headphones" // onTriggered: // { // pageStack.currentIndex = 1 // currentView = viewsIndex.vvave // } // }, Maui.MenuItem { text: qsTr("Folders") icon.name: "folder" onTriggered: currentView = viewsIndex.folders }, // Maui.MenuItem // { // text: qsTr("Linking") // icon.name: "view-links" // onTriggered: // { // pageStack.currentIndex = 1 // currentView = viewsIndex.linking // if(!isLinked) linkingView.linkingConf.open() // } // }, Maui.MenuItem { text: qsTr("YouTube") icon.name: "internet-services" onTriggered: currentView = viewsIndex.youtube }, // Maui.MenuItem // { // text: qsTr("Cloud") // icon.name: "folder-cloud" // onTriggered: // { // pageStack.currentIndex = 1 // currentView = viewsIndex.cloud // } // }, // Maui.MenuItem // { // text: qsTr("Spotify") // icon.name: "internet-services" // onTriggered: // { // pageStack.currentIndex = 1 // currentView = viewsIndex.spotify // } // }, MenuSeparator{}, Maui.MenuItem { text: qsTr("Sources...") icon.name: "folder-add" onTriggered: sourcesDialog.open() }, Maui.MenuItem { text: qsTr("Open...") icon.name: "folder-add" onTriggered: { fmDialog.onlyDirs = false fmDialog.filterType = FMList.AUDIO fmDialog.show(function(paths) { vvave.openUrls(paths) }) } } // Maui.Menu // { // title: qsTr("Collection") // // icon.name: "settings-configure" // Maui.MenuItem // { // text: qsTr("Re-Scan") // onTriggered: bae.refreshCollection(); // } // Maui.MenuItem // { // text: qsTr("Refresh...") // onTriggered: H.refreshCollection(); // } // Maui.MenuItem // { // text: qsTr("Clean") // onTriggered: bae.removeMissingTracks(); // } // }, // Maui.Menu // { // title: qsTr("Settings...") // // Kirigami.Action // // { // // text: "Brainz" // // Kirigami.Action // // { // // id: brainzToggle // // text: checked ? "Turn OFF" : "Turn ON" // // checked: bae.brainzState() // // checkable: true // // onToggled: // // { // // checked = !checked // // bae.saveSetting("AUTO", checked, "BRAINZ") // //// bae.brainz(checked) // // } // // } // // } // Maui.MenuItem // { // text: "Info label" + checked ? "ON" : "OFF" // checked: infoLabels // checkable: true // onToggled: // { // infoLabels = checked // bae.saveSetting("LABELS", infoLabels ? true : false, "PLAYBACK") // } // } // Maui.MenuItem // { // text: "Autoplay" // checked: autoplay // checkable: true // onToggled: // { // autoplay = checked // bae.saveSetting("AUTOPLAY", autoplay ? true : false, "BABE") // } // } // } ] Item { id: message visible: infoMsg.length && sync anchors.bottom: parent.bottom width: parent.width height: iconSize z: 999 Rectangle { id: infoBg anchors.fill: parent z: -999 color: altColor opacity: 0.8 SequentialAnimation { id: animBg PropertyAnimation { target: infoBg property: "color" easing.type: Easing.InOutQuad to: babeColor duration: 250 } PropertyAnimation { target: infoBg property: "color" easing.type: Easing.InOutQuad to: altColor duration: 500 } } } Label { id: infoTxt anchors.centerIn: parent anchors.fill: parent height: parent.height width: parent.width font.pointSize: fontSizes.medium text: infoMsg horizontalAlignment: Qt.AlignHCenter verticalAlignment: Qt.AlignVCenter color: textColor SequentialAnimation { id: animTxt PropertyAnimation { target: infoTxt property: "color" easing.type: Easing.InOutQuad to: "white" duration: 250 } PropertyAnimation { target: infoTxt property: "color" easing.type: Easing.InOutQuad to: textColor duration: 500 } } } } PlaylistDialog { id: playlistDialog } globalDrawer: Maui.GlobalDrawer { id: _drawer width: Kirigami.Units.gridUnit * 15 height: root.height - root.headBar.implicitHeight - root.footBar.implicitHeight - modal: root.width < _drawer.width + modal: root.width < _drawer.width*1.5 handleVisible: false closePolicy: Popup.NoAutoClose contentItem: MainPlaylist { id: mainPlaylist Connections { target: mainPlaylist onCoverPressed: Player.appendAll(tracks) onCoverDoubleClicked: Player.playAll(tracks) } } } ColumnLayout { anchors.fill: parent SwipeView { id: swipeView Layout.fillHeight: true Layout.fillWidth: true interactive: isMobile currentIndex: currentView onCurrentItemChanged: currentItem.forceActiveFocus() onCurrentIndexChanged: { currentView = currentIndex // if (!babeitView.isConnected && currentIndex === viewsIndex.vvave) // babeitView.logginDialog.open() } TracksView { id: tracksView Connections { target: tracksView onRowClicked: Player.addTrack(tracksView.list.get(index)) onQuickPlayTrack: Player.quickPlay(tracksView.list.get(index)) onPlayAll: { var query = Q.GET.allTracks mainPlaylist.list.clear() mainPlaylist.list.query = query Player.playAll() } onAppendAll: { mainPlaylist.list.appendQuery(Q.GET.allTracks) mainPlaylist.listView.positionViewAtEnd() } onQueueTrack: Player.queueTracks([tracksView.list.get(index)], index) } } AlbumsView { id: albumsView holder.emoji: "qrc:/assets/MusicBox.png" holder.isMask: false holder.title : "No Albums!" holder.body: "Add new music sources" holder.emojiSize: iconSizes.huge headBarTitle: count + qsTr(" albums") list.query: Albums.ALBUMS list.sortBy: Albums.ALBUM Connections { target: albumsView onRowClicked: Player.addTrack(track) onPlayTrack: Player.quickPlay(track) onAlbumCoverClicked: albumsView.populateTable(album, artist) onAlbumCoverPressedAndHold: { var query = Q.GET.albumTracks_.arg(album) query = query.arg(artist) mainPlaylist.list.clear() mainPlaylist.list.sortBy = Tracks.NONE mainPlaylist.list.query = query Player.playAll() } onPlayAll: { var query = Q.GET.albumTracks_.arg(album) query = query.arg(artist) query = query.arg(data.artist) mainPlaylist.list.clear() mainPlaylist.list.query = query Player.playAll() } onAppendAll: { var query = Q.GET.albumTracks_.arg(album) query = query.arg(artist) mainPlaylist.list.appendQuery(query) mainPlaylist.listView.positionViewAtEnd() } } } AlbumsView { id: artistsView holder.emoji: "qrc:/assets/MusicBox.png" holder.isMask: false holder.title : qsTr("No Artists!") holder.body: qsTr("Add new music sources") holder.emojiSize: iconSizes.huge headBarTitle: count + qsTr(" artists") list.query: Albums.ARTISTS list.sortBy: Albums.ARTIST table.list.sortBy: Tracks.NONE Connections { target: artistsView onRowClicked: Player.addTrack(track) onPlayTrack: Player.quickPlay(track) onAlbumCoverClicked: artistsView.populateTable(undefined, artist) onAlbumCoverPressedAndHold: { var query = Q.GET.artistTracks_.arg(artist) mainPlaylist.list.clear() mainPlaylist.list.sortBy = Tracks.NONE mainPlaylist.list.query = query Player.playAll() } onPlayAll: { var query = Q.GET.artistTracks_.arg(artist) query = query.arg(data.artist) mainPlaylist.list.clear() mainPlaylist.list.sortBy = Tracks.NONE mainPlaylist.list.query = query Player.playAll() } onAppendAll: { var query = Q.GET.artistTracks_.arg(artist) mainPlaylist.list.appendQuery(query) mainPlaylist.listView.positionViewAtEnd() } } } PlaylistsView { id: playlistsView Connections { target: playlistsView onRowClicked: Player.addTrack(track) onQuickPlayTrack: Player.quickPlay(track) onPlayAll: { var query = playlistsView.playlistQuery mainPlaylist.list.clear() mainPlaylist.list.sortBy = Tracks.NONE mainPlaylist.list.query = query Player.playAll() } onAppendAll: { var query = playlistsView.playlistQuery mainPlaylist.list.appendQuery(query) mainPlaylist.listView.positionViewAtEnd() } onPlaySync: { var query = playlistsView.playlistQuery mainPlaylist.list.appendQuery(query) Player.playAll() root.sync = true root.syncPlaylist = playlist root.infoMsg = qsTr("Syncing to ") + playlist } } } SearchTable { id: searchView Connections { target: searchView onRowClicked: Player.addTrack(searchView.list.get(index)) onQuickPlayTrack: Player.quickPlay(searchView.list.get(index)) onPlayAll: { mainPlaylist.list.clear() var tracks = searchView.list.getAll() for(var i in tracks) Player.appendTrack(tracks[i]) Player.playAll() } onAppendAll: Player.appendAll(searchView.list.getAll()) onArtworkDoubleClicked: { var query = Q.GET.albumTracks_.arg( searchView.searchTable.model.get( index).album) query = query.arg(searchView.searchTable.model.get( index).artist) mainPlaylist.list.clear() mainPlaylist.list.sortBy = Tracks.NONE mainPlaylist.list.query = query Player.playAll() } } } FoldersView { id: foldersView Connections { target: foldersView.list onRowClicked: Player.addTrack(foldersView.list.model.get(index)) onQuickPlayTrack: Player.quickPlay(foldersView.list.model.get(index)) onPlayAll: { mainPlaylist.list.clear() - mainPlaylist.list.sortBy = Tracks.NONE +// mainPlaylist.list.sortBy = Tracks.NONE mainPlaylist.list.query = foldersView.list.list.query Player.playAll() } onAppendAll: { var query = foldersView.list.list.query mainPlaylist.list.appendQuery(query) mainPlaylist.listView.positionViewAtEnd() } onQueueTrack: Player.queueTracks([foldersView.list.model.get(index)], index) } } // CloudView // { // id: cloudView // onQuickPlayTrack: Player.quickPlay(cloudView.list.get(index)) // } // BabeitView // { // id: babeitView // } // LinkingView // { // id: linkingView // } YouTube { id: youtubeView } // Spotify // { // id: spotifyView // } } Maui.SelectionBar { id: _selectionBar property alias listView: _selectionBar.selectionList Layout.fillWidth: true Layout.margins: space.big Layout.topMargin: space.small Layout.bottomMargin: space.big onIconClicked: _contextMenu.popup() onExitClicked: clear() colorScheme.backgroundColor: "#212121" model: BaseModel { list: _selectionBarModelList } Tracks { id: _selectionBarModelList } SelectionBarMenu { id: _contextMenu } function append(item) { if(selectedPaths.indexOf(item.path) < 0) { selectedItems.push(item) selectedPaths.push(item.path) // for(var i = 0; i < selectionList.count ; i++ ) // if(selectionList.model.get(i).path === item.path) // { // selectionList.model.remove(i) // return // } selectionList.model.list.append(item) selectionList.positionViewAtEnd() if(position === Qt.Vertical) return if(typeof(riseContent) === "undefined") return riseContent() } } } } /*animations*/ /*FUNCTIONS*/ function infoMsgAnim() { animBg.running = true animTxt.running = true } function toggleMaximized() { if (root.visibility === Window.Maximized) { root.showNormal(); } else { root.showMaximized(); } } /*CONNECTIONS*/ Connections { target: vvave onRefreshTables: H.refreshCollection(size) onRefreshTracks: H.refreshTracks() 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" // } onOpenFiles: { Player.appendTracksAt(tracks, 0) Player.playAt(0) } } } diff --git a/models/albums/albumsmodel.cpp b/models/albums/albumsmodel.cpp index 5224833..0c4aebf 100644 --- a/models/albums/albumsmodel.cpp +++ b/models/albums/albumsmodel.cpp @@ -1,271 +1,270 @@ #include "albumsmodel.h" #include "db/collectionDB.h" #include "utils/brain.h" #include AlbumsModel::AlbumsModel(QObject *parent) : BaseList(parent) { this->db = CollectionDB::getInstance(); connect(this, &AlbumsModel::queryChanged, this, &AlbumsModel::setList); } AlbumsModel::~AlbumsModel() {} FMH::MODEL_LIST AlbumsModel::items() const { return this->list; } void AlbumsModel::setQuery(const QUERY &query) { if(this->query == query) return; this->query = query; emit this->queryChanged(); } AlbumsModel::QUERY AlbumsModel::getQuery() const { return this->query; } void AlbumsModel::setSortBy(const SORTBY &sort) { if(this->sort == sort) return; this->sort = sort; emit this->preListChanged(); this->sortList(); emit this->postListChanged(); emit this->sortByChanged(); } AlbumsModel::SORTBY AlbumsModel::getSortBy() const { return this->sort; } void AlbumsModel::sortList() { const auto key = static_cast(this->sort); qDebug()<< "SORTING LIST BY"<< this->sort; std::sort(this->list.begin(), this->list.end(), [key](const FMH::MODEL &e1, const FMH::MODEL &e2) -> bool { const auto role = key; switch(role) { case FMH::MODEL_KEY::RELEASEDATE: { if(e1[role].toDouble() > e2[role].toDouble()) return true; break; } case FMH::MODEL_KEY::ADDDATE: { const auto date1 = QDateTime::fromString(e1[role], Qt::TextDate); const auto date2 = QDateTime::fromString(e2[role], Qt::TextDate); if(date1.secsTo(QDateTime::currentDateTime()) < date2.secsTo(QDateTime::currentDateTime())) return true; break; } case FMH::MODEL_KEY::ARTIST: case FMH::MODEL_KEY::ALBUM: { const auto str1 = QString(e1[role]).toLower(); const auto str2 = QString(e2[role]).toLower(); if(str1 < str2) return true; break; } default: if(e1[role] < e2[role]) return true; } return false; }); } - - void AlbumsModel::setList() { emit this->preListChanged(); QString m_Query; if(this->query == AlbumsModel::QUERY::ALBUMS) m_Query = "select * from albums order by album asc"; else if(this->query == AlbumsModel::QUERY::ARTISTS) m_Query = "select * from artists order by artist asc"; + //get albums data with modifier for missing images for artworks this->list = this->db->getDBData(m_Query, [=](FMH::MODEL &item) { if(!FMH::fileExists(item[FMH::MODEL_KEY::ARTWORK])) { this->db->removeArtwork(FMH::MODEL_NAME[static_cast(this->query)], FM::toMap(item)); item[FMH::MODEL_KEY::ARTWORK] = ""; } }); this->sortList(); emit this->postListChanged(); } void AlbumsModel::fetchInformation() { qDebug() << "RNUNGING BRAIN EFFORRTS"; QFutureWatcher *watcher = new QFutureWatcher; QObject::connect(watcher, &QFutureWatcher::finished, [=]() { watcher->deleteLater(); }); auto func = [=]() { QList requests; int index = -1; for(auto &album : this->list) { index++; if(!album[FMH::MODEL_KEY::ARTWORK].isEmpty()) continue; if(BAE::artworkCache(album, FMH::MODEL_KEY::ALBUM)) { qDebug()<< "cache artwork done" << album; db->insertArtwork(album); emit this->updateModel(index, {FMH::MODEL_KEY::ARTWORK}); continue; } PULPO::REQUEST request; request.track = album; request.ontology = this->query == AlbumsModel::QUERY::ALBUMS ? PULPO::ONTOLOGY::ALBUM : PULPO::ONTOLOGY::ARTIST; request.services = {PULPO::SERVICES::LastFm, PULPO::SERVICES::Spotify, PULPO::SERVICES::MusicBrainz}; request.info = {PULPO::INFO::ARTWORK}; request.callback = [=](PULPO::REQUEST request, PULPO::RESPONSES responses) { qDebug() << "DONE WITH " << request.track ; for(const auto &res : responses) { if(res.context == PULPO::CONTEXT::IMAGE && !res.value.toString().isEmpty()) { qDebug()<<"SAVING ARTWORK FOR: " << request.track[FMH::MODEL_KEY::ALBUM]; auto downloader = new FMH::Downloader; QObject::connect(downloader, &FMH::Downloader::fileSaved, [=](QString path) { qDebug()<< "Saving artwork file to" << path; FMH::MODEL newTrack = request.track; newTrack[FMH::MODEL_KEY::ARTWORK] = path; db->insertArtwork(newTrack); this->updateArtwork(index, path); downloader->deleteLater(); }); QStringList filePathList = res.value.toString().split('/'); const auto format = "." + filePathList.at(filePathList.count() - 1).split(".").last(); QString name = !request.track[FMH::MODEL_KEY::ALBUM].isEmpty() ? request.track[FMH::MODEL_KEY::ARTIST] + "_" + request.track[FMH::MODEL_KEY::ALBUM] : request.track[FMH::MODEL_KEY::ARTIST]; name.replace("/", "-"); name.replace("&", "-"); downloader->setFile(res.value.toString(), BAE::CachePath + name + format); } } }; requests << request; } Pulpo pulpo; QEventLoop loop; QObject::connect(&pulpo, &Pulpo::finished, &loop, &QEventLoop::quit); bool stop = false; QObject::connect(this, &AlbumsModel::destroyed, [&]() { qDebug()<< stop << &stop; stop = true; qDebug()<< stop << &stop; }); for(const auto &req : requests) { if(stop) { loop.quit(); return; } pulpo.request(req); loop.exec(); } }; QFuture t1 = QtConcurrent::run(func); watcher->setFuture(t1); } void AlbumsModel::updateArtwork(const int index, const QString &artwork) { if(index >= this->list.size() || index < 0) return; this->list[index][FMH::MODEL_KEY::ARTWORK] = artwork; emit this->updateModel(index, {FMH::MODEL_KEY::ARTWORK}); } QVariantMap AlbumsModel::get(const int &index) const { if(index >= this->list.size() || index < 0) return QVariantMap(); return FM::toMap(this->list.at(index)); } void AlbumsModel::append(const QVariantMap &item) { if(item.isEmpty()) return; emit this->preItemAppended(); FMH::MODEL model; for(auto key : item.keys()) model.insert(FMH::MODEL_NAME_KEY[key], item[key].toString()); this->list << model; emit this->postItemAppended(); } void AlbumsModel::append(const QVariantMap &item, const int &at) { if(item.isEmpty()) return; if(at > this->list.size() || at < 0) return; qDebug()<< "trying to append at" << at << item["title"]; emit this->preItemAppendedAt(at); FMH::MODEL model; for(auto key : item.keys()) model.insert(FMH::MODEL_NAME_KEY[key], item[key].toString()); this->list.insert(at, model); emit this->postItemAppended(); } void AlbumsModel::refresh() { this->setList(); } diff --git a/utils/Player.js b/utils/Player.js index 7dbd97b..0e98359 100644 --- a/utils/Player.js +++ b/utils/Player.js @@ -1,238 +1,238 @@ .import org.kde.mauikit 1.0 as Maui function playTrack(index) { if((index < mainPlaylist.listView.count) && (mainPlaylist.listView.count > 0) && (index > -1)) { currentTrack = mainPlaylist.list.get(index) if(typeof(currentTrack) === "undefined") return if(Maui.FM.fileExists(currentTrack.url)) { player.url = currentTrack.url; player.playing = true if(currentTrack.artwork && currentTrack.artwork.length && currentTrack.artwork !== "NONE") currentArtwork = currentTrack.artwork // else bae.loadCover(currentTrack.url) progressBar.enabled = true if(!isMobile) { root.title = currentTrack.title + " - " +currentTrack.artist // if(!root.active) // bae.notifySong(currentTrack.url) } // if(currentTrack.lyrics.length < 1) // bae.trackLyrics(currentTrack.url) // root.mainPlaylist.infoView.wikiAlbum = bae.albumWiki(root.mainPlaylist.currentTrack.album,root.mainPlaylist.currentTrack.artist) // root.mainPlaylist.infoView.wikiArtist = bae.artistWiki(root.mainPlaylist.currentTrack.artist) // // root.mainPlaylist.infoView.artistHead = bae.artistArt(root.mainPlaylist.currentTrack.artist) }else missingAlert(currentTrack) } } function queueTracks(tracks) { if(tracks) { if(tracks.length > 0) { onQueue++ console.log(onQueue) appendTracksAt(tracks, currentTrackIndex+1) - bae.notify("Queue", tracks.length + " tracks added put on queue") + root.notify("", "Queue", tracks.length + " tracks added put on queue") } } } function setLyrics(lyrics) { currentTrack.lyrics = lyrics infoView.lyricsText.text = lyrics } function stop() { player.stop() progressBar.value = 0 progressBar.enabled = false root.title = "Babe..." } function pauseTrack() { player.playing = false } function resumeTrack() { if(!player.play() && !mainlistEmpty) playAt(0) } function nextTrack() { if(!mainlistEmpty) { var next = 0 if(isShuffle && onQueue === 0) next = shuffle() else next = currentTrackIndex+1 >= mainPlaylist.listView.count? 0 : currentTrackIndex+1 prevTrackIndex = mainPlaylist.listView.currentIndex playAt(next) if(onQueue > 0) { onQueue-- console.log(onQueue) } } } function previousTrack() { if(!mainlistEmpty) { var previous = previous = currentTrackIndex-1 >= 0 ? mainPlaylist.listView.currentIndex-1 : currentTrackIndex-1 prevTrackIndex = mainPlaylist.listView.currentIndex playAt(previous) } } function shuffle() { var pos = Math.floor(Math.random() * mainPlaylist.listView.count) return pos } function playAt(index) { if((index < mainPlaylist.listView.count) && (index > -1)) { currentTrackIndex = index mainPlaylist.listView.currentIndex = currentTrackIndex mainPlaylist.albumsRoll.positionAlbum(currentTrackIndex) playTrack(currentTrackIndex) } } function quickPlay(track) { // root.pageStack.currentIndex = 0 appendTrack(track) playAt(mainPlaylist.listView.count-1) mainPlaylist.listView.positionViewAtEnd() mainPlaylist.albumsRoll.positionViewAtEnd() } function appendTracksAt(tracks, at) { if(tracks) for(var i in tracks) mainPlaylist.list.append(tracks[i], parseInt(at)+parseInt(i)) } function appendTrack(track) { if(track) { mainPlaylist.list.append(track) if(sync === true) { infoMsgAnim() // addToPlaylist([track.url], syncPlaylist) } } // if(track) // { // var empty = root.mainPlaylist.list.count // if((empty > 0 && track.url !== root.mainPlaylist.list.model.get(root.mainPlaylist.list.count-1).url) || empty === 0) // { // root.mainPlaylist.list.model.append(track) // if(empty === 0 && root.mainPlaylist.list.count>0) // playAt(0) // } // } } function addTrack(track) { if(track) { appendTrack(track) mainPlaylist.listView.positionViewAtEnd() } } function appendAll(tracks) { if(tracks) { for(var i in tracks) appendTrack(tracks[i]) mainPlaylist.listView.positionViewAtEnd() } } function savePlaylist() { var list = [] var n = mainPlaylist.listView.count n = n > 15 ? 15 : n for(var i=0 ; i < n; i++) { var url = mainPlaylist.list.get(i).url list.push(url) } Maui.FM.saveSettings("LASTPLAYLIST", list, "PLAYLIST"); Maui.FM.saveSettings("PLAYLIST_POS", mainPlaylist.listView.currentIndex, "MAINWINDOW") } function clearOutPlaylist() { mainPlaylist.list.clear() stop() } function cleanPlaylist() { var urls = [] for(var i = 0; i < mainPlaylist.listView.count; i++) { var url = mainPlaylist.list.get(i).url if(urls.indexOf(url)<0) urls.push(url) else mainPlaylist.list.remove(i) } } function playAll() { sync = false syncPlaylist = "" infoMsg = "" if(_drawer.modal && !_drawer.visible) _drawer.visible = true mainPlaylist.listView.positionViewAtBeginning() playAt(0) } diff --git a/widgets/AlbumsView.qml b/widgets/AlbumsView.qml index c8f9f65..d01d005 100644 --- a/widgets/AlbumsView.qml +++ b/widgets/AlbumsView.qml @@ -1,254 +1,254 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../view_models/BabeGrid" import "../view_models/BabeTable" import "../db/Queries.js" as Q import "../utils/Help.js" as H import org.kde.kirigami 2.2 as Kirigami import org.kde.mauikit 1.0 as Maui import TracksList 1.0 import AlbumsList 1.0 BabeGrid { id: albumsViewGrid property string currentAlbum: "" property string currentArtist: "" property var tracks: [] property alias table : albumsViewTable property alias tagBar : tagBar signal rowClicked(var track) signal playTrack(var track) signal queueTrack(var track) signal appendAll(string album, string artist) signal playAll(string album, string artist) // signal albumCoverClicked(string album, string artist) signal albumCoverPressedAndHold(string album, string artist) visible: true // topPadding: space.large onAlbumCoverPressed: albumCoverPressedAndHold(album, artist) headBar.visible: count headBarExit: false headBar.leftContent: [ // Maui.ToolButton // { // id : playAllBtn // visible : headBar.visible && albumsViewGrid.count > 0 // anim : true // iconName : "media-playlist-play" // onClicked : playAll() // }, Maui.ToolButton { id: sortBtn anim: true iconName: "view-sort" onClicked: sortMenu.popup() Maui.Menu { id: sortMenu Maui.MenuItem { text: qsTr("Artist") checkable: true checked: list.sortBy === Albums.ARTIST onTriggered: list.sortBy = Albums.ARTIST } Maui.MenuItem { text: qsTr("Album") checkable: true checked: list.sortBy === Albums.ALBUM onTriggered: list.sortBy = Albums.ALBUM } Maui.MenuItem { text: qsTr("Release date") checkable: true checked: list.sortBy === Albums.RELEASEDATE onTriggered: list.sortBy = Albums.RELEASEDATE } Maui.MenuItem { text: qsTr("Add date") checkable: true checked: list.sortBy === Albums.ADDDATE onTriggered: list.sortBy = Albums.ADDDATE } } } ] // headBar.rightContent: [ // Maui.ToolButton // { // id: appendBtn // visible: headBar.visible && albumsViewGrid.count > 0 // anim : true // iconName : "media-playlist-append"//"media-repeat-track-amarok" // onClicked: appendAll() // } // ] Maui.Dialog { id: albumDialog - parent: parent +// parent: parent maxHeight: maxWidth maxWidth: unit * 600 defaultButtons: false page.margins: 0 // verticalAlignment: Qt.AlignBottom ColumnLayout { id: albumFilter anchors.fill: parent spacing: 0 BabeTable { id: albumsViewTable Layout.fillHeight: true Layout.fillWidth: true trackNumberVisible: true trackRating: true headBar.visible: true headBarExit: false coverArtVisible: true quickPlayVisible: true focus: true list.sortBy: Tracks.TRACK headBar.plegable: false holder.emoji: "qrc:/assets/ElectricPlug.png" holder.isMask: false holder.title : "Oops!" holder.body: "This list is empty" holder.emojiSize: iconSizes.huge onRowClicked: { albumsViewGrid.rowClicked(model.get(index)) } onQuickPlayTrack: { albumsViewGrid.playTrack(model.get(index)) } onQueueTrack: { albumsViewGrid.queueTrack(model.get(index)) } onPlayAll: { albumDialog.close() albumsViewGrid.playAll(currentAlbum, currentArtist) } onAppendAll: { albumDialog.close() albumsViewGrid.appendAll(currentAlbum, currentArtist) } } Maui.TagsBar { id: tagBar Layout.fillWidth: true allowEditMode: false onTagClicked: H.searchFor("tag:"+tag) } } } function populateTable(album, artist) { console.log("PAPULATE ALBUMS VIEW") albumDialog.open() var query = "" var tagq = "" currentAlbum = album === undefined ? "" : album currentArtist= artist if(album && artist) { query = Q.GET.albumTracks_.arg(album) query = query.arg(artist) albumsView.table.headBarTitle = album tagq = Q.GET.albumTags_.arg(album) }else if(artist && album === undefined) { query = Q.GET.artistTracks_.arg(artist) artistsView.table.headBarTitle = artist tagq = Q.GET.artistTags_.arg(artist) } albumsViewTable.list.query = query /*dunoooo*/ // if(tracks.length > 0) // { // tagq = tagq.arg(artist) // var tags = bae.get(tagq) // console.log(tagq, "TAGS", tags) // tagBar.populate(tags) // } } function filter(tracks) { var matches = [] for(var i = 0; i