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

Listenbrainz: count fetched listen even if we can't parse them

Browse Source
This commit is contained in:
emeric
2022-10-01 20:58:36 +02:00
parent ff63ad6448
commit 08869c8fef
7 changed files with 184 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/services/scrobbling/CMakeLists.txt
+1
View File
@@ -3,6 +3,7 @@ add_library(lmsscrobbling SHARED
impl/internal/InternalScrobbler.cpp impl/internal/InternalScrobbler.cpp
impl/listenbrainz/FeedbacksSynchronizer.cpp impl/listenbrainz/FeedbacksSynchronizer.cpp
impl/listenbrainz/ListenBrainzScrobbler.cpp impl/listenbrainz/ListenBrainzScrobbler.cpp
impl/listenbrainz/ListenTypes.cpp
impl/listenbrainz/ListensParser.cpp impl/listenbrainz/ListensParser.cpp
impl/listenbrainz/ListensSynchronizer.cpp impl/listenbrainz/ListensSynchronizer.cpp
impl/listenbrainz/Utils.cpp impl/listenbrainz/Utils.cpp
src/libs/services/scrobbling/impl/listenbrainz/ListenTypes.cpp
+39
View File
@@ -0,0 +1,39 @@
/*
* Copyright (C) 2022 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 "ListenTypes.hpp"
namespace Scrobbling::ListenBrainz
{
std::ostream&
operator<<(std::ostream& os, const Listen& listen)
{
os << "track name = '" << listen.trackName << "', artistName = '" << listen.artistName << "'";
if (listen.listenedAt.isValid())
os << ", listenedAt = " << listen.listenedAt.toString();
if (!listen.releaseName.empty())
os << ", releaseName = '" << listen.releaseName << "'";
if (listen.trackNumber)
os << ", trackNumber = " << *listen.trackNumber;
if (listen.recordingMBID)
os << ", recordingMBID = '" << listen.recordingMBID->getAsString() << "'";
return os;
}
} // Scrobbling::ListenBrainz
src/libs/services/scrobbling/impl/listenbrainz/ListenTypes.hpp
+42
View File
@@ -0,0 +1,42 @@
/*
* Copyright (C) 2022 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/>.
*/
#pragma once
#include <string>
#include <ostream>
#include <Wt/WDateTime.h>
#include "utils/UUID.hpp"
namespace Scrobbling::ListenBrainz
{
struct Listen
{
std::string trackName;
std::string releaseName;
std::string artistName;
std::optional<UUID> recordingMBID;
std::optional<UUID> releaseMBID;
std::optional<unsigned> trackNumber;
Wt::WDateTime listenedAt;
};
std::ostream& operator<<(std::ostream& os, const Listen& listen);
} // Scrobbling::ListenBrainz
src/libs/services/scrobbling/impl/listenbrainz/ListensParser.cpp
+20 -35
View File
@@ -31,44 +31,44 @@ namespace
{ {
using namespace Scrobbling::ListenBrainz; using namespace Scrobbling::ListenBrainz;
ListensParser::Entry Listen
parseListen(const Wt::Json::Object& listen) parseListen(const Wt::Json::Object& listenObject)
{ {
ListensParser::Entry entry; Listen listen;
// Mandatory fields // Mandatory fields
const Wt::Json::Object& metadata = listen.get("track_metadata"); const Wt::Json::Object& metadata = listenObject.get("track_metadata");
entry.trackName = static_cast<std::string>(metadata.get("track_name")); listen.trackName = static_cast<std::string>(metadata.get("track_name"));
entry.artistName = static_cast<std::string>(metadata.get("artist_name")); listen.artistName = static_cast<std::string>(metadata.get("artist_name"));
// Optional fields // Optional fields
entry.releaseName = static_cast<std::string>(metadata.get("release_name").orIfNull("")); listen.releaseName = static_cast<std::string>(metadata.get("release_name").orIfNull(""));
if (listen.type("listened_at") == Wt::Json::Type::Number) if (listenObject.type("listened_at") == Wt::Json::Type::Number)
entry.listenedAt = Wt::WDateTime::fromTime_t(static_cast<int>(listen.get("listened_at"))); listen.listenedAt = Wt::WDateTime::fromTime_t(static_cast<int>(listenObject.get("listened_at")));
if (!entry.listenedAt.isValid()) if (!listen.listenedAt.isValid())
LOG(ERROR) << "Invalid or missing 'listened_at' field!"; LOG(ERROR) << "Invalid or missing 'listened_at' field!";
if (metadata.type("additional_info") == Wt::Json::Type::Object) if (metadata.type("additional_info") == Wt::Json::Type::Object)
{ {
const Wt::Json::Object& additionalInfo = metadata.get("additional_info"); const Wt::Json::Object& additionalInfo = metadata.get("additional_info");
entry.recordingMBID = UUID::fromString(additionalInfo.get("recording_mbid").orIfNull("")); listen.recordingMBID = UUID::fromString(additionalInfo.get("recording_mbid").orIfNull(""));
entry.releaseMBID = UUID::fromString(additionalInfo.get("release_mbid").orIfNull("")); listen.releaseMBID = UUID::fromString(additionalInfo.get("release_mbid").orIfNull(""));
int trackNumber {additionalInfo.get("tracknumber").orIfNull(-1)}; int trackNumber {additionalInfo.get("tracknumber").orIfNull(-1)};
if (trackNumber > 0) if (trackNumber > 0)
entry.trackNumber = trackNumber; listen.trackNumber = trackNumber;
} }
return entry; return listen;
} }
} // namespace } // namespace
namespace Scrobbling::ListenBrainz namespace Scrobbling::ListenBrainz
{ {
std::vector<ListensParser::Entry> ListensParser::Result
ListensParser::parse(std::string_view msgBody) ListensParser::parse(std::string_view msgBody)
{ {
std::vector<Entry> entries; Result result;
try try
{ {
@@ -79,16 +79,17 @@ namespace Scrobbling::ListenBrainz
const Wt::Json::Array& listens = payload.get("listens"); const Wt::Json::Array& listens = payload.get("listens");
LOG(DEBUG) << "Parsing " << listens.size() << " listens..."; LOG(DEBUG) << "Parsing " << listens.size() << " listens...";
result.listenCount = listens.size();
if (listens.empty()) if (listens.empty())
return entries; return result;
for (const Wt::Json::Value& value : listens) for (const Wt::Json::Value& value : listens)
{ {
try try
{ {
const Wt::Json::Object& listen = value; const Wt::Json::Object& listen = value;
entries.push_back(parseListen(listen)); result.listens.push_back(parseListen(listen));
} }
catch (const Wt::WException& error) catch (const Wt::WException& error)
{ {
@@ -101,22 +102,6 @@ namespace Scrobbling::ListenBrainz
LOG(ERROR) << "Cannot parse 'listens': " << error.what(); LOG(ERROR) << "Cannot parse 'listens': " << error.what();
} }
return entries; return result;
}
std::ostream&
operator<<(std::ostream& os, const ListensParser::Entry& entry)
{
os << "track name = '" << entry.trackName << "', artistName = '" << entry.artistName << "'";
if (entry.listenedAt.isValid())
os << ", listenedAt = " << entry.listenedAt.toString();
if (!entry.releaseName.empty())
os << ", releaseName = '" << entry.releaseName << "'";
if (entry.trackNumber)
os << ", trackNumber = " << *entry.trackNumber;
if (entry.recordingMBID)
os << ", recordingMBID = '" << entry.recordingMBID->getAsString() << "'";
return os;
} }
} // Scrobbling::ListenBrainz } // Scrobbling::ListenBrainz
src/libs/services/scrobbling/impl/listenbrainz/ListensParser.hpp
+5 -17
View File
@@ -19,31 +19,19 @@
#pragma once #pragma once
#include <string> #include "ListenTypes.hpp"
#include <ostream>
#include <Wt/WDateTime.h>
#include "utils/UUID.hpp"
namespace Scrobbling::ListenBrainz namespace Scrobbling::ListenBrainz
{ {
class ListensParser class ListensParser
{ {
public: public:
struct Entry struct Result
{ {
std::string trackName; std::size_t listenCount; // may be > than listens.size()
std::string releaseName; std::vector<Listen> listens; // successfully parsed listens
std::string artistName;
std::optional<UUID> recordingMBID;
std::optional<UUID> releaseMBID;
std::optional<unsigned> trackNumber;
Wt::WDateTime listenedAt;
}; };
static std::vector<Entry> parse(std::string_view msgBody); static Result parse(std::string_view msgBody);
}; };
std::ostream& operator<<(std::ostream& os, const ListensParser::Entry& entry);
} // Scrobbling::ListenBrainz } // Scrobbling::ListenBrainz
src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
+6 -6
View File
@@ -143,7 +143,7 @@ namespace
} }
Database::TrackId Database::TrackId
tryGetMatchingTrack(Database::Session& session, const ListensParser::Entry& listen) tryGetMatchingTrack(Database::Session& session, const Listen& listen)
{ {
using namespace Database; using namespace Database;
@@ -216,13 +216,13 @@ namespace Scrobbling::ListenBrainz
} }
void void
ListensSynchronizer::enqueListenNow(const Listen& listen) ListensSynchronizer::enqueListenNow(const Scrobbling::Listen& listen)
{ {
enqueListen(listen, {}); enqueListen(listen, {});
} }
void void
ListensSynchronizer::enqueListen(const Listen& listen, const Wt::WDateTime& timePoint) ListensSynchronizer::enqueListen(const Scrobbling::Listen& listen, const Wt::WDateTime& timePoint)
{ {
Http::ClientPOSTRequestParameters request; Http::ClientPOSTRequestParameters request;
request.relativeUrl = "/1/submit-listens"; request.relativeUrl = "/1/submit-listens";
@@ -548,10 +548,10 @@ namespace Scrobbling::ListenBrainz
Database::Session& session {_db.getTLSSession()}; Database::Session& session {_db.getTLSSession()};
context.maxDateTime = {}; // invalidate to break in case no more listens are fetched context.maxDateTime = {}; // invalidate to break in case no more listens are fetched
std::vector<ListensParser::Entry> parsedListens {ListensParser::parse(msgBody)}; ListensParser::Result result {ListensParser::parse(msgBody)};
context.fetchedListenCount += parsedListens.size(); context.fetchedListenCount += result.listenCount;
for (const ListensParser::Entry& parsedListen : parsedListens) for (const Listen& parsedListen : result.listens)
{ {
// update oldest listen for the next query // update oldest listen for the next query
if (!parsedListen.listenedAt.isValid()) if (!parsedListen.listenedAt.isValid())
src/libs/services/scrobbling/test/Listenbrainz.cpp
+71 -49
View File
@@ -25,77 +25,99 @@ using namespace Scrobbling::ListenBrainz;
TEST(Listenbrainz, parseListens_empty) TEST(Listenbrainz, parseListens_empty)
{ {
std::vector<ListensParser::Entry> entries {ListensParser::parse("")}; ListensParser::Result result {ListensParser::parse("")};
EXPECT_EQ(entries.size(), 0); EXPECT_EQ(result.listenCount, 0);
EXPECT_EQ(result.listens.size(), 0);
entries = ListensParser::parse(R"({"payload":{"count":0,"latest_listen_ts":1664105200,"listens":[],"user_id":"epoupon"}})"); result = ListensParser::parse(R"({"payload":{"count":0,"latest_listen_ts":1664105200,"listens":[],"user_id":"epoupon"}})");
EXPECT_EQ(entries.size(), 0); EXPECT_EQ(result.listenCount, 0);
EXPECT_EQ(result.listens.size(), 0);
} }
TEST(Listenbrainz, parseListens_single_missingMBID) TEST(Listenbrainz, parseListens_single_missingMBID)
{ {
std::vector<ListensParser::Entry> entries {ListensParser::parse(R"({"payload":{"count":1,"latest_listen_ts":1663159479,"listens":[{"inserted_at":1650541124,"listened_at":1650541124,"recording_msid":"0e1418e3-b485-413a-84af-6316312cb116","track_metadata":{"additional_info":{"artist_msid":"ab5b27ad-e579-441c-ac60-d5dd9975c044","listening_from":"LMS","recording_msid":"0e1418e3-b485-413a-84af-6316312cb116","release_msid":"3f22f274-a9ee-4cb2-8dd1-f3bd18407099","tracknumber":8},"artist_name":"Broke For Free","release_name":"YEKOMS","track_name":"U2B"},"user_name":"epoupon"}],"user_id":"epoupon"}})")}; ListensParser::Result result {ListensParser::parse(R"({"payload":{"count":1,"latest_listen_ts":1663159479,"listens":[{"inserted_at":1650541124,"listened_at":1650541124,"recording_msid":"0e1418e3-b485-413a-84af-6316312cb116","track_metadata":{"additional_info":{"artist_msid":"ab5b27ad-e579-441c-ac60-d5dd9975c044","listening_from":"LMS","recording_msid":"0e1418e3-b485-413a-84af-6316312cb116","release_msid":"3f22f274-a9ee-4cb2-8dd1-f3bd18407099","tracknumber":8},"artist_name":"Broke For Free","release_name":"YEKOMS","track_name":"U2B"},"user_name":"epoupon"}],"user_id":"epoupon"}})")};
ASSERT_EQ(entries.size(), 1); EXPECT_EQ(result.listenCount, 1);
EXPECT_EQ(entries[0].trackName, "U2B"); ASSERT_EQ(result.listens.size(), 1);
EXPECT_EQ(entries[0].releaseName, "YEKOMS"); EXPECT_EQ(result.listens[0].trackName, "U2B");
EXPECT_EQ(entries[0].artistName, "Broke For Free"); EXPECT_EQ(result.listens[0].releaseName, "YEKOMS");
EXPECT_EQ(entries[0].recordingMBID, std::nullopt); EXPECT_EQ(result.listens[0].artistName, "Broke For Free");
EXPECT_EQ(entries[0].releaseMBID, std::nullopt); EXPECT_EQ(result.listens[0].recordingMBID, std::nullopt);
EXPECT_EQ(entries[0].trackNumber, 8); EXPECT_EQ(result.listens[0].releaseMBID, std::nullopt);
EXPECT_EQ(result.listens[0].trackNumber, 8);
Wt::WDateTime listenedAt; Wt::WDateTime listenedAt;
listenedAt.setTime_t(1650541124); listenedAt.setTime_t(1650541124);
EXPECT_EQ(entries[0].listenedAt, listenedAt); EXPECT_EQ(result.listens[0].listenedAt, listenedAt);
} }
TEST(Listenbrainz, parseListens_twoEntries) TEST(Listenbrainz, parseListens_tworesults)
{ {
std::vector<ListensParser::Entry> entries {ListensParser::parse(R"({"payload":{"count":2,"latest_listen_ts":1664028167,"listens":[{"inserted_at":1664028167,"listened_at":1664028167,"recording_msid":"29c11137-e40b-4875-9ec0-9a20a4bdc2d3","track_metadata":{"additional_info":{"artist_mbids":["069a1c1f-14eb-4d36-b0a0-77dffbd67713"],"artist_msid":null,"listening_from":"LMS","recording_mbid":"46ae879f-2dbe-46d3-99ad-05c116f97a30","recording_msid":"29c11137-e40b-4875-9ec0-9a20a4bdc2d3","release_mbid":"44915500-fbb9-4060-98ce-59a57a429edc","release_msid":null,"track_mbid":"5427a943-a096-4d0b-8b9a-53aca9ed61ac","tracknumber":5},"artist_name":"Broke For Free","mbid_mapping":{"artist_mbids":["069a1c1f-14eb-4d36-b0a0-77dffbd67713"],"recording_mbid":"46ae879f-2dbe-46d3-99ad-05c116f97a30","release_mbid":"44915500-fbb9-4060-98ce-59a57a429edc"},"release_name":"Petal","track_name":"Juparo"},"user_name":"epoupon"},{"inserted_at":1664027919,"listened_at":1664027918,"recording_msid":"fe5abc47-89cd-4235-80b5-00f47cecbe01","track_metadata":{"additional_info":{"artist_mbids":["069a1c1f-14eb-4d36-b0a0-77dffbd67713"],"artist_msid":null,"listening_from":"LMS","recording_mbid":"d89d042c-8cc1-4526-9080-5bab728ee15f","recording_msid":"fe5abc47-89cd-4235-80b5-00f47cecbe01","release_mbid":"44915500-fbb9-4060-98ce-59a57a429edc","release_msid":null,"track_mbid":"9f33a17f-e33e-492f-85a4-7b2e9e09613e","tracknumber":4},"artist_name":"Broke For Free","mbid_mapping":{"artist_mbids":["069a1c1f-14eb-4d36-b0a0-77dffbd67713"],"recording_mbid":"d89d042c-8cc1-4526-9080-5bab728ee15f","release_mbid":"44915500-fbb9-4060-98ce-59a57a429edc"},"release_name":"Petal","track_name":"Melt"},"user_name":"epoupon"}],"user_id":"epoupon"}})")}; ListensParser::Result result {ListensParser::parse(R"({"payload":{"count":2,"latest_listen_ts":1664028167,"listens":[{"inserted_at":1664028167,"listened_at":1664028167,"recording_msid":"29c11137-e40b-4875-9ec0-9a20a4bdc2d3","track_metadata":{"additional_info":{"artist_mbids":["069a1c1f-14eb-4d36-b0a0-77dffbd67713"],"artist_msid":null,"listening_from":"LMS","recording_mbid":"46ae879f-2dbe-46d3-99ad-05c116f97a30","recording_msid":"29c11137-e40b-4875-9ec0-9a20a4bdc2d3","release_mbid":"44915500-fbb9-4060-98ce-59a57a429edc","release_msid":null,"track_mbid":"5427a943-a096-4d0b-8b9a-53aca9ed61ac","tracknumber":5},"artist_name":"Broke For Free","mbid_mapping":{"artist_mbids":["069a1c1f-14eb-4d36-b0a0-77dffbd67713"],"recording_mbid":"46ae879f-2dbe-46d3-99ad-05c116f97a30","release_mbid":"44915500-fbb9-4060-98ce-59a57a429edc"},"release_name":"Petal","track_name":"Juparo"},"user_name":"epoupon"},{"inserted_at":1664027919,"listened_at":1664027918,"recording_msid":"fe5abc47-89cd-4235-80b5-00f47cecbe01","track_metadata":{"additional_info":{"artist_mbids":["069a1c1f-14eb-4d36-b0a0-77dffbd67713"],"artist_msid":null,"listening_from":"LMS","recording_mbid":"d89d042c-8cc1-4526-9080-5bab728ee15f","recording_msid":"fe5abc47-89cd-4235-80b5-00f47cecbe01","release_mbid":"44915500-fbb9-4060-98ce-59a57a429edc","release_msid":null,"track_mbid":"9f33a17f-e33e-492f-85a4-7b2e9e09613e","tracknumber":4},"artist_name":"Broke For Free","mbid_mapping":{"artist_mbids":["069a1c1f-14eb-4d36-b0a0-77dffbd67713"],"recording_mbid":"d89d042c-8cc1-4526-9080-5bab728ee15f","release_mbid":"44915500-fbb9-4060-98ce-59a57a429edc"},"release_name":"Petal","track_name":"Melt"},"user_name":"epoupon"}],"user_id":"epoupon"}})")};
ASSERT_EQ(entries.size(), 2); EXPECT_EQ(result.listenCount, 2);
EXPECT_EQ(entries[0].trackName, "Juparo"); ASSERT_EQ(result.listens.size(), 2);
EXPECT_EQ(entries[0].releaseName, "Petal"); EXPECT_EQ(result.listens[0].trackName, "Juparo");
EXPECT_EQ(entries[0].artistName, "Broke For Free"); EXPECT_EQ(result.listens[0].releaseName, "Petal");
ASSERT_TRUE(entries[0].recordingMBID.has_value()); EXPECT_EQ(result.listens[0].artistName, "Broke For Free");
EXPECT_EQ(entries[0].recordingMBID->getAsString(), "46ae879f-2dbe-46d3-99ad-05c116f97a30"); ASSERT_TRUE(result.listens[0].recordingMBID.has_value());
ASSERT_TRUE(entries[0].releaseMBID.has_value()); EXPECT_EQ(result.listens[0].recordingMBID->getAsString(), "46ae879f-2dbe-46d3-99ad-05c116f97a30");
EXPECT_EQ(entries[0].releaseMBID->getAsString(), "44915500-fbb9-4060-98ce-59a57a429edc"); ASSERT_TRUE(result.listens[0].releaseMBID.has_value());
EXPECT_EQ(entries[0].trackNumber, 5); EXPECT_EQ(result.listens[0].releaseMBID->getAsString(), "44915500-fbb9-4060-98ce-59a57a429edc");
EXPECT_EQ(result.listens[0].trackNumber, 5);
EXPECT_EQ(entries[1].trackName, "Melt"); EXPECT_EQ(result.listens[1].trackName, "Melt");
EXPECT_EQ(entries[1].releaseName, "Petal"); EXPECT_EQ(result.listens[1].releaseName, "Petal");
EXPECT_EQ(entries[1].artistName, "Broke For Free"); EXPECT_EQ(result.listens[1].artistName, "Broke For Free");
ASSERT_TRUE(entries[1].recordingMBID.has_value()); ASSERT_TRUE(result.listens[1].recordingMBID.has_value());
EXPECT_EQ(entries[1].recordingMBID->getAsString(), "d89d042c-8cc1-4526-9080-5bab728ee15f"); EXPECT_EQ(result.listens[1].recordingMBID->getAsString(), "d89d042c-8cc1-4526-9080-5bab728ee15f");
ASSERT_TRUE(entries[1].releaseMBID.has_value()); ASSERT_TRUE(result.listens[1].releaseMBID.has_value());
EXPECT_EQ(entries[1].releaseMBID->getAsString(), "44915500-fbb9-4060-98ce-59a57a429edc"); EXPECT_EQ(result.listens[1].releaseMBID->getAsString(), "44915500-fbb9-4060-98ce-59a57a429edc");
EXPECT_EQ(entries[1].trackNumber, 4); EXPECT_EQ(result.listens[1].trackNumber, 4);
}
TEST(Listenbrainz, parseListens_tworesults_butinvalid)
{
ListensParser::Result result {ListensParser::parse(R"({"payload":{"count":2,"latest_listen_ts":1664028167,"listens":[{"inserted_at":1664028167,"listened_at":1664028167,"recording_msid":"29c11137-e40b-4875-9ec0-9a20a4bdc2d3","track_metadata":{"additional_info":{"artist_mbids":["069a1c1f-14eb-4d36-b0a0-77dffbd67713"],"artist_msid":null,"listening_from":"LMS","recording_mbid":"46ae879f-2dbe-46d3-99ad-05c116f97a30","recording_msid":"29c11137-e40b-4875-9ec0-9a20a4bdc2d3","release_mbid":"44915500-fbb9-4060-98ce-59a57a429edc","release_msid":null,"track_mbid":"5427a943-a096-4d0b-8b9a-53aca9ed61ac","tracknumber":5},"artist_name":"Broke For Free","mbid_mapping":{"artist_mbids":["069a1c1f-14eb-4d36-b0a0-77dffbd67713"],"recording_mbid":"46ae879f-2dbe-46d3-99ad-05c116f97a30","release_mbid":"44915500-fbb9-4060-98ce-59a57a429edc"},"release_name":"Petal","track_name":"Juparo"},"user_name":"epoupon"},{"inserted_at":1664027919}],"user_id":"epoupon"}})")};
EXPECT_EQ(result.listenCount, 2);
ASSERT_EQ(result.listens.size(), 1);
EXPECT_EQ(result.listens[0].trackName, "Juparo");
EXPECT_EQ(result.listens[0].releaseName, "Petal");
EXPECT_EQ(result.listens[0].artistName, "Broke For Free");
ASSERT_TRUE(result.listens[0].recordingMBID.has_value());
EXPECT_EQ(result.listens[0].recordingMBID->getAsString(), "46ae879f-2dbe-46d3-99ad-05c116f97a30");
ASSERT_TRUE(result.listens[0].releaseMBID.has_value());
EXPECT_EQ(result.listens[0].releaseMBID->getAsString(), "44915500-fbb9-4060-98ce-59a57a429edc");
EXPECT_EQ(result.listens[0].trackNumber, 5);
} }
TEST(Listenbrainz, parseListens_entryNotFromLms) TEST(Listenbrainz, parseListens_entryNotFromLms)
{ {
std::vector<ListensParser::Entry> entries {ListensParser::parse(R"({"payload":{"count":1,"latest_listen_ts":1664105730,"listens":[{"inserted_at":1664105730,"listened_at":1664105730,"recording_msid":"6a11ff4d-0623-4b2e-98e0-0e172f1f28d7","track_metadata":{"additional_info":{"artist_msid":null,"media_player":"BrainzPlayer","music_service":"youtube.com","music_service_name":"youtube","origin_url":"https://www.youtube.com/watch?v=EBP5vL3YWTI","recording_msid":"6a11ff4d-0623-4b2e-98e0-0e172f1f28d7","release_msid":null,"submission_client":"BrainzPlayer"},"artist_name":"Dio","brainzplayer_metadata":{"track_name":"Dio - Breathless"},"mbid_mapping":{"artist_mbids":["c55193fb-f5d2-4839-a263-4c044fca1456"],"recording_mbid":"92929526-21d7-4e75-b759-1072951664c4","release_mbid":"16cbf9ba-2e38-3893-9f23-f8567e26c18b"},"release_name":"The Last in Line","track_name":"Breathless"},"user_name":"epoupon"}],"user_id":"epoupon"}})")}; ListensParser::Result result {ListensParser::parse(R"({"payload":{"count":1,"latest_listen_ts":1664105730,"listens":[{"inserted_at":1664105730,"listened_at":1664105730,"recording_msid":"6a11ff4d-0623-4b2e-98e0-0e172f1f28d7","track_metadata":{"additional_info":{"artist_msid":null,"media_player":"BrainzPlayer","music_service":"youtube.com","music_service_name":"youtube","origin_url":"https://www.youtube.com/watch?v=EBP5vL3YWTI","recording_msid":"6a11ff4d-0623-4b2e-98e0-0e172f1f28d7","release_msid":null,"submission_client":"BrainzPlayer"},"artist_name":"Dio","brainzplayer_metadata":{"track_name":"Dio - Breathless"},"mbid_mapping":{"artist_mbids":["c55193fb-f5d2-4839-a263-4c044fca1456"],"recording_mbid":"92929526-21d7-4e75-b759-1072951664c4","release_mbid":"16cbf9ba-2e38-3893-9f23-f8567e26c18b"},"release_name":"The Last in Line","track_name":"Breathless"},"user_name":"epoupon"}],"user_id":"epoupon"}})")};
ASSERT_EQ(entries.size(), 1); EXPECT_EQ(result.listenCount, 1);
EXPECT_EQ(entries[0].trackName, "Breathless"); ASSERT_EQ(result.listens.size(), 1);
EXPECT_EQ(entries[0].releaseName, "The Last in Line"); EXPECT_EQ(result.listens[0].trackName, "Breathless");
EXPECT_EQ(entries[0].artistName, "Dio"); EXPECT_EQ(result.listens[0].releaseName, "The Last in Line");
EXPECT_FALSE(entries[0].recordingMBID.has_value()); EXPECT_EQ(result.listens[0].artistName, "Dio");
EXPECT_FALSE(entries[0].releaseMBID.has_value()); EXPECT_FALSE(result.listens[0].recordingMBID.has_value());
EXPECT_FALSE(result.listens[0].releaseMBID.has_value());
} }
TEST(Listenbrainz, parseListens_multiArtists) TEST(Listenbrainz, parseListens_multiArtists)
{ {
std::vector<ListensParser::Entry> entries {ListensParser::parse(R"({"payload":{"count":1,"latest_listen_ts":1664106427,"listens":[{"inserted_at":1664106427,"listened_at":1664106427,"recording_msid":"b1dad0df-329b-443d-bacf-cdbebdddbfd0","track_metadata":{"additional_info":{"artist_mbids":["04ce0202-043d-4cbe-8f09-8abaf3b80c71","79311c51-9748-49df-baa1-d925fd29f4e8"],"artist_msid":null,"listening_from":"LMS","recording_mbid":"a5f380bc-0a85-4a9f-88db-d41bb9aa2a4b","recording_msid":"b1dad0df-329b-443d-bacf-cdbebdddbfd0","release_mbid":"147b4669-3d20-43f8-89c0-ba1da8b87dd3","release_msid":null,"track_mbid":"a20dd067-29b6-3d38-a0be-eeb86b4671c1","tracknumber":1},"artist_name":"Gloom","release_name":"Demovibes 9: Party, people going","track_name":"Stargazer of Disgrace"},"user_name":"epoupon"}],"user_id":"epoupon"}})")}; ListensParser::Result result {ListensParser::parse(R"({"payload":{"count":1,"latest_listen_ts":1664106427,"listens":[{"inserted_at":1664106427,"listened_at":1664106427,"recording_msid":"b1dad0df-329b-443d-bacf-cdbebdddbfd0","track_metadata":{"additional_info":{"artist_mbids":["04ce0202-043d-4cbe-8f09-8abaf3b80c71","79311c51-9748-49df-baa1-d925fd29f4e8"],"artist_msid":null,"listening_from":"LMS","recording_mbid":"a5f380bc-0a85-4a9f-88db-d41bb9aa2a4b","recording_msid":"b1dad0df-329b-443d-bacf-cdbebdddbfd0","release_mbid":"147b4669-3d20-43f8-89c0-ba1da8b87dd3","release_msid":null,"track_mbid":"a20dd067-29b6-3d38-a0be-eeb86b4671c1","tracknumber":1},"artist_name":"Gloom","release_name":"Demovibes 9: Party, people going","track_name":"Stargazer of Disgrace"},"user_name":"epoupon"}],"user_id":"epoupon"}})")};
ASSERT_EQ(entries.size(), 1); EXPECT_EQ(result.listenCount, 1);
ASSERT_EQ(result.listens.size(), 1);
} }
TEST(Listenbrainz, parseListens_minPayload) TEST(Listenbrainz, parseListens_minPayload)
{ {
std::vector<ListensParser::Entry> entries {ListensParser::parse(R"({"payload":{"count":1,"latest_listen_ts":1664106427,"listens":[{"track_metadata":{"artist_name":"Gloom","track_name":"Stargazer of Disgrace"},"user_name":"epoupon"}],"user_id":"epoupon"}})")}; ListensParser::Result result {ListensParser::parse(R"({"payload":{"count":1,"latest_listen_ts":1664106427,"listens":[{"track_metadata":{"artist_name":"Gloom","track_name":"Stargazer of Disgrace"},"user_name":"epoupon"}],"user_id":"epoupon"}})")};
ASSERT_EQ(entries.size(), 1); EXPECT_EQ(result.listenCount, 1);
EXPECT_FALSE(entries[0].listenedAt.isValid()); ASSERT_EQ(result.listens.size(), 1);
EXPECT_EQ(entries[0].trackName, "Stargazer of Disgrace"); EXPECT_FALSE(result.listens[0].listenedAt.isValid());
EXPECT_EQ(entries[0].artistName, "Gloom"); EXPECT_EQ(result.listens[0].trackName, "Stargazer of Disgrace");
EXPECT_EQ(entries[0].releaseName, ""); EXPECT_EQ(result.listens[0].artistName, "Gloom");
EXPECT_FALSE(entries[0].recordingMBID.has_value()); EXPECT_EQ(result.listens[0].releaseName, "");
EXPECT_FALSE(entries[0].releaseMBID.has_value()); EXPECT_FALSE(result.listens[0].recordingMBID.has_value());
EXPECT_FALSE(result.listens[0].releaseMBID.has_value());
} }