owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added playlist import (and sync)from m3u files, ref #391

Browse Source
This commit is contained in:
emeric
2024-12-18 14:15:25 +01:00
parent ec20c9bfa6
commit 3661eaccb6
95 changed files with 3439 additions and 1634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/database/test/CMakeLists.txt
+1
View File
@@ -9,6 +9,7 @@ add_executable(test-database
Image.cpp
Listen.cpp
Migration.cpp
PlayListFile.cpp
RatedArtist.cpp
RatedRelease.cpp
RatedTrack.cpp
src/libs/database/test/Cluster.cpp
+3 -5
View File
@@ -718,8 +718,7 @@ namespace lms::db::tests
TEST_F(DatabaseFixture, SingleTrackListMultipleTrackSingleCluster)
{
ScopedUser user{ session, "MyUser" };
ScopedTrackList trackList{ session, "MyTrackList", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList{ session, "MyTrackList", TrackListType::PlayList };
ScopedClusterType clusterType{ session, "MyClusterType" };
ScopedCluster cluster{ session, clusterType.lockAndGet(), "MyCluster" };
std::list<ScopedTrack> tracks;
@@ -743,15 +742,14 @@ namespace lms::db::tests
const auto similarTracks{ trackList->getSimilarTracks() };
EXPECT_EQ(similarTracks.size(), 5);
for (auto similarTrack : similarTracks)
for (const auto& similarTrack : similarTracks)
EXPECT_TRUE(std::any_of(std::next(std::cbegin(tracks), 5), std::cend(tracks), [similarTrack](const ScopedTrack& track) { return track.getId() == similarTrack->getId(); }));
}
}
TEST_F(DatabaseFixture, SingleTrackListMultipleTrackMultiClusters)
{
ScopedUser user{ session, "MyUser" };
ScopedTrackList trackList{ session, "MyTrackList", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList{ session, "MyTrackList", TrackListType::PlayList };
ScopedClusterType clusterType{ session, "MyClusterType" };
ScopedCluster cluster1{ session, clusterType.lockAndGet(), "MyCluster1" };
ScopedCluster cluster2{ session, clusterType.lockAndGet(), "MyCluster2" };
src/libs/database/test/Migration.cpp
+2
View File
@@ -24,6 +24,7 @@
#include "database/Db.hpp"
#include "database/Directory.hpp"
#include "database/Image.hpp"
#include "database/PlayListFile.hpp"
#include "database/PlayQueue.hpp"
#include "database/RatedArtist.hpp"
#include "database/RatedRelease.hpp"
@@ -345,6 +346,7 @@ VALUES
EXPECT_FALSE(Image::find(session, ImageId{}));
EXPECT_FALSE(Label::find(session, LabelId{}));
EXPECT_FALSE(Listen::find(session, ListenId{}));
EXPECT_FALSE(PlayListFile::find(session, PlayListFileId{}));
EXPECT_FALSE(PlayQueue::find(session, PlayQueueId{}));
EXPECT_FALSE(RatedArtist::find(session, RatedArtistId{}));
EXPECT_FALSE(RatedRelease::find(session, RatedReleaseId{}));
src/libs/database/test/PlayListFile.cpp
+114
View File
@@ -0,0 +1,114 @@
/*
* Copyright (C) 2024 Emeric Poupon
*
* This file is part of LMS.
*
* LMS 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.
*
* LMS 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 LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Common.hpp"
#include "database/PlayListFile.hpp"
#include "database/TrackList.hpp"
namespace lms::db::tests
{
using ScopedPlayListFile = ScopedEntity<db::PlayListFile>;
TEST_F(DatabaseFixture, PlayListFile)
{
{
auto transaction{ session.createReadTransaction() };
EXPECT_EQ(PlayListFile::getCount(session), 0);
}
ScopedPlayListFile playlist{ session, "/tmp/foo.m3u" };
{
auto transaction{ session.createReadTransaction() };
EXPECT_EQ(PlayListFile::getCount(session), 1);
}
{
auto transaction{ session.createReadTransaction() };
const PlayListFile::pointer dbPlayList{ playlist.get() };
EXPECT_EQ(dbPlayList->getAbsoluteFilePath(), "/tmp/foo.m3u");
EXPECT_EQ(dbPlayList->getLastWriteTime(), Wt::WDateTime{});
EXPECT_EQ(dbPlayList->getFileSize(), 0);
EXPECT_EQ(dbPlayList->getName(), "");
EXPECT_EQ(dbPlayList->getTrackList(), TrackList::pointer{});
}
ScopedTrackList trackList{ session, "MyTrackList", TrackListType::PlayList };
// Now change some values
{
auto transaction{ session.createWriteTransaction() };
PlayListFile::pointer dbPlayList{ playlist.get() };
dbPlayList.modify()->setAbsoluteFilePath("/tmp/bar.m3u");
dbPlayList.modify()->setLastWriteTime(Wt::WDateTime{ Wt::WDate{ 2024, 30, 1 }, Wt::WTime{ 12, 58, 29 } });
dbPlayList.modify()->setFileSize(1234);
dbPlayList.modify()->setName("My playlist");
dbPlayList.modify()->setTrackList(trackList.get());
dbPlayList.modify()->setFiles({ { std::filesystem::path{ "/foo/foo.mp3" }, std::filesystem::path{ "/foo/bar.mp3" } } });
}
// Check values are reflected
{
auto transaction{ session.createReadTransaction() };
const PlayListFile::pointer dbPlayList{ playlist.get() };
EXPECT_EQ(dbPlayList->getAbsoluteFilePath(), "/tmp/bar.m3u");
EXPECT_EQ(dbPlayList->getLastWriteTime(), (Wt::WDateTime{ Wt::WDate{ 2024, 30, 1 }, Wt::WTime{ 12, 58, 29 } }));
EXPECT_EQ(dbPlayList->getFileSize(), 1234);
EXPECT_EQ(dbPlayList->getName(), "My playlist");
EXPECT_EQ(dbPlayList->getTrackList(), trackList.get());
const auto files{ dbPlayList->getFiles() };
ASSERT_EQ(files.size(), 2);
EXPECT_EQ(files[0], "/foo/foo.mp3");
EXPECT_EQ(files[1], "/foo/bar.mp3");
}
}
TEST_F(DatabaseFixture, PlayListFile_deleteTrackList)
{
{
ScopedPlayListFile playlist{ session, "/tmp/foo.m3u" };
{
auto transaction{ session.createWriteTransaction() };
TrackList::pointer trackList{ session.create<TrackList>("MyTrackList", TrackListType::PlayList) };
playlist.get().modify()->setTrackList(trackList);
}
{
auto transaction{ session.createReadTransaction() };
ASSERT_EQ(TrackList::getCount(session), 1);
}
}
{
auto transaction{ session.createReadTransaction() };
ASSERT_EQ(PlayListFile::getCount(session), 0);
}
{
auto transaction{ session.createReadTransaction() };
ASSERT_EQ(TrackList::getCount(session), 0);
}
}
} // namespace lms::db::tests
src/libs/database/test/TrackList.cpp
+37 -18
View File
@@ -25,13 +25,12 @@ namespace lms::db::tests
{
TEST_F(DatabaseFixture, SingleTrackList)
{
ScopedUser user{ session, "MyUser" };
{
auto transaction{ session.createReadTransaction() };
EXPECT_EQ(TrackList::getCount(session), 0);
}
ScopedTrackList trackList{ session, "MytrackList", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList{ session, "MytrackList", TrackListType::PlayList };
{
auto transaction{ session.createReadTransaction() };
@@ -41,9 +40,8 @@ namespace lms::db::tests
TEST_F(DatabaseFixture, SingleTrackListSingleTrack)
{
ScopedUser user{ session, "MyUser" };
ScopedTrackList trackList1{ session, "MyTrackList1", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList2{ session, "MyTrackList2", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList1{ session, "MyTrackList1", TrackListType::PlayList };
ScopedTrackList trackList2{ session, "MyTrackList2", TrackListType::PlayList };
ScopedTrack track{ session };
{
@@ -76,9 +74,8 @@ namespace lms::db::tests
TEST_F(DatabaseFixture, TrackList_SortMethod)
{
ScopedUser user{ session, "MyUser" };
ScopedTrackList trackList2{ session, "MyTrackList2", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList1{ session, "MyTrackList1", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList2{ session, "MyTrackList2", TrackListType::PlayList };
ScopedTrackList trackList1{ session, "MyTrackList1", TrackListType::PlayList };
ScopedTrack track{ session };
{
@@ -125,8 +122,7 @@ namespace lms::db::tests
TEST_F(DatabaseFixture, SingleTrackListMultipleTrack)
{
ScopedUser user{ session, "MyUser" };
ScopedTrackList trackList{ session, "MytrackList", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList{ session, "MytrackList", TrackListType::PlayList };
std::list<ScopedTrack> tracks;
for (std::size_t i{}; i < 10; ++i)
@@ -153,9 +149,8 @@ namespace lms::db::tests
TEST_F(DatabaseFixture, TrackList_MediaLibrary)
{
ScopedUser user{ session, "MyUser" };
ScopedTrackList trackList1{ session, "MytrackList1", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList2{ session, "MytrackList2", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList1{ session, "MytrackList1", TrackListType::PlayList };
ScopedTrackList trackList2{ session, "MytrackList2", TrackListType::PlayList };
ScopedTrack track1{ session };
ScopedTrack track2{ session };
ScopedMediaLibrary library{ session, "MyLibrary", "/root" };
@@ -191,9 +186,8 @@ namespace lms::db::tests
TEST_F(DatabaseFixture, SingleTrackListSingleTrackWithCluster)
{
ScopedUser user{ session, "MyUser" };
ScopedTrackList trackList1{ session, "MyTrackList1", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList2{ session, "MyTrackList2", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList1{ session, "MyTrackList1", TrackListType::PlayList };
ScopedTrackList trackList2{ session, "MyTrackList2", TrackListType::PlayList };
ScopedClusterType clusterType{ session, "MyClusterType" };
ScopedCluster cluster{ session, clusterType.lockAndGet(), "MyCluster" };
ScopedTrack track{ session };
@@ -223,8 +217,7 @@ namespace lms::db::tests
TEST_F(DatabaseFixture, SingleTrackList_getEntries)
{
ScopedUser user{ session, "MyUser" };
ScopedTrackList trackList{ session, "MyTrackList", TrackListType::Playlist, false, user.lockAndGet() };
ScopedTrackList trackList{ session, "MyTrackList", TrackListType::PlayList };
ScopedTrack track1{ session };
ScopedTrack track2{ session };
@@ -260,4 +253,30 @@ namespace lms::db::tests
EXPECT_EQ(entries.results[0]->getTrack()->getId(), track2.getId());
}
}
TEST_F(DatabaseFixture, SingleTrackList_visitEntries)
{
ScopedTrackList trackList{ session, "MyTrackList", TrackListType::PlayList };
ScopedTrack track1{ session };
ScopedTrack track2{ session };
{
auto transaction{ session.createWriteTransaction() };
session.create<TrackListEntry>(track1.get(), trackList.get());
session.create<TrackListEntry>(track2.get(), trackList.get());
}
{
auto transaction{ session.createReadTransaction() };
std::vector<TrackId> visitedTrackIds;
TrackListEntry::find(session, TrackListEntry::FindParameters{}.setTrackList(trackList.getId()), [&](const TrackListEntry::pointer& entry) {
visitedTrackIds.push_back(entry->getTrackId());
});
ASSERT_EQ(visitedTrackIds.size(), 2);
EXPECT_EQ(visitedTrackIds[0], track1.getId());
EXPECT_EQ(visitedTrackIds[1], track2.getId());
}
}
} // namespace lms::db::tests