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

Introducing new table medium, ref #699

Browse Source
This commit is contained in:
emeric
2025-07-28 22:36:27 +02:00
parent 3c3e551676
commit 0ceaf4cfaa
36 changed files with 964 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/database/test/CMakeLists.txt
+1
View File
@@ -10,6 +10,7 @@ add_executable(test-database
Directory.cpp
Image.cpp
Listen.cpp
Medium.cpp
Migration.cpp
PlayListFile.cpp
RatedArtist.cpp
src/libs/database/test/Medium.cpp
+195
View File
@@ -0,0 +1,195 @@
/*
* 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/Types.hpp"
#include "database/objects/Medium.hpp"
#include "database/objects/Track.hpp"
namespace lms::db::tests
{
using ScopedMedium = ScopedEntity<db::Medium>;
TEST_F(DatabaseFixture, Medium)
{
ScopedRelease release{ session, "MyRelease" };
{
auto transaction{ session.createReadTransaction() };
EXPECT_EQ(Medium::getCount(session), 0);
Medium::pointer medium{ Medium::find(session, MediumId{}) };
ASSERT_EQ(medium, Medium::pointer{});
}
ScopedMedium medium{ session, release.lockAndGet() };
{
auto transaction{ session.createReadTransaction() };
EXPECT_EQ(Medium::getCount(session), 1);
Medium::pointer foundMedium{ Medium::find(session, medium.getId()) };
ASSERT_NE(foundMedium, Medium::pointer{});
EXPECT_EQ(foundMedium->getReleaseId(), release.getId());
EXPECT_EQ(foundMedium->getPosition(), std::nullopt);
EXPECT_EQ(foundMedium->getMedia(), "");
EXPECT_EQ(foundMedium->getName(), "");
}
{
auto transaction{ session.createWriteTransaction() };
medium.get().modify()->setName("MySubtitle");
medium.get().modify()->setPosition(1);
medium.get().modify()->setMedia("MyMedia");
}
{
auto transaction{ session.createReadTransaction() };
Medium::pointer foundMedium{ Medium::find(session, medium.getId()) };
ASSERT_NE(foundMedium, Medium::pointer{});
EXPECT_EQ(foundMedium->getName(), "MySubtitle");
EXPECT_EQ(foundMedium->getPosition(), 1);
EXPECT_EQ(foundMedium->getMedia(), "MyMedia");
}
}
TEST_F(DatabaseFixture, MediumFindByRelease_noPosition)
{
ScopedRelease release{ session, "MyRelease" };
{
auto transaction{ session.createReadTransaction() };
Medium::pointer foundMedium{ Medium::find(session, release.getId(), std::nullopt) };
ASSERT_EQ(foundMedium, Medium::pointer{});
}
ScopedMedium medium{ session, release.lockAndGet() };
{
auto transaction{ session.createReadTransaction() };
Medium::pointer foundMedium{ Medium::find(session, release.getId(), std::nullopt) };
ASSERT_NE(foundMedium, Medium::pointer{});
EXPECT_EQ(foundMedium->getId(), medium.getId());
}
}
TEST_F(DatabaseFixture, MediumFindByRelease_withPosition)
{
ScopedRelease release{ session, "MyRelease" };
ScopedMedium medium{ session, release.lockAndGet() };
{
auto transaction{ session.createReadTransaction() };
Medium::pointer foundMedium{ Medium::find(session, release.getId(), 1) };
ASSERT_EQ(foundMedium, Medium::pointer{});
}
{
auto transaction{ session.createWriteTransaction() };
medium.get().modify()->setPosition(1);
}
{
auto transaction{ session.createReadTransaction() };
Medium::pointer foundMedium{ Medium::find(session, release.getId(), 1) };
ASSERT_NE(foundMedium, Medium::pointer{});
EXPECT_EQ(foundMedium->getId(), medium.getId());
}
}
TEST_F(DatabaseFixture, Medium_findTracksByMedium)
{
ScopedRelease release{ session, "MyRelease" };
ScopedMedium medium{ session, release.lockAndGet() };
{
auto transaction{ session.createReadTransaction() };
db::Track::FindParameters params;
params.setMedium(medium.getId());
params.setSortMethod(db::TrackSortMethod::TrackNumber);
bool visited{};
db::Track::find(session, params, [&](const db::Track::pointer&) {
visited = true;
});
EXPECT_FALSE(visited);
}
ScopedTrack track1{ session };
ScopedTrack track2{ session };
{
auto transaction{ session.createWriteTransaction() };
track1.get().modify()->setRelease(release.get());
track2.get().modify()->setRelease(release.get());
}
{
auto transaction{ session.createReadTransaction() };
db::Track::FindParameters params;
params.setMedium(medium.getId());
params.setSortMethod(db::TrackSortMethod::TrackNumber);
bool visited{};
db::Track::find(session, params, [&](const db::Track::pointer&) {
visited = true;
});
EXPECT_FALSE(visited);
}
{
auto transaction{ session.createWriteTransaction() };
track1.get().modify()->setMedium(medium.get());
track2.get().modify()->setMedium(medium.get());
track1.get().modify()->setTrackNumber(3);
track2.get().modify()->setTrackNumber(1);
}
{
auto transaction{ session.createReadTransaction() };
db::Track::FindParameters params;
params.setMedium(medium.getId());
params.setSortMethod(db::TrackSortMethod::TrackNumber);
std::vector<db::TrackId> visitedTrackIds;
db::Track::find(session, params, [&](const db::Track::pointer& track) {
visitedTrackIds.push_back(track->getId());
});
ASSERT_EQ(visitedTrackIds.size(), 2);
EXPECT_EQ(visitedTrackIds[0], track2.getId());
EXPECT_EQ(visitedTrackIds[1], track1.getId());
}
}
} // namespace lms::db::tests
src/libs/database/test/Migration.cpp
+2
View File
@@ -25,6 +25,7 @@
#include "database/objects/AuthToken.hpp"
#include "database/objects/Directory.hpp"
#include "database/objects/Image.hpp"
#include "database/objects/Medium.hpp"
#include "database/objects/PlayListFile.hpp"
#include "database/objects/PlayQueue.hpp"
#include "database/objects/RatedArtist.hpp"
@@ -353,6 +354,7 @@ VALUES
EXPECT_FALSE(TrackEmbeddedImage::find(session, TrackEmbeddedImageId{}));
EXPECT_FALSE(TrackEmbeddedImageLink::find(session, TrackEmbeddedImageLinkId{}));
EXPECT_FALSE(Image::find(session, ImageId{}));
EXPECT_FALSE(Medium::find(session, MediumId{}));
EXPECT_FALSE(Label::find(session, LabelId{}));
EXPECT_FALSE(Listen::find(session, ListenId{}));
EXPECT_FALSE(PlayListFile::find(session, PlayListFileId{}));
src/libs/database/test/Release.cpp
+58 -64
View File
@@ -22,13 +22,15 @@
#include "core/PartialDateTime.hpp"
#include "database/objects/Artwork.hpp"
#include "database/objects/Image.hpp"
#include "database/objects/Medium.hpp"
namespace lms::db::tests
{
using ScopedArtwork = ScopedEntity<db::Artwork>;
using ScopedCountry = ScopedEntity<db::Country>;
using ScopedImage = ScopedEntity<db::Image>;
using ScopedLabel = ScopedEntity<db::Label>;
using ScopedCountry = ScopedEntity<db::Country>;
using ScopedMedium = ScopedEntity<db::Medium>;
using ScopedReleaseType = ScopedEntity<db::ReleaseType>;
TEST_F(DatabaseFixture, Release)
@@ -438,15 +440,12 @@ namespace lms::db::tests
{
auto transaction{ session.createWriteTransaction() };
track1.get().modify()->setTotalTrack(36);
release1.get().modify()->setTotalDisc(6);
}
{
auto transaction{ session.createReadTransaction() };
ASSERT_TRUE(track1->getTotalTrack());
EXPECT_EQ(*track1->getTotalTrack(), 36);
ASSERT_TRUE(release1->getTotalDisc());
EXPECT_EQ(*release1->getTotalDisc(), 6);
}
@@ -456,15 +455,12 @@ namespace lms::db::tests
auto transaction{ session.createWriteTransaction() };
track2.get().modify()->setRelease(release1.get());
track2.get().modify()->setTotalTrack(37);
release1.get().modify()->setTotalDisc(67);
}
{
auto transaction{ session.createReadTransaction() };
ASSERT_TRUE(track1->getTotalTrack());
EXPECT_EQ(*track1->getTotalTrack(), 36);
ASSERT_TRUE(release1->getTotalDisc());
EXPECT_EQ(*release1->getTotalDisc(), 67);
}
@@ -481,18 +477,13 @@ namespace lms::db::tests
auto transaction{ session.createWriteTransaction() };
track3.get().modify()->setRelease(release2.get());
track3.get().modify()->setTotalTrack(7);
release2.get().modify()->setTotalDisc(5);
}
{
auto transaction{ session.createReadTransaction() };
ASSERT_TRUE(track1->getTotalTrack());
EXPECT_EQ(*track1->getTotalTrack(), 36);
ASSERT_TRUE(release1->getTotalDisc());
EXPECT_EQ(*release2->getTotalDisc(), 5);
ASSERT_TRUE(track3->getTotalTrack());
EXPECT_EQ(*track3->getTotalTrack(), 7);
ASSERT_TRUE(release2->getTotalDisc());
EXPECT_EQ(*release2->getTotalDisc(), 5);
}
@@ -501,7 +492,11 @@ namespace lms::db::tests
TEST_F(DatabaseFixture, MultiTracksSingleReleaseFirstTrack)
{
ScopedRelease release1{ session, "MyRelease1" };
ScopedMedium medium1A{ session, release1.lockAndGet() };
ScopedMedium medium1B{ session, release1.lockAndGet() };
ScopedRelease release2{ session, "MyRelease2" };
ScopedMedium medium2A{ session, release2.lockAndGet() };
ScopedMedium medium2B{ session, release2.lockAndGet() };
ScopedTrack track1A{ session };
ScopedTrack track1B{ session };
@@ -519,17 +514,21 @@ namespace lms::db::tests
auto transaction{ session.createWriteTransaction() };
track1A.get().modify()->setRelease(release1.get());
track1A.get().modify()->setMedium(medium1A.get());
track1B.get().modify()->setRelease(release1.get());
track1B.get().modify()->setMedium(medium1B.get());
track2A.get().modify()->setRelease(release2.get());
track2A.get().modify()->setMedium(medium2A.get());
track2B.get().modify()->setRelease(release2.get());
track2B.get().modify()->setMedium(medium2B.get());
track1A.get().modify()->setTrackNumber(1);
track1B.get().modify()->setTrackNumber(2);
track2A.get().modify()->setDiscNumber(2);
track2A.get().modify()->setTrackNumber(1);
track2B.get().modify()->setTrackNumber(2);
track2B.get().modify()->setDiscNumber(1);
}
{
@@ -537,14 +536,16 @@ namespace lms::db::tests
{
const auto tracks{ Track::findIds(session, Track::FindParameters{}.setRelease(release1.getId()).setSortMethod(TrackSortMethod::Release)) };
EXPECT_EQ(tracks.results.size(), 2);
EXPECT_EQ(tracks.results.front(), track1A.getId());
ASSERT_EQ(tracks.results.size(), 2);
EXPECT_EQ(tracks.results[0], track1A.getId());
EXPECT_EQ(tracks.results[1], track1B.getId());
}
{
const auto tracks{ Track::findIds(session, Track::FindParameters{}.setRelease(release2.getId()).setSortMethod(TrackSortMethod::Release)) };
EXPECT_EQ(tracks.results.size(), 2);
EXPECT_EQ(tracks.results.front(), track2B.getId());
ASSERT_EQ(tracks.results.size(), 2);
EXPECT_EQ(tracks.results[0], track2A.getId());
EXPECT_EQ(tracks.results[1], track2B.getId());
}
}
}
@@ -815,52 +816,6 @@ namespace lms::db::tests
EXPECT_EQ(Release::getCount(session, Release::FindParameters{}.setArtist(artist.getId())), 1);
}
}
TEST_F(DatabaseFixture, Release_getDiscCount)
{
ScopedRelease release{ session, "MyRelease" };
ScopedTrack track{ session };
ScopedTrack track2{ session };
{
auto transaction{ session.createReadTransaction() };
EXPECT_EQ(release.get()->getDiscCount(), 0);
}
{
auto transaction{ session.createWriteTransaction() };
track.get().modify()->setRelease(release.get());
}
{
auto transaction{ session.createReadTransaction() };
EXPECT_EQ(release.get()->getDiscCount(), 0);
}
{
auto transaction{ session.createWriteTransaction() };
track.get().modify()->setDiscNumber(5);
}
{
auto transaction{ session.createReadTransaction() };
EXPECT_EQ(release.get()->getDiscCount(), 1);
}
{
auto transaction{ session.createWriteTransaction() };
track2.get().modify()->setRelease(release.get());
track2.get().modify()->setDiscNumber(5);
}
{
auto transaction{ session.createReadTransaction() };
EXPECT_EQ(release.get()->getDiscCount(), 1);
}
{
auto transaction{ session.createWriteTransaction() };
track2.get().modify()->setDiscNumber(6);
}
{
auto transaction{ session.createReadTransaction() };
EXPECT_EQ(release.get()->getDiscCount(), 2);
}
}
TEST_F(DatabaseFixture, Release_isCompilation)
{
ScopedRelease release{ session, "MyRelease" };
@@ -1549,4 +1504,43 @@ namespace lms::db::tests
}
}
TEST_F(DatabaseFixture, Release_mediums)
{
ScopedRelease release{ session, "MyRelease" };
{
auto transaction{ session.createReadTransaction() };
const auto mediums{ release->getMediums() };
EXPECT_EQ(mediums.size(), 0);
}
ScopedMedium medium2{ session, release.lockAndGet() };
{
auto transaction{ session.createReadTransaction() };
const auto mediums{ release->getMediums() };
ASSERT_EQ(mediums.size(), 1);
EXPECT_EQ(mediums[0]->getId(), medium2.getId());
}
ScopedMedium medium1{ session, release.lockAndGet() };
{
auto transaction{ session.createWriteTransaction() };
medium1.get().modify()->setPosition(1);
medium2.get().modify()->setPosition(2);
}
{
auto transaction{ session.createReadTransaction() };
const auto mediums{ release->getMediums() };
ASSERT_EQ(mediums.size(), 2);
EXPECT_EQ(mediums[0]->getId(), medium1.getId());
EXPECT_EQ(mediums[1]->getId(), medium2.getId());
}
}
} // namespace lms::db::tests
src/libs/database/test/TrackEmbeddedImage.cpp
+36 -48
View File
@@ -20,6 +20,7 @@
#include <limits>
#include "database/Types.hpp"
#include "database/objects/Medium.hpp"
#include "database/objects/TrackEmbeddedImage.hpp"
#include "database/objects/TrackEmbeddedImageLink.hpp"
#include "database/objects/TrackList.hpp"
@@ -28,6 +29,7 @@
namespace lms::db::tests
{
using ScopedMedium = ScopedEntity<db::Medium>;
using ScopedTrackEmbeddedImage = ScopedEntity<db::TrackEmbeddedImage>;
using ScopedTrackEmbeddedImageLink = ScopedEntity<db::TrackEmbeddedImageLink>;
@@ -113,6 +115,7 @@ namespace lms::db::tests
ScopedTrackEmbeddedImage image{ session };
ScopedTrack track{ session };
ScopedRelease release{ session, "MyRelease" };
ScopedMedium medium{ session, release.lockAndGet() };
ScopedTrackEmbeddedImageLink link{ session, track.lockAndGet(), image.lockAndGet() };
{
@@ -133,6 +136,7 @@ namespace lms::db::tests
{
auto transaction{ session.createWriteTransaction() };
track.get().modify()->setRelease(release.get());
track.get().modify()->setMedium(medium.get());
}
{
@@ -151,13 +155,24 @@ namespace lms::db::tests
auto transaction{ session.createReadTransaction() };
TrackEmbeddedImage::FindParameters params;
params.setTrack(track.getId());
params.setMedium(medium.getId());
params.setSortMethod(TrackEmbeddedImageSortMethod::TrackNumberThenSizeDesc);
bool visited{};
TrackEmbeddedImage::find(session, params, [&](const auto&) { visited = true; });
EXPECT_TRUE(visited);
}
{
auto transaction{ session.createReadTransaction() };
TrackEmbeddedImage::FindParameters params;
params.setTrack(track.getId());
bool visited{};
TrackEmbeddedImage::find(session, params, [&](const auto&) { visited = true; });
EXPECT_TRUE(visited);
}
}
TEST_F(DatabaseFixture, TrackEmbeddedImage_findByParams_sorts)
@@ -169,6 +184,8 @@ namespace lms::db::tests
ScopedTrack track1{ session };
ScopedTrack track2{ session };
ScopedRelease release{ session, "MyRelease" };
ScopedMedium medium1{ session, release.lockAndGet() };
ScopedMedium medium2{ session, release.lockAndGet() };
ScopedTrackEmbeddedImageLink link1{ session, track1.lockAndGet(), image1.lockAndGet() };
ScopedTrackEmbeddedImageLink link2{ session, track1.lockAndGet(), image2.lockAndGet() };
ScopedTrackEmbeddedImageLink link3{ session, track1.lockAndGet(), image3.lockAndGet() };
@@ -176,7 +193,11 @@ namespace lms::db::tests
{
auto transaction{ session.createWriteTransaction() };
medium1.get().modify()->setPosition(1);
medium2.get().modify()->setPosition(2);
track1.get().modify()->setRelease(release.get());
track1.get().modify()->setMedium(medium1.get());
track1.get().modify()->setTrackNumber(2);
link1.get().modify()->setType(ImageType::FrontCover);
@@ -187,6 +208,7 @@ namespace lms::db::tests
image3.get().modify()->setSize(2000);
track2.get().modify()->setRelease(release.get());
track2.get().modify()->setMedium(medium2.get());
track2.get().modify()->setTrackNumber(1);
link4.get().modify()->setType(ImageType::Media);
@@ -213,16 +235,15 @@ namespace lms::db::tests
auto transaction{ session.createReadTransaction() };
TrackEmbeddedImage::FindParameters params;
params.setRelease(release.getId());
params.setMedium(medium1.getId());
params.setImageType(ImageType::Media);
params.setSortMethod(TrackEmbeddedImageSortMethod::TrackNumberThenSizeDesc);
std::vector<TrackEmbeddedImageId> visitedIds;
TrackEmbeddedImage::find(session, params, [&](const TrackEmbeddedImage::pointer& image) { visitedIds.push_back(image->getId()); });
ASSERT_EQ(visitedIds.size(), 3);
EXPECT_EQ(visitedIds[0], image4.getId());
EXPECT_EQ(visitedIds[1], image3.getId());
EXPECT_EQ(visitedIds[2], image2.getId());
ASSERT_EQ(visitedIds.size(), 2);
EXPECT_EQ(visitedIds[0], image3.getId());
EXPECT_EQ(visitedIds[1], image2.getId());
}
{
@@ -236,9 +257,9 @@ namespace lms::db::tests
std::vector<TrackEmbeddedImageId> visitedIds;
TrackEmbeddedImage::find(session, params, [&](const TrackEmbeddedImage::pointer& image) { visitedIds.push_back(image->getId()); });
ASSERT_EQ(visitedIds.size(), 3);
EXPECT_EQ(visitedIds[0], image4.getId());
EXPECT_EQ(visitedIds[1], image3.getId());
EXPECT_EQ(visitedIds[2], image2.getId());
EXPECT_EQ(visitedIds[0], image3.getId());
EXPECT_EQ(visitedIds[1], image2.getId());
EXPECT_EQ(visitedIds[2], image4.getId());
}
{
@@ -255,59 +276,26 @@ namespace lms::db::tests
}
}
TEST_F(DatabaseFixture, TrackEmbeddedImage_findByParams_artist)
{
ScopedTrackEmbeddedImage image{ session };
ScopedTrack track{ session };
ScopedArtist artist{ session, "MyArtist" };
ScopedTrackEmbeddedImageLink link{ session, track.lockAndGet(), image.lockAndGet() };
{
auto transaction{ session.createWriteTransaction() };
TrackArtistLink::create(session, track.get(), artist.get(), TrackArtistLinkType::Artist);
}
{
auto transaction{ session.createReadTransaction() };
TrackEmbeddedImage::FindParameters params;
params.setArtist(artist.getId());
bool visited{};
TrackEmbeddedImage::find(session, params, [&](const TrackEmbeddedImage::pointer&) { visited = true; });
ASSERT_TRUE(visited);
}
{
auto transaction{ session.createReadTransaction() };
TrackEmbeddedImage::FindParameters params;
params.setArtist(artist.getId(), { TrackArtistLinkType::ReleaseArtist });
bool visited{};
TrackEmbeddedImage::find(session, params, [&](const TrackEmbeddedImage::pointer&) { visited = true; });
ASSERT_FALSE(visited);
}
}
TEST_F(DatabaseFixture, TrackEmbeddedImage_findByParams_discNumber)
TEST_F(DatabaseFixture, TrackEmbeddedImage_findByParams_medium)
{
ScopedTrackEmbeddedImage image{ session };
ScopedTrack track{ session };
ScopedRelease release{ session, "MyRelease" };
ScopedMedium medium{ session, release.lockAndGet() };
ScopedMedium otherMedium{ session, release.lockAndGet() };
ScopedTrackEmbeddedImageLink link{ session, track.lockAndGet(), image.lockAndGet() };
{
auto transaction{ session.createWriteTransaction() };
track.get().modify()->setRelease(release.get());
track.get().modify()->setDiscNumber(1);
track.get().modify()->setMedium(medium.get());
}
{
auto transaction{ session.createReadTransaction() };
TrackEmbeddedImage::FindParameters params;
params.setDiscNumber(1);
params.setMedium(medium.getId());
bool visited{};
TrackEmbeddedImage::find(session, params, [&](const TrackEmbeddedImage::pointer&) { visited = true; });
@@ -318,7 +306,7 @@ namespace lms::db::tests
auto transaction{ session.createReadTransaction() };
TrackEmbeddedImage::FindParameters params;
params.setDiscNumber(2);
params.setMedium(2);
bool visited{};
TrackEmbeddedImage::find(session, params, [&](const TrackEmbeddedImage::pointer&) { visited = true; });