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

[Database] Simplified track interface

Browse Source
This commit is contained in:
emeric
2015-03-22 13:37:21 +01:00
parent 94df478324
commit 21c858562e
4 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cover/CoverArtGrabber.cpp
+3 -5
View File
@@ -103,13 +103,11 @@ Grabber::getFromRelease(Wt::Dbo::Session& session, std::string releaseName)
SearchFilter filter;
filter.exactMatch[SearchFilter::Field::Release].push_back(releaseName);
Wt::Dbo::collection<Track::pointer> tracks
std::vector<Track::pointer> tracks
= Track::getAll(session, filter, -1, 1 /* limit result size */);
Wt::Dbo::collection<Database::Track::pointer>::iterator it = tracks.begin();
if (it != tracks.end())
return getFromTrack(*it);
if (!tracks.empty())
return getFromTrack( tracks.front() );
else
return std::vector<CoverArt>();
}
src/database/Track.cpp
+4 -5
View File
@@ -194,18 +194,17 @@ Track::getAllQuery(Wt::Dbo::Session& session, SearchFilter filter)
return query;
}
Wt::Dbo::collection< Track::pointer >
std::vector<Track::pointer>
Track::getAll(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size)
{
return getAllQuery(session, filter).limit(size).offset(offset);
Wt::Dbo::collection<Track::pointer> res = getAllQuery(session, filter).limit(size).offset(offset);
return std::vector<Track::pointer>(res.begin(), res.end());
}
std::vector<Track::pointer>
Track::getTracks(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size)
{
Wt::Dbo::collection< Track::pointer > tracks = getAll(session, filter, offset, size);
return std::vector<Track::pointer>(tracks.begin(), tracks.end());
return getAll(session, filter, offset, size);
}
Wt::Dbo::Query<Track::ReleaseResult>
src/database/Track.hpp
+1 -1
View File
@@ -110,7 +110,7 @@ class Track
static pointer getById(Wt::Dbo::Session& session, id_type id);
static Wt::Dbo::collection< pointer > getAll(Wt::Dbo::Session& session);
// Used for remote
static Wt::Dbo::collection< pointer > getAll(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1);
static std::vector<pointer> getAll(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1);
static std::vector<pointer> getTracks(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1);
static std::vector<std::string> getReleases(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1);
static std::vector<std::string> getArtists(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1);
src/remote/server/AudioCollectionRequestHandler.cpp
+19 -23
View File
@@ -256,33 +256,31 @@ AudioCollectionRequestHandler::processGetTracks(const AudioCollectionRequest::Ge
Wt::Dbo::Transaction transaction( _db.getSession() );
Wt::Dbo::collection<Database::Track::pointer> tracks
std::vector<Database::Track::pointer> tracks
= Database::Track::getAll( _db.getSession(), filter,
request.batch_parameter().offset(), static_cast<int>(size));
typedef Wt::Dbo::collection< Database::Track::pointer > Tracks;
for (Tracks::const_iterator it = tracks.begin(); it != tracks.end(); ++it)
BOOST_FOREACH(Database::Track::pointer track, tracks)
{
AudioCollectionResponse_Track* track = response.add_tracks();
AudioCollectionResponse_Track* newTrack = response.add_tracks();
track->set_id(it->id());
track->set_disc_number( (*it)->getDiscNumber() );
track->set_track_number( (*it)->getTrackNumber() );
track->set_artist( (*it)->getArtistName() );
track->set_release( (*it)->getReleaseName() );
newTrack->set_id(track.id());
newTrack->set_disc_number( track->getDiscNumber() );
newTrack->set_track_number( track->getTrackNumber() );
newTrack->set_artist( track->getArtistName() );
newTrack->set_release( track->getReleaseName() );
track->set_name( std::string( boost::locale::conv::to_utf<char>((*it)->getName(), "UTF-8") ) );
track->set_duration_secs( (*it)->getDuration().total_seconds() );
newTrack->set_name( std::string( boost::locale::conv::to_utf<char>(track->getName(), "UTF-8") ) );
newTrack->set_duration_secs( track->getDuration().total_seconds() );
// Only send the year part of the release times
if (!(*it)->getDate().is_special())
track->set_release_date( std::to_string((*it)->getDate().date().year()) );
if (!(*it)->getOriginalDate().is_special())
track->set_original_release_date( std::to_string((*it)->getOriginalDate().date().year()) );
if (!track->getDate().is_special())
newTrack->set_release_date( std::to_string(track->getDate().date().year()) );
if (!track->getOriginalDate().is_special())
newTrack->set_original_release_date( std::to_string(track->getOriginalDate().date().year()) );
BOOST_FOREACH(Database::Genre::pointer genre, (*it)->getGenres())
track->add_genre( genre->getName() );
BOOST_FOREACH(Database::Genre::pointer genre, track->getGenres())
newTrack->add_genre( genre->getName() );
}
@@ -307,13 +305,11 @@ AudioCollectionRequestHandler::processGetCoverArt(const AudioCollectionRequest::
SearchFilter filter;
filter.exactMatch[SearchFilter::Field::Release].push_back(request.release());
Wt::Dbo::collection<Database::Track::pointer> tracks
std::vector<Database::Track::pointer> tracks
= Database::Track::getAll(_db.getSession(), filter, -1, 1 /* limit reuslt size */);
Wt::Dbo::collection<Database::Track::pointer>::iterator it = tracks.begin();
if (it != tracks.end())
track = *it;
if (!tracks.empty())
track = tracks.front();
res = true;
}