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

[ui] Corrected concurrent accesses for covers

Browse Source
This commit is contained in:
emeric
2015-03-22 13:08:43 +01:00
parent 8a0447f813
commit 94df478324
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/resource/CoverResource.cpp
+23 -9
View File
@@ -72,6 +72,7 @@ CoverResource::getTrackUrl(Database::Track::id_type trackId)
void
CoverResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response)
{
// Get the id of the track
const std::string *trackIdStr = request.getParameter("trackid");
const std::string *releaseStr = request.getParameter("release");
@@ -80,22 +81,35 @@ CoverResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons
if (trackIdStr)
{
Database::Track::id_type trackId;
Database::Track::id_type trackId = std::stol(*trackIdStr);
std::string path;
bool hasCover = false;;
{
std::istringstream iss(*trackIdStr);
iss >> trackId;
// transactions are not thread safe
std::unique_lock<std::mutex> lock(_mutex);
Wt::Dbo::Transaction transaction(_db.getSession());
Database::Track::pointer track = Database::Track::getById(_db.getSession(), trackId);
if (track)
{
hasCover = track->hasCover();;
path = track->getPath();
}
}
Wt::Dbo::Transaction transaction(_db.getSession());
Database::Track::pointer track = Database::Track::getById(_db.getSession(), trackId);
covers = CoverArt::Grabber::getFromTrack(track);
transaction.commit();
if (hasCover)
{
covers = CoverArt::Grabber::getFromTrack(path);
}
}
else if (releaseStr)
{
// transactions are not thread safe
std::unique_lock<std::mutex> lock(_mutex);
Wt::Dbo::Transaction transaction(_db.getSession());
covers = CoverArt::Grabber::getFromRelease(_db.getSession(), *releaseStr);
}