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

WIP, Remote Client/Server, cover art for tracks, TBT

Browse Source
This commit is contained in:
emeric
2014-06-11 14:40:08 +02:00
parent 18db5e23d9
commit 650945b5c4
5 changed files with 120 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cover/CoverArtGrabber.cpp
+26 -17
View File
@@ -9,10 +9,32 @@
namespace CoverArt {
std::vector<CoverArt>
Grabber::getFromRelease(Release::pointer release)
Grabber::getFromTrack(Track::pointer track)
{
std::vector<CoverArt> res;
try
{
Av::InputFormatContext input(track->getPath());
std::vector< std::vector<unsigned char> > pictures;
input.getPictures(pictures);
BOOST_FOREACH(const std::vector<unsigned char>& picture, pictures)
res.push_back( CoverArt("application/octet-stream", picture) );
}
catch(std::exception& e)
{
std::cerr << "Cannot get pictures: " << e.what();
}
return res;
}
std::vector<CoverArt>
Grabber::getFromRelease(Release::pointer release)
{
// TODO
// Check if there is an image file in the directory of the release
// For now, just get the cover art from the first track of the release
@@ -25,23 +47,10 @@ Grabber::getFromRelease(Release::pointer release)
if (firstTrack)
{
try
{
Av::InputFormatContext input(firstTrack->getPath());
std::vector< std::vector<unsigned char> > pictures;
input.getPictures(pictures);
BOOST_FOREACH(const std::vector<unsigned char>& picture, pictures)
res.push_back( CoverArt("application/octet-stream", picture) );
}
catch(std::exception& e)
{
std::cerr << "Cannot get pictures: " << e.what();
}
return Grabber::getFromTrack(firstTrack);
}
return res;
else
return std::vector<CoverArt>();
}
remote/messages/Header.hpp
+11 -13
View File
@@ -10,14 +10,13 @@ namespace Remote
class Header
{
public:
static const std::size_t size = 8; // HeaderSize
static const std::size_t max_data_size = 65536*64 - size;
static const std::size_t size = 8;
Header() : _size(0) {}
void setSize(std::size_t size) { _size = size; }
std::size_t getSize(void) const {return _size;}
Header() : _dataSize(0) {}
void setDataSize(std::size_t size) { _dataSize = size; }
std::size_t getDataSize(void) const {return _dataSize;}
bool from_istream(std::istream &is)
{
@@ -39,12 +38,12 @@ class Header
}
else
{
_size = decode32(&buffer[4]);
_dataSize = decode32(&buffer[4]);
if (_size > _maxSize)
std::cerr << "Header: msg too big (" << _size << ")!" << std::endl;
if (_dataSize > max_data_size)
std::cerr << "Header: msg too big (" << _dataSize << ")!" << std::endl;
return _size <= _maxSize;
return _dataSize <= max_data_size;
}
}
@@ -57,7 +56,7 @@ class Header
void to_buffer(std::array<unsigned char, size>& buffer) const
{
encode32(_magic, &buffer[0]);
encode32(_size, &buffer[4]);
encode32(_dataSize, &buffer[4]);
}
private:
@@ -78,9 +77,8 @@ class Header
}
static const uint32_t _magic = 0xdeadbeef;
static const uint32_t _maxSize = 65536*32;
uint32_t _size;
uint32_t _dataSize;
};
remote/server/AudioCollectionRequestHandler.cpp
+18 -2
View File
@@ -290,9 +290,25 @@ AudioCollectionRequestHandler::processGetCoverArt(const AudioCollectionRequest::
break;
case AudioCollectionRequest::GetCoverArt::TypeGetCoverArtTrack:
std::cerr << "TODO AudioCollectionRequest::GetCoverArt::TypeGetCoverArtTrack" <<std::endl;
break;
if (request.has_track_id())
{
Wt::Dbo::Transaction transaction( _db.getSession() );
// Get the request release
Track::pointer track = Track::getById( _db.getSession(), request.track_id());
std::vector<CoverArt::CoverArt> coverArts = CoverArt::Grabber::getFromTrack(track);
BOOST_FOREACH(const CoverArt::CoverArt& coverArt, coverArts)
{
AudioCollectionResponse_CoverArt* cover_art = response.add_cover_art();
cover_art->set_mime_type(coverArt.getMimeType());
cover_art->set_data( std::string( coverArt.getData().begin(), coverArt.getData().end()) );
}
}
res = true;
break;
}
return res;
remote/server/Connection.cpp
+10 -3
View File
@@ -84,11 +84,11 @@ Connection::handleReadHeader(const boost::system::error_code& error, std::size_t
}
// Now read the real message
boost::asio::streambuf::mutable_buffers_type bufs = _inputStreamBuf.prepare(header.getSize());
boost::asio::streambuf::mutable_buffers_type bufs = _inputStreamBuf.prepare(header.getDataSize());
boost::asio::async_read(_socket,
bufs,
boost::asio::transfer_exactly(header.getSize()),
boost::asio::transfer_exactly(header.getDataSize()),
boost::bind(&Connection::handleReadMsg, shared_from_this(),
boost::asio::placeholders::error,
boost::asio::placeholders::bytes_transferred));
@@ -138,10 +138,17 @@ Connection::handleReadMsg(const boost::system::error_code& error, std::size_t by
return;
}
if (_outputStreamBuf.size() >= Remote::Header::max_data_size)
{
std::cerr << "output message is too big! " << _outputStreamBuf.size() << " > " << Remote::Header::max_data_size << std::endl;
_connectionManager.stop(shared_from_this());
return;
}
std::array<unsigned char, Remote::Header::size> headerBuffer;
{
Remote::Header header;
header.setSize(_outputStreamBuf.size());
header.setDataSize(_outputStreamBuf.size());
header.to_buffer(headerBuffer);
}
test/RemoteClientServer.cpp
+55 -18
View File
@@ -364,6 +364,36 @@ class TestClient
mediaTerminate();
}
void getCoverTrack(std::vector<CoverArt>& coverArt, uint64_t trackId)
{
// Send request
Remote::ClientMessage request;
request.set_type( Remote::ClientMessage::AudioCollectionRequest );
request.mutable_audio_collection_request()->set_type( Remote::AudioCollectionRequest::TypeGetCoverArt);
request.mutable_audio_collection_request()->mutable_get_cover_art()->set_type( Remote::AudioCollectionRequest::GetCoverArt::TypeGetCoverArtTrack);
request.mutable_audio_collection_request()->mutable_get_cover_art()->set_track_id( trackId );
sendMsg(request);
// Receive responses
Remote::ServerMessage response;
recvMsg(response);
// Process message
if (!response.has_audio_collection_response())
throw std::runtime_error("not an audio_collection_response!");
for (int i = 0; i < response.audio_collection_response().cover_art_size(); ++i)
{
CoverArt cover;
cover.mimeType = response.audio_collection_response().cover_art(i).mime_type();
cover.data.assign(response.audio_collection_response().cover_art(i).data().begin(), response.audio_collection_response().cover_art(i).data().end());;
coverArt.push_back(cover);
}
}
void getCoverRelease(std::vector<CoverArt>& coverArt, uint64_t releaseId)
{
// Send request
@@ -536,13 +566,20 @@ class TestClient
// Serialize message
if (message.SerializeToOstream(&os))
{
if (_outputStreamBuf.size() > Remote::Header::max_data_size)
{
std::ostringstream oss; oss << "Message too big = " << _outputStreamBuf.size() << " bytes! (max is " << Remote::Header::max_data_size << ")" << std::endl;
throw std::runtime_error("Message to big!");
}
// Send message header
std::array<unsigned char, Remote::Header::size> headerBuffer;
// Generate header content
{
Remote::Header header;
header.setSize(_outputStreamBuf.size());
header.setDataSize(_outputStreamBuf.size());
header.to_buffer(headerBuffer);
}
@@ -589,13 +626,13 @@ class TestClient
// Read in a stream buffer
{
// reserve bytes in output sequence
boost::asio::streambuf::mutable_buffers_type bufs = _inputStreamBuf.prepare(header.getSize());
boost::asio::streambuf::mutable_buffers_type bufs = _inputStreamBuf.prepare(header.getDataSize());
std::size_t n = boost::asio::read(_socket,
bufs,
boost::asio::transfer_exactly(header.getSize()));
boost::asio::transfer_exactly(header.getDataSize()));
assert(n == header.getSize());
assert(n == header.getDataSize());
_inputStreamBuf.commit(n);
if (!message.ParseFromIstream(&is))
@@ -648,23 +685,15 @@ int main()
// **** Releases ******
std::vector<ReleaseInfo> releases;
client.getReleases(releases, std::vector<uint64_t>(1, 1162));
client.getReleases(releases, std::vector<uint64_t>());
BOOST_FOREACH(const ReleaseInfo& release, releases)
std::cout << "Release: '" << release << "'" << std::endl;
{
std::vector<ReleaseInfo> releases;
client.getReleases(releases, std::vector<uint64_t>());
BOOST_FOREACH(const ReleaseInfo& release, releases)
std::cout << "Release: '" << release << "'" << std::endl;
}
// **** Tracks ******
{
std::vector<TrackInfo> tracks;
client.getTracks(tracks, std::vector<uint64_t>(), std::vector<uint64_t>(), std::vector<uint64_t>());
BOOST_FOREACH(const TrackInfo& track, tracks)
std::cout << "Track: '" << track << "'" << std::endl;
}
std::vector<TrackInfo> tracks;
client.getTracks(tracks, std::vector<uint64_t>(), std::vector<uint64_t>(), std::vector<uint64_t>());
BOOST_FOREACH(const TrackInfo& track, tracks)
std::cout << "Track: '" << track << "'" << std::endl;
// Caution: long test!
/* if (extendedTests)
@@ -684,7 +713,6 @@ int main()
// ***** Covers *******
if (extendedTests)
{
BOOST_FOREACH(const ReleaseInfo& release, releases)
{
std::vector<CoverArt> coverArt;
@@ -692,6 +720,15 @@ int main()
std::cout << "Release '" << release << "', spotted " << coverArt.size() << " covers!" << std::endl;
}
BOOST_FOREACH(const TrackInfo& track, tracks)
{
std::vector<CoverArt> coverArt;
client.getCoverTrack(coverArt, track.id);
std::cout << "Track '" << track << "', spotted " << coverArt.size() << " covers!" << std::endl;
}
}
// ****** Transcode test ********