WIP, Remote Client/Server, fist working artist list!

remote/server/AudioCollectionRequestHandler.cpp

@@ -11,14 +11,21 @@ AudioCollectionRequestHandler::AudioCollectionRequestHandler(DatabaseHandler& db
 
 
 bool
-AudioCollectionRequestHandler::process(const AudioCollectionRequest& request, std::vector<ServerMessage> responses)
+AudioCollectionRequestHandler::process(const AudioCollectionRequest& request, AudioCollectionResponse& response)
 {
 
+	bool res = false;
+
 	switch (request.type())
 	{
 		case AudioCollectionRequest_Type_TypeGetArtistList:
 			if (request.has_get_artists())
-				return processGetArtists(request.get_artists(), responses);
+			{
+				res = processGetArtists(request.get_artists(), *response.mutable_artist_list());
+				if (res)
+					response.set_type(AudioCollectionResponse_Type_TypeArtistList);
+
+			}
 			else
 				std::cerr << "Bad AudioCollectionRequest_Type_TypeGetArtistList: message!" << std::endl;
 			break;
@@ -33,14 +40,30 @@ AudioCollectionRequestHandler::process(const AudioCollectionRequest& request, st
 			std::cerr << "Unhandled AudioCollectionRequest_Type = " << request.type() << std::endl;
 	}
 
-	return false;
+	return res;
 }
 
 bool
-AudioCollectionRequestHandler::processGetArtists(const AudioCollectionRequest::GetArtistList& request, std::vector<ServerMessage> responses)
+AudioCollectionRequestHandler::processGetArtists(const AudioCollectionRequest::GetArtistList& request, AudioCollectionResponse::ArtistList& response)
 {
 
 	// sanity checks
+	if (!request.has_batch_parameter())
+	{
+		std::cerr << "No batch parameters found!" << std::endl;
+		return false;
+	}
+
+	if (!request.batch_parameter().has_size()
+			|| !request.batch_parameter().has_offset())
+	{
+		std::cerr << "Missing batch parameter details" << std::endl;
+		return false;
+	}
+
+	std::cout << "Offset = " << request.batch_parameter().offset() << std::endl;
+	std::cout << "Size = " << request.batch_parameter().size() << std::endl;
+
 	if (request.has_filter_name())
 		std::cout << "Filter name = " << request.filter_name() << std::endl;
 
@@ -49,9 +72,6 @@ AudioCollectionRequestHandler::processGetArtists(const AudioCollectionRequest::G
 		std::cout << "Filter genre " << id << " = '" << request.filter_genre(id) << "'" << std::endl;
 	}
 
-	if (request.has_preferred_batch_size())
-		std::cout << "Requested batch size = " << request.preferred_batch_size() << std::endl;
-
 
 	// Now fetch requested data...
 
@@ -59,7 +79,7 @@ AudioCollectionRequestHandler::processGetArtists(const AudioCollectionRequest::G
 
 	Wt::Dbo::Transaction transaction( _db.getSession() );
 
-	Wt::Dbo::collection<Artist::pointer> artists = Artist::getAll( _db.getSession() );
+	Wt::Dbo::collection<Artist::pointer> artists = Artist::getAll( _db.getSession(), request.batch_parameter().offset(), request.batch_parameter().size() );
 
 	std::cout << "size = " << artists.size() << std::endl;
 
@@ -67,12 +87,15 @@ AudioCollectionRequestHandler::processGetArtists(const AudioCollectionRequest::G
 
 	for (Artists::iterator it = artists.begin(); it != artists.end(); ++it)
 	{
-		std::cout << "Spotted artist = " << (*it)->getName() << std::endl;
+		AudioCollectionResponse_Artist* artist = response.add_artists();
+
+		artist->set_name((*it)->getName());
+		artist->set_nb_releases(0);	// TODO
 	}
 
 	std::cout << "Getting artists DONE" << std::endl;
 
-	return false;
+	return true;
 }
 
 } // namespace Remote

remote/server/AudioCollectionRequestHandler.hpp

@@ -13,11 +13,11 @@ class AudioCollectionRequestHandler
 	public:
 		AudioCollectionRequestHandler(DatabaseHandler& db);
 
-		bool process(const AudioCollectionRequest& request, std::vector<ServerMessage> responses);
+		bool process(const AudioCollectionRequest& request, AudioCollectionResponse& response);
 
 	private:
 
-		bool processGetArtists(const AudioCollectionRequest::GetArtistList& request, std::vector<ServerMessage> responses);
+		bool processGetArtists(const AudioCollectionRequest::GetArtistList& request, AudioCollectionResponse::ArtistList& response);
 
 		DatabaseHandler& _db;
 

remote/server/Connection.cpp

@@ -105,7 +105,7 @@ Connection::handleReadMsg(const boost::system::error_code& error, std::size_t by
 		std::istream is(&_inputStreamBuf);
 		std::ostream os(&_outputStreamBuf);
 
-		std::vector<Remote::ServerMessage> responses;
+		Remote::ServerMessage response;
 		Remote::ClientMessage request;
 
 		if (!request.ParseFromIstream(&is))
@@ -115,14 +115,13 @@ Connection::handleReadMsg(const boost::system::error_code& error, std::size_t by
 			return;
 		}
 
-		if (!_requestHandler.process(request, responses))
+		if (!_requestHandler.process(request, response))
 		{
 			std::cerr << "Cannot process request!" << std::endl;
 			_connectionManager.stop(shared_from_this());
 			return;
 		}
 
-		BOOST_FOREACH(const Remote::ServerMessage& response, responses)
 		{
 			boost::system::error_code	ec;
 
@@ -156,9 +155,10 @@ Connection::handleReadMsg(const boost::system::error_code& error, std::size_t by
 					boost::asio::transfer_exactly(_outputStreamBuf.size()),
 					ec);
 
-			_outputStreamBuf.consume(n);
 			assert(n == _outputStreamBuf.size());
 
+			_outputStreamBuf.consume(n);
+
 			if (ec)
 			{
 				std::cerr << "cannot write msg: " << error.message() << std::endl;

remote/server/RequestHandler.cpp

@@ -11,9 +11,9 @@ _audioCollectionRequestHandler(_db)
 }
 
 bool
-RequestHandler::process(const ClientMessage& request, std::vector<ServerMessage> responses)
+RequestHandler::process(const ClientMessage& request, ServerMessage& response)
 {
-	std::cout << "TODO: process request!" << std::endl;
+	bool res = false;
 
 	switch(request.type())
 	{
@@ -23,7 +23,11 @@ RequestHandler::process(const ClientMessage& request, std::vector<ServerMessage>
 			break;
 		case ClientMessage_Type_AudioCollectionRequest:
 			if (request.has_audio_collection_request())
-				return _audioCollectionRequestHandler.process(request.audio_collection_request(), responses);
+			{
+				res = _audioCollectionRequestHandler.process(request.audio_collection_request(), *response.mutable_audio_collection_response());
+				if (res)
+					response.set_type( ServerMessage_Type_AudioCollectionResponse);
+			}
 			else
 				std::cerr << "Malformed AudioCollectionRequest message!" << std::endl;
 			break;
@@ -35,7 +39,7 @@ RequestHandler::process(const ClientMessage& request, std::vector<ServerMessage>
 			std::cerr << "Unhandled message type = " << request.type() << std::endl;
 	}
 
-	return false;
+	return res;
 }
 
 

remote/server/RequestHandler.hpp

@@ -18,9 +18,9 @@ class RequestHandler
 
 		RequestHandler(boost::filesystem::path dbPath);
 
-		bool process(const ClientMessage& request, std::vector<ServerMessage> responses);
+		bool process(const ClientMessage& request, ServerMessage& response);
 
-		bool processAudioCollectionRequest(const AudioCollectionRequest& request, std::vector<ServerMessage> responses);
+		bool processAudioCollectionRequest(const AudioCollectionRequest& request, ServerMessage& response);
 
 	private: