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

[Remote] Removed Revision payload

Browse Source
This commit is contained in:
emeric
2014-10-10 20:50:34 +02:00
parent 49ff050539
commit 1a7f17632e
5 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+5
View File
@@ -0,0 +1,5 @@
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
SUBDIRS = test src
src/remote/proto/collection.proto
-6
View File
@@ -11,11 +11,6 @@ message AudioCollectionRequest
required uint32 size = 2; // Number of elements requested. Server may not honor this size if too big required uint32 size = 2; // Number of elements requested. Server may not honor this size if too big
} }
message GetRevision
{
}
message GetGenreList message GetGenreList
{ {
required BatchParameter batch_parameter = 1; required BatchParameter batch_parameter = 1;
@@ -73,7 +68,6 @@ message AudioCollectionRequest
required Type type = 1; required Type type = 1;
optional GetRevision get_revision = 2;
optional GetGenreList get_genres = 3; optional GetGenreList get_genres = 3;
optional GetArtistList get_artists = 4; optional GetArtistList get_artists = 4;
optional GetReleaseList get_releases = 5; optional GetReleaseList get_releases = 5;
src/remote/server/AudioCollectionRequestHandler.cpp
+5 -9
View File
@@ -48,14 +48,10 @@ AudioCollectionRequestHandler::process(const AudioCollectionRequest& request, Au
switch (request.type()) switch (request.type())
{ {
case AudioCollectionRequest::TypeGetRevision: case AudioCollectionRequest::TypeGetRevision:
if (request.has_get_revision()) // No payload
{ res = processGetRevision(*response.mutable_revision());
res = processGetRevision(request.get_revision(), *response.mutable_revision()); if (res)
if (res) response.set_type(AudioCollectionResponse::TypeRevision);
response.set_type(AudioCollectionResponse::TypeRevision);
}
else
LMS_LOG(MOD_REMOTE, SEV_ERROR) << "Bad AudioCollectionRequest::TypeGetRevision";
break; break;
case AudioCollectionRequest::TypeGetGenreList: case AudioCollectionRequest::TypeGetGenreList:
@@ -365,7 +361,7 @@ AudioCollectionRequestHandler::processGetCoverArt(const AudioCollectionRequest::
} }
bool bool
AudioCollectionRequestHandler::processGetRevision(const AudioCollectionRequest::GetRevision& request, AudioCollectionResponse::Revision& response) AudioCollectionRequestHandler::processGetRevision(AudioCollectionResponse::Revision& response)
{ {
bool res = false; bool res = false;
src/remote/server/AudioCollectionRequestHandler.hpp
+1 -1
View File
@@ -36,7 +36,7 @@ class AudioCollectionRequestHandler
private: private:
bool processGetRevision(const AudioCollectionRequest::GetRevision& request, AudioCollectionResponse::Revision& response); bool processGetRevision(AudioCollectionResponse::Revision& response);
bool processGetArtists(const AudioCollectionRequest::GetArtistList& request, AudioCollectionResponse::ArtistList& response); bool processGetArtists(const AudioCollectionRequest::GetArtistList& request, AudioCollectionResponse::ArtistList& response);
bool processGetGenres(const AudioCollectionRequest::GetGenreList& request, AudioCollectionResponse::GenreList& response); bool processGetGenres(const AudioCollectionRequest::GetGenreList& request, AudioCollectionResponse::GenreList& response);
bool processGetReleases(const AudioCollectionRequest::GetReleaseList& request, AudioCollectionResponse::ReleaseList& response); bool processGetReleases(const AudioCollectionRequest::GetReleaseList& request, AudioCollectionResponse::ReleaseList& response);
test/RemoteClientServer.cpp
+1 -2
View File
@@ -24,9 +24,9 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/asio/ssl.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include "remote/server/Server.hpp"
#include "remote/messages/Header.hpp" #include "remote/messages/Header.hpp"
#include "messages.pb.h" #include "messages.pb.h"
@@ -441,7 +441,6 @@ class TestClient
request.set_type( Remote::ClientMessage::AudioCollectionRequest ); request.set_type( Remote::ClientMessage::AudioCollectionRequest );
request.mutable_audio_collection_request()->set_type( Remote::AudioCollectionRequest::TypeGetRevision); request.mutable_audio_collection_request()->set_type( Remote::AudioCollectionRequest::TypeGetRevision);
request.mutable_audio_collection_request()->mutable_get_revision();
sendMsg(request); sendMsg(request);