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

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

Browse Source
This commit is contained in:
emeric
2014-05-16 14:26:37 +02:00
parent 690fac67e0
commit 3b7813a581
15 changed files with 912 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database/Artist.cpp
+2 -2
View File
@@ -31,7 +31,7 @@ Artist::getNone(Wt::Dbo::Session& session)
}
Wt::Dbo::collection<Artist::pointer>
Artist::getAll(Wt::Dbo::Session& session)
Artist::getAll(Wt::Dbo::Session& session, std::size_t offset, std::size_t size)
{
return session.find<Artist>();
return session.find<Artist>().offset(offset).limit(size);
}
database/AudioTypes.hpp
+1 -1
View File
@@ -27,7 +27,7 @@ class Artist
// Accessors
static pointer getByName(Wt::Dbo::Session& session, const std::string& name);
static pointer getNone(Wt::Dbo::Session& session);
static Wt::Dbo::collection<pointer> getAll(Wt::Dbo::Session& session);
static Wt::Dbo::collection<pointer> getAll(Wt::Dbo::Session& session, std::size_t offset, std::size_t size);
const std::string& getName(void) const { return _name; }
remote/messages/Header.hpp
+2 -2
View File
@@ -41,11 +41,11 @@ class Header
}
}
void to_ostream(std::ostream& os)
/* void to_ostream(std::ostream& os)
{
}
}*/
void to_buffer(std::array<unsigned char, size>& buffer) const
{
remote/messages/collection.pb.cc
+496 -359
View File
File diff suppressed because it is too large Load Diff
remote/messages/collection.pb.h
+314 -242
View File
@@ -36,6 +36,7 @@ void protobuf_AssignDesc_collection_2eproto();
void protobuf_ShutdownFile_collection_2eproto();
class AudioCollectionRequest;
class AudioCollectionRequest_BatchParameter;
class AudioCollectionRequest_GetGenreList;
class AudioCollectionRequest_GetArtistList;
class AudioCollectionRequest_GetReleaseList;
@@ -52,12 +53,13 @@ class AudioCollectionResponse_Release;
class AudioCollectionResponse_Track;
enum AudioCollectionRequest_Type {
AudioCollectionRequest_Type_TypeGetArtistList = 0,
AudioCollectionRequest_Type_TypeGetReleaseList = 1,
AudioCollectionRequest_Type_TypeGetTrackList = 2
AudioCollectionRequest_Type_TypeGetGenreList = 0,
AudioCollectionRequest_Type_TypeGetArtistList = 1,
AudioCollectionRequest_Type_TypeGetReleaseList = 2,
AudioCollectionRequest_Type_TypeGetTrackList = 3
};
bool AudioCollectionRequest_Type_IsValid(int value);
const AudioCollectionRequest_Type AudioCollectionRequest_Type_Type_MIN = AudioCollectionRequest_Type_TypeGetArtistList;
const AudioCollectionRequest_Type AudioCollectionRequest_Type_Type_MIN = AudioCollectionRequest_Type_TypeGetGenreList;
const AudioCollectionRequest_Type AudioCollectionRequest_Type_Type_MAX = AudioCollectionRequest_Type_TypeGetTrackList;
const int AudioCollectionRequest_Type_Type_ARRAYSIZE = AudioCollectionRequest_Type_Type_MAX + 1;
@@ -72,13 +74,14 @@ inline bool AudioCollectionRequest_Type_Parse(
AudioCollectionRequest_Type_descriptor(), name, value);
}
enum AudioCollectionResponse_Type {
AudioCollectionResponse_Type_TypeGenreList = 1,
AudioCollectionResponse_Type_TypeArtistList = 2,
AudioCollectionResponse_Type_TypeReleaseList = 3,
AudioCollectionResponse_Type_TypeTrackList = 4
AudioCollectionResponse_Type_TypeError = 1,
AudioCollectionResponse_Type_TypeGenreList = 2,
AudioCollectionResponse_Type_TypeArtistList = 3,
AudioCollectionResponse_Type_TypeReleaseList = 4,
AudioCollectionResponse_Type_TypeTrackList = 5
};
bool AudioCollectionResponse_Type_IsValid(int value);
const AudioCollectionResponse_Type AudioCollectionResponse_Type_Type_MIN = AudioCollectionResponse_Type_TypeGenreList;
const AudioCollectionResponse_Type AudioCollectionResponse_Type_Type_MIN = AudioCollectionResponse_Type_TypeError;
const AudioCollectionResponse_Type AudioCollectionResponse_Type_Type_MAX = AudioCollectionResponse_Type_TypeTrackList;
const int AudioCollectionResponse_Type_Type_ARRAYSIZE = AudioCollectionResponse_Type_Type_MAX + 1;
@@ -94,6 +97,98 @@ inline bool AudioCollectionResponse_Type_Parse(
}
// ===================================================================
class AudioCollectionRequest_BatchParameter : public ::google::protobuf::Message {
public:
AudioCollectionRequest_BatchParameter();
virtual ~AudioCollectionRequest_BatchParameter();
AudioCollectionRequest_BatchParameter(const AudioCollectionRequest_BatchParameter& from);
inline AudioCollectionRequest_BatchParameter& operator=(const AudioCollectionRequest_BatchParameter& from) {
CopyFrom(from);
return *this;
}
inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
return _unknown_fields_;
}
inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
return &_unknown_fields_;
}
static const ::google::protobuf::Descriptor* descriptor();
static const AudioCollectionRequest_BatchParameter& default_instance();
void Swap(AudioCollectionRequest_BatchParameter* other);
// implements Message ----------------------------------------------
AudioCollectionRequest_BatchParameter* New() const;
void CopyFrom(const ::google::protobuf::Message& from);
void MergeFrom(const ::google::protobuf::Message& from);
void CopyFrom(const AudioCollectionRequest_BatchParameter& from);
void MergeFrom(const AudioCollectionRequest_BatchParameter& from);
void Clear();
bool IsInitialized() const;
int ByteSize() const;
bool MergePartialFromCodedStream(
::google::protobuf::io::CodedInputStream* input);
void SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
int GetCachedSize() const { return _cached_size_; }
private:
void SharedCtor();
void SharedDtor();
void SetCachedSize(int size) const;
public:
::google::protobuf::Metadata GetMetadata() const;
// nested types ----------------------------------------------------
// accessors -------------------------------------------------------
// required uint32 offset = 1;
inline bool has_offset() const;
inline void clear_offset();
static const int kOffsetFieldNumber = 1;
inline ::google::protobuf::uint32 offset() const;
inline void set_offset(::google::protobuf::uint32 value);
// required uint32 size = 2;
inline bool has_size() const;
inline void clear_size();
static const int kSizeFieldNumber = 2;
inline ::google::protobuf::uint32 size() const;
inline void set_size(::google::protobuf::uint32 value);
// @@protoc_insertion_point(class_scope:Remote.AudioCollectionRequest.BatchParameter)
private:
inline void set_has_offset();
inline void clear_has_offset();
inline void set_has_size();
inline void clear_has_size();
::google::protobuf::UnknownFieldSet _unknown_fields_;
::google::protobuf::uint32 offset_;
::google::protobuf::uint32 size_;
mutable int _cached_size_;
::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
friend void protobuf_AddDesc_collection_2eproto();
friend void protobuf_AssignDesc_collection_2eproto();
friend void protobuf_ShutdownFile_collection_2eproto();
void InitAsDefaultInstance();
static AudioCollectionRequest_BatchParameter* default_instance_;
};
// -------------------------------------------------------------------
class AudioCollectionRequest_GetGenreList : public ::google::protobuf::Message {
public:
AudioCollectionRequest_GetGenreList();
@@ -273,25 +368,27 @@ class AudioCollectionRequest_GetArtistList : public ::google::protobuf::Message
inline const ::google::protobuf::RepeatedPtrField< ::std::string>& filter_genre() const;
inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_filter_genre();
// optional uint32 preferred_batch_size = 3;
inline bool has_preferred_batch_size() const;
inline void clear_preferred_batch_size();
static const int kPreferredBatchSizeFieldNumber = 3;
inline ::google::protobuf::uint32 preferred_batch_size() const;
inline void set_preferred_batch_size(::google::protobuf::uint32 value);
// required .Remote.AudioCollectionRequest.BatchParameter batch_parameter = 3;
inline bool has_batch_parameter() const;
inline void clear_batch_parameter();
static const int kBatchParameterFieldNumber = 3;
inline const ::Remote::AudioCollectionRequest_BatchParameter& batch_parameter() const;
inline ::Remote::AudioCollectionRequest_BatchParameter* mutable_batch_parameter();
inline ::Remote::AudioCollectionRequest_BatchParameter* release_batch_parameter();
inline void set_allocated_batch_parameter(::Remote::AudioCollectionRequest_BatchParameter* batch_parameter);
// @@protoc_insertion_point(class_scope:Remote.AudioCollectionRequest.GetArtistList)
private:
inline void set_has_filter_name();
inline void clear_has_filter_name();
inline void set_has_preferred_batch_size();
inline void clear_has_preferred_batch_size();
inline void set_has_batch_parameter();
inline void clear_has_batch_parameter();
::google::protobuf::UnknownFieldSet _unknown_fields_;
::std::string* filter_name_;
::google::protobuf::RepeatedPtrField< ::std::string> filter_genre_;
::google::protobuf::uint32 preferred_batch_size_;
::Remote::AudioCollectionRequest_BatchParameter* batch_parameter_;
mutable int _cached_size_;
::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
@@ -410,12 +507,14 @@ class AudioCollectionRequest_GetReleaseList : public ::google::protobuf::Message
inline bool get_cover() const;
inline void set_get_cover(bool value);
// optional uint32 preferred_batch_size = 5;
inline bool has_preferred_batch_size() const;
inline void clear_preferred_batch_size();
static const int kPreferredBatchSizeFieldNumber = 5;
inline ::google::protobuf::uint32 preferred_batch_size() const;
inline void set_preferred_batch_size(::google::protobuf::uint32 value);
// required .Remote.AudioCollectionRequest.BatchParameter batch_parameter = 5;
inline bool has_batch_parameter() const;
inline void clear_batch_parameter();
static const int kBatchParameterFieldNumber = 5;
inline const ::Remote::AudioCollectionRequest_BatchParameter& batch_parameter() const;
inline ::Remote::AudioCollectionRequest_BatchParameter* mutable_batch_parameter();
inline ::Remote::AudioCollectionRequest_BatchParameter* release_batch_parameter();
inline void set_allocated_batch_parameter(::Remote::AudioCollectionRequest_BatchParameter* batch_parameter);
// @@protoc_insertion_point(class_scope:Remote.AudioCollectionRequest.GetReleaseList)
private:
@@ -423,16 +522,16 @@ class AudioCollectionRequest_GetReleaseList : public ::google::protobuf::Message
inline void clear_has_filter_name();
inline void set_has_get_cover();
inline void clear_has_get_cover();
inline void set_has_preferred_batch_size();
inline void clear_has_preferred_batch_size();
inline void set_has_batch_parameter();
inline void clear_has_batch_parameter();
::google::protobuf::UnknownFieldSet _unknown_fields_;
::std::string* filter_name_;
::google::protobuf::RepeatedPtrField< ::std::string> artist_name_;
::google::protobuf::RepeatedPtrField< ::std::string> filter_genre_;
::Remote::AudioCollectionRequest_BatchParameter* batch_parameter_;
bool get_cover_;
::google::protobuf::uint32 preferred_batch_size_;
mutable int _cached_size_;
::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
@@ -581,12 +680,14 @@ class AudioCollectionRequest_GetTrackList : public ::google::protobuf::Message {
inline bool get_cover() const;
inline void set_get_cover(bool value);
// optional uint32 preferred_batch_size = 8;
inline bool has_preferred_batch_size() const;
inline void clear_preferred_batch_size();
static const int kPreferredBatchSizeFieldNumber = 8;
inline ::google::protobuf::uint32 preferred_batch_size() const;
inline void set_preferred_batch_size(::google::protobuf::uint32 value);
// required .Remote.AudioCollectionRequest.BatchParameter batch_parameter = 8;
inline bool has_batch_parameter() const;
inline void clear_batch_parameter();
static const int kBatchParameterFieldNumber = 8;
inline const ::Remote::AudioCollectionRequest_BatchParameter& batch_parameter() const;
inline ::Remote::AudioCollectionRequest_BatchParameter* mutable_batch_parameter();
inline ::Remote::AudioCollectionRequest_BatchParameter* release_batch_parameter();
inline void set_allocated_batch_parameter(::Remote::AudioCollectionRequest_BatchParameter* batch_parameter);
// @@protoc_insertion_point(class_scope:Remote.AudioCollectionRequest.GetTrackList)
private:
@@ -598,8 +699,8 @@ class AudioCollectionRequest_GetTrackList : public ::google::protobuf::Message {
inline void clear_has_track_number();
inline void set_has_get_cover();
inline void clear_has_get_cover();
inline void set_has_preferred_batch_size();
inline void clear_has_preferred_batch_size();
inline void set_has_batch_parameter();
inline void clear_has_batch_parameter();
::google::protobuf::UnknownFieldSet _unknown_fields_;
@@ -609,8 +710,8 @@ class AudioCollectionRequest_GetTrackList : public ::google::protobuf::Message {
::google::protobuf::RepeatedPtrField< ::std::string> filter_genre_;
::google::protobuf::uint32 disc_number_;
::google::protobuf::uint32 track_number_;
::Remote::AudioCollectionRequest_BatchParameter* batch_parameter_;
bool get_cover_;
::google::protobuf::uint32 preferred_batch_size_;
mutable int _cached_size_;
::google::protobuf::uint32 _has_bits_[(8 + 31) / 32];
@@ -676,12 +777,14 @@ class AudioCollectionRequest : public ::google::protobuf::Message {
// nested types ----------------------------------------------------
typedef AudioCollectionRequest_BatchParameter BatchParameter;
typedef AudioCollectionRequest_GetGenreList GetGenreList;
typedef AudioCollectionRequest_GetArtistList GetArtistList;
typedef AudioCollectionRequest_GetReleaseList GetReleaseList;
typedef AudioCollectionRequest_GetTrackList GetTrackList;
typedef AudioCollectionRequest_Type Type;
static const Type TypeGetGenreList = AudioCollectionRequest_Type_TypeGetGenreList;
static const Type TypeGetArtistList = AudioCollectionRequest_Type_TypeGetArtistList;
static const Type TypeGetReleaseList = AudioCollectionRequest_Type_TypeGetReleaseList;
static const Type TypeGetTrackList = AudioCollectionRequest_Type_TypeGetTrackList;
@@ -838,13 +941,6 @@ class AudioCollectionResponse_GenreList : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
// required bool last = 1;
inline bool has_last() const;
inline void clear_last();
static const int kLastFieldNumber = 1;
inline bool last() const;
inline void set_last(bool value);
// repeated .Remote.AudioCollectionResponse.Genre genres = 2;
inline int genres_size() const;
inline void clear_genres();
@@ -859,16 +955,13 @@ class AudioCollectionResponse_GenreList : public ::google::protobuf::Message {
// @@protoc_insertion_point(class_scope:Remote.AudioCollectionResponse.GenreList)
private:
inline void set_has_last();
inline void clear_has_last();
::google::protobuf::UnknownFieldSet _unknown_fields_;
::google::protobuf::RepeatedPtrField< ::Remote::AudioCollectionResponse_Genre > genres_;
bool last_;
mutable int _cached_size_;
::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
friend void protobuf_AddDesc_collection_2eproto();
friend void protobuf_AssignDesc_collection_2eproto();
@@ -933,13 +1026,6 @@ class AudioCollectionResponse_ArtistList : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
// required bool last = 1;
inline bool has_last() const;
inline void clear_last();
static const int kLastFieldNumber = 1;
inline bool last() const;
inline void set_last(bool value);
// repeated .Remote.AudioCollectionResponse.Artist artists = 2;
inline int artists_size() const;
inline void clear_artists();
@@ -954,16 +1040,13 @@ class AudioCollectionResponse_ArtistList : public ::google::protobuf::Message {
// @@protoc_insertion_point(class_scope:Remote.AudioCollectionResponse.ArtistList)
private:
inline void set_has_last();
inline void clear_has_last();
::google::protobuf::UnknownFieldSet _unknown_fields_;
::google::protobuf::RepeatedPtrField< ::Remote::AudioCollectionResponse_Artist > artists_;
bool last_;
mutable int _cached_size_;
::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
friend void protobuf_AddDesc_collection_2eproto();
friend void protobuf_AssignDesc_collection_2eproto();
@@ -1028,13 +1111,6 @@ class AudioCollectionResponse_ReleaseList : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
// required bool last = 1;
inline bool has_last() const;
inline void clear_last();
static const int kLastFieldNumber = 1;
inline bool last() const;
inline void set_last(bool value);
// repeated .Remote.AudioCollectionResponse.Release releases = 2;
inline int releases_size() const;
inline void clear_releases();
@@ -1049,16 +1125,13 @@ class AudioCollectionResponse_ReleaseList : public ::google::protobuf::Message {
// @@protoc_insertion_point(class_scope:Remote.AudioCollectionResponse.ReleaseList)
private:
inline void set_has_last();
inline void clear_has_last();
::google::protobuf::UnknownFieldSet _unknown_fields_;
::google::protobuf::RepeatedPtrField< ::Remote::AudioCollectionResponse_Release > releases_;
bool last_;
mutable int _cached_size_;
::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
friend void protobuf_AddDesc_collection_2eproto();
friend void protobuf_AssignDesc_collection_2eproto();
@@ -1123,13 +1196,6 @@ class AudioCollectionResponse_TrackList : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
// required bool last = 1;
inline bool has_last() const;
inline void clear_last();
static const int kLastFieldNumber = 1;
inline bool last() const;
inline void set_last(bool value);
// repeated .Remote.AudioCollectionResponse.Track tracks = 2;
inline int tracks_size() const;
inline void clear_tracks();
@@ -1144,16 +1210,13 @@ class AudioCollectionResponse_TrackList : public ::google::protobuf::Message {
// @@protoc_insertion_point(class_scope:Remote.AudioCollectionResponse.TrackList)
private:
inline void set_has_last();
inline void clear_has_last();
::google::protobuf::UnknownFieldSet _unknown_fields_;
::google::protobuf::RepeatedPtrField< ::Remote::AudioCollectionResponse_Track > tracks_;
bool last_;
mutable int _cached_size_;
::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
friend void protobuf_AddDesc_collection_2eproto();
friend void protobuf_AssignDesc_collection_2eproto();
@@ -1853,6 +1916,7 @@ class AudioCollectionResponse : public ::google::protobuf::Message {
typedef AudioCollectionResponse_Track Track;
typedef AudioCollectionResponse_Type Type;
static const Type TypeError = AudioCollectionResponse_Type_TypeError;
static const Type TypeGenreList = AudioCollectionResponse_Type_TypeGenreList;
static const Type TypeArtistList = AudioCollectionResponse_Type_TypeArtistList;
static const Type TypeReleaseList = AudioCollectionResponse_Type_TypeReleaseList;
@@ -1880,22 +1944,22 @@ class AudioCollectionResponse : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
// required .Remote.Error error = 1;
// optional .Remote.AudioCollectionResponse.Type type = 1;
inline bool has_type() const;
inline void clear_type();
static const int kTypeFieldNumber = 1;
inline ::Remote::AudioCollectionResponse_Type type() const;
inline void set_type(::Remote::AudioCollectionResponse_Type value);
// optional .Remote.Error error = 2;
inline bool has_error() const;
inline void clear_error();
static const int kErrorFieldNumber = 1;
static const int kErrorFieldNumber = 2;
inline const ::Remote::Error& error() const;
inline ::Remote::Error* mutable_error();
inline ::Remote::Error* release_error();
inline void set_allocated_error(::Remote::Error* error);
// optional .Remote.AudioCollectionResponse.Type type = 2;
inline bool has_type() const;
inline void clear_type();
static const int kTypeFieldNumber = 2;
inline ::Remote::AudioCollectionResponse_Type type() const;
inline void set_type(::Remote::AudioCollectionResponse_Type value);
// optional .Remote.AudioCollectionResponse.GenreList genre_list = 3;
inline bool has_genre_list() const;
inline void clear_genre_list();
@@ -1934,10 +1998,10 @@ class AudioCollectionResponse : public ::google::protobuf::Message {
// @@protoc_insertion_point(class_scope:Remote.AudioCollectionResponse)
private:
inline void set_has_error();
inline void clear_has_error();
inline void set_has_type();
inline void clear_has_type();
inline void set_has_error();
inline void clear_has_error();
inline void set_has_genre_list();
inline void clear_has_genre_list();
inline void set_has_artist_list();
@@ -1971,6 +2035,54 @@ class AudioCollectionResponse : public ::google::protobuf::Message {
// ===================================================================
// AudioCollectionRequest_BatchParameter
// required uint32 offset = 1;
inline bool AudioCollectionRequest_BatchParameter::has_offset() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
inline void AudioCollectionRequest_BatchParameter::set_has_offset() {
_has_bits_[0] |= 0x00000001u;
}
inline void AudioCollectionRequest_BatchParameter::clear_has_offset() {
_has_bits_[0] &= ~0x00000001u;
}
inline void AudioCollectionRequest_BatchParameter::clear_offset() {
offset_ = 0u;
clear_has_offset();
}
inline ::google::protobuf::uint32 AudioCollectionRequest_BatchParameter::offset() const {
return offset_;
}
inline void AudioCollectionRequest_BatchParameter::set_offset(::google::protobuf::uint32 value) {
set_has_offset();
offset_ = value;
}
// required uint32 size = 2;
inline bool AudioCollectionRequest_BatchParameter::has_size() const {
return (_has_bits_[0] & 0x00000002u) != 0;
}
inline void AudioCollectionRequest_BatchParameter::set_has_size() {
_has_bits_[0] |= 0x00000002u;
}
inline void AudioCollectionRequest_BatchParameter::clear_has_size() {
_has_bits_[0] &= ~0x00000002u;
}
inline void AudioCollectionRequest_BatchParameter::clear_size() {
size_ = 0u;
clear_has_size();
}
inline ::google::protobuf::uint32 AudioCollectionRequest_BatchParameter::size() const {
return size_;
}
inline void AudioCollectionRequest_BatchParameter::set_size(::google::protobuf::uint32 value) {
set_has_size();
size_ = value;
}
// -------------------------------------------------------------------
// AudioCollectionRequest_GetGenreList
// optional string filter_name = 1;
@@ -2183,26 +2295,42 @@ AudioCollectionRequest_GetArtistList::mutable_filter_genre() {
return &filter_genre_;
}
// optional uint32 preferred_batch_size = 3;
inline bool AudioCollectionRequest_GetArtistList::has_preferred_batch_size() const {
// required .Remote.AudioCollectionRequest.BatchParameter batch_parameter = 3;
inline bool AudioCollectionRequest_GetArtistList::has_batch_parameter() const {
return (_has_bits_[0] & 0x00000004u) != 0;
}
inline void AudioCollectionRequest_GetArtistList::set_has_preferred_batch_size() {
inline void AudioCollectionRequest_GetArtistList::set_has_batch_parameter() {
_has_bits_[0] |= 0x00000004u;
}
inline void AudioCollectionRequest_GetArtistList::clear_has_preferred_batch_size() {
inline void AudioCollectionRequest_GetArtistList::clear_has_batch_parameter() {
_has_bits_[0] &= ~0x00000004u;
}
inline void AudioCollectionRequest_GetArtistList::clear_preferred_batch_size() {
preferred_batch_size_ = 0u;
clear_has_preferred_batch_size();
inline void AudioCollectionRequest_GetArtistList::clear_batch_parameter() {
if (batch_parameter_ != NULL) batch_parameter_->::Remote::AudioCollectionRequest_BatchParameter::Clear();
clear_has_batch_parameter();
}
inline ::google::protobuf::uint32 AudioCollectionRequest_GetArtistList::preferred_batch_size() const {
return preferred_batch_size_;
inline const ::Remote::AudioCollectionRequest_BatchParameter& AudioCollectionRequest_GetArtistList::batch_parameter() const {
return batch_parameter_ != NULL ? *batch_parameter_ : *default_instance_->batch_parameter_;
}
inline void AudioCollectionRequest_GetArtistList::set_preferred_batch_size(::google::protobuf::uint32 value) {
set_has_preferred_batch_size();
preferred_batch_size_ = value;
inline ::Remote::AudioCollectionRequest_BatchParameter* AudioCollectionRequest_GetArtistList::mutable_batch_parameter() {
set_has_batch_parameter();
if (batch_parameter_ == NULL) batch_parameter_ = new ::Remote::AudioCollectionRequest_BatchParameter;
return batch_parameter_;
}
inline ::Remote::AudioCollectionRequest_BatchParameter* AudioCollectionRequest_GetArtistList::release_batch_parameter() {
clear_has_batch_parameter();
::Remote::AudioCollectionRequest_BatchParameter* temp = batch_parameter_;
batch_parameter_ = NULL;
return temp;
}
inline void AudioCollectionRequest_GetArtistList::set_allocated_batch_parameter(::Remote::AudioCollectionRequest_BatchParameter* batch_parameter) {
delete batch_parameter_;
batch_parameter_ = batch_parameter;
if (batch_parameter) {
set_has_batch_parameter();
} else {
clear_has_batch_parameter();
}
}
// -------------------------------------------------------------------
@@ -2389,26 +2517,42 @@ inline void AudioCollectionRequest_GetReleaseList::set_get_cover(bool value) {
get_cover_ = value;
}
// optional uint32 preferred_batch_size = 5;
inline bool AudioCollectionRequest_GetReleaseList::has_preferred_batch_size() const {
// required .Remote.AudioCollectionRequest.BatchParameter batch_parameter = 5;
inline bool AudioCollectionRequest_GetReleaseList::has_batch_parameter() const {
return (_has_bits_[0] & 0x00000010u) != 0;
}
inline void AudioCollectionRequest_GetReleaseList::set_has_preferred_batch_size() {
inline void AudioCollectionRequest_GetReleaseList::set_has_batch_parameter() {
_has_bits_[0] |= 0x00000010u;
}
inline void AudioCollectionRequest_GetReleaseList::clear_has_preferred_batch_size() {
inline void AudioCollectionRequest_GetReleaseList::clear_has_batch_parameter() {
_has_bits_[0] &= ~0x00000010u;
}
inline void AudioCollectionRequest_GetReleaseList::clear_preferred_batch_size() {
preferred_batch_size_ = 0u;
clear_has_preferred_batch_size();
inline void AudioCollectionRequest_GetReleaseList::clear_batch_parameter() {
if (batch_parameter_ != NULL) batch_parameter_->::Remote::AudioCollectionRequest_BatchParameter::Clear();
clear_has_batch_parameter();
}
inline ::google::protobuf::uint32 AudioCollectionRequest_GetReleaseList::preferred_batch_size() const {
return preferred_batch_size_;
inline const ::Remote::AudioCollectionRequest_BatchParameter& AudioCollectionRequest_GetReleaseList::batch_parameter() const {
return batch_parameter_ != NULL ? *batch_parameter_ : *default_instance_->batch_parameter_;
}
inline void AudioCollectionRequest_GetReleaseList::set_preferred_batch_size(::google::protobuf::uint32 value) {
set_has_preferred_batch_size();
preferred_batch_size_ = value;
inline ::Remote::AudioCollectionRequest_BatchParameter* AudioCollectionRequest_GetReleaseList::mutable_batch_parameter() {
set_has_batch_parameter();
if (batch_parameter_ == NULL) batch_parameter_ = new ::Remote::AudioCollectionRequest_BatchParameter;
return batch_parameter_;
}
inline ::Remote::AudioCollectionRequest_BatchParameter* AudioCollectionRequest_GetReleaseList::release_batch_parameter() {
clear_has_batch_parameter();
::Remote::AudioCollectionRequest_BatchParameter* temp = batch_parameter_;
batch_parameter_ = NULL;
return temp;
}
inline void AudioCollectionRequest_GetReleaseList::set_allocated_batch_parameter(::Remote::AudioCollectionRequest_BatchParameter* batch_parameter) {
delete batch_parameter_;
batch_parameter_ = batch_parameter;
if (batch_parameter) {
set_has_batch_parameter();
} else {
clear_has_batch_parameter();
}
}
// -------------------------------------------------------------------
@@ -2683,26 +2827,42 @@ inline void AudioCollectionRequest_GetTrackList::set_get_cover(bool value) {
get_cover_ = value;
}
// optional uint32 preferred_batch_size = 8;
inline bool AudioCollectionRequest_GetTrackList::has_preferred_batch_size() const {
// required .Remote.AudioCollectionRequest.BatchParameter batch_parameter = 8;
inline bool AudioCollectionRequest_GetTrackList::has_batch_parameter() const {
return (_has_bits_[0] & 0x00000080u) != 0;
}
inline void AudioCollectionRequest_GetTrackList::set_has_preferred_batch_size() {
inline void AudioCollectionRequest_GetTrackList::set_has_batch_parameter() {
_has_bits_[0] |= 0x00000080u;
}
inline void AudioCollectionRequest_GetTrackList::clear_has_preferred_batch_size() {
inline void AudioCollectionRequest_GetTrackList::clear_has_batch_parameter() {
_has_bits_[0] &= ~0x00000080u;
}
inline void AudioCollectionRequest_GetTrackList::clear_preferred_batch_size() {
preferred_batch_size_ = 0u;
clear_has_preferred_batch_size();
inline void AudioCollectionRequest_GetTrackList::clear_batch_parameter() {
if (batch_parameter_ != NULL) batch_parameter_->::Remote::AudioCollectionRequest_BatchParameter::Clear();
clear_has_batch_parameter();
}
inline ::google::protobuf::uint32 AudioCollectionRequest_GetTrackList::preferred_batch_size() const {
return preferred_batch_size_;
inline const ::Remote::AudioCollectionRequest_BatchParameter& AudioCollectionRequest_GetTrackList::batch_parameter() const {
return batch_parameter_ != NULL ? *batch_parameter_ : *default_instance_->batch_parameter_;
}
inline void AudioCollectionRequest_GetTrackList::set_preferred_batch_size(::google::protobuf::uint32 value) {
set_has_preferred_batch_size();
preferred_batch_size_ = value;
inline ::Remote::AudioCollectionRequest_BatchParameter* AudioCollectionRequest_GetTrackList::mutable_batch_parameter() {
set_has_batch_parameter();
if (batch_parameter_ == NULL) batch_parameter_ = new ::Remote::AudioCollectionRequest_BatchParameter;
return batch_parameter_;
}
inline ::Remote::AudioCollectionRequest_BatchParameter* AudioCollectionRequest_GetTrackList::release_batch_parameter() {
clear_has_batch_parameter();
::Remote::AudioCollectionRequest_BatchParameter* temp = batch_parameter_;
batch_parameter_ = NULL;
return temp;
}
inline void AudioCollectionRequest_GetTrackList::set_allocated_batch_parameter(::Remote::AudioCollectionRequest_BatchParameter* batch_parameter) {
delete batch_parameter_;
batch_parameter_ = batch_parameter;
if (batch_parameter) {
set_has_batch_parameter();
} else {
clear_has_batch_parameter();
}
}
// -------------------------------------------------------------------
@@ -2888,28 +3048,6 @@ inline void AudioCollectionRequest::set_allocated_get_tracks(::Remote::AudioColl
// AudioCollectionResponse_GenreList
// required bool last = 1;
inline bool AudioCollectionResponse_GenreList::has_last() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
inline void AudioCollectionResponse_GenreList::set_has_last() {
_has_bits_[0] |= 0x00000001u;
}
inline void AudioCollectionResponse_GenreList::clear_has_last() {
_has_bits_[0] &= ~0x00000001u;
}
inline void AudioCollectionResponse_GenreList::clear_last() {
last_ = false;
clear_has_last();
}
inline bool AudioCollectionResponse_GenreList::last() const {
return last_;
}
inline void AudioCollectionResponse_GenreList::set_last(bool value) {
set_has_last();
last_ = value;
}
// repeated .Remote.AudioCollectionResponse.Genre genres = 2;
inline int AudioCollectionResponse_GenreList::genres_size() const {
return genres_.size();
@@ -2939,28 +3077,6 @@ AudioCollectionResponse_GenreList::mutable_genres() {
// AudioCollectionResponse_ArtistList
// required bool last = 1;
inline bool AudioCollectionResponse_ArtistList::has_last() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
inline void AudioCollectionResponse_ArtistList::set_has_last() {
_has_bits_[0] |= 0x00000001u;
}
inline void AudioCollectionResponse_ArtistList::clear_has_last() {
_has_bits_[0] &= ~0x00000001u;
}
inline void AudioCollectionResponse_ArtistList::clear_last() {
last_ = false;
clear_has_last();
}
inline bool AudioCollectionResponse_ArtistList::last() const {
return last_;
}
inline void AudioCollectionResponse_ArtistList::set_last(bool value) {
set_has_last();
last_ = value;
}
// repeated .Remote.AudioCollectionResponse.Artist artists = 2;
inline int AudioCollectionResponse_ArtistList::artists_size() const {
return artists_.size();
@@ -2990,28 +3106,6 @@ AudioCollectionResponse_ArtistList::mutable_artists() {
// AudioCollectionResponse_ReleaseList
// required bool last = 1;
inline bool AudioCollectionResponse_ReleaseList::has_last() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
inline void AudioCollectionResponse_ReleaseList::set_has_last() {
_has_bits_[0] |= 0x00000001u;
}
inline void AudioCollectionResponse_ReleaseList::clear_has_last() {
_has_bits_[0] &= ~0x00000001u;
}
inline void AudioCollectionResponse_ReleaseList::clear_last() {
last_ = false;
clear_has_last();
}
inline bool AudioCollectionResponse_ReleaseList::last() const {
return last_;
}
inline void AudioCollectionResponse_ReleaseList::set_last(bool value) {
set_has_last();
last_ = value;
}
// repeated .Remote.AudioCollectionResponse.Release releases = 2;
inline int AudioCollectionResponse_ReleaseList::releases_size() const {
return releases_.size();
@@ -3041,28 +3135,6 @@ AudioCollectionResponse_ReleaseList::mutable_releases() {
// AudioCollectionResponse_TrackList
// required bool last = 1;
inline bool AudioCollectionResponse_TrackList::has_last() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
inline void AudioCollectionResponse_TrackList::set_has_last() {
_has_bits_[0] |= 0x00000001u;
}
inline void AudioCollectionResponse_TrackList::clear_has_last() {
_has_bits_[0] &= ~0x00000001u;
}
inline void AudioCollectionResponse_TrackList::clear_last() {
last_ = false;
clear_has_last();
}
inline bool AudioCollectionResponse_TrackList::last() const {
return last_;
}
inline void AudioCollectionResponse_TrackList::set_last(bool value) {
set_has_last();
last_ = value;
}
// repeated .Remote.AudioCollectionResponse.Track tracks = 2;
inline int AudioCollectionResponse_TrackList::tracks_size() const {
return tracks_.size();
@@ -4092,16 +4164,39 @@ inline void AudioCollectionResponse_Track::set_allocated_coverart(::std::string*
// AudioCollectionResponse
// required .Remote.Error error = 1;
inline bool AudioCollectionResponse::has_error() const {
// optional .Remote.AudioCollectionResponse.Type type = 1;
inline bool AudioCollectionResponse::has_type() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
inline void AudioCollectionResponse::set_has_error() {
inline void AudioCollectionResponse::set_has_type() {
_has_bits_[0] |= 0x00000001u;
}
inline void AudioCollectionResponse::clear_has_error() {
inline void AudioCollectionResponse::clear_has_type() {
_has_bits_[0] &= ~0x00000001u;
}
inline void AudioCollectionResponse::clear_type() {
type_ = 1;
clear_has_type();
}
inline ::Remote::AudioCollectionResponse_Type AudioCollectionResponse::type() const {
return static_cast< ::Remote::AudioCollectionResponse_Type >(type_);
}
inline void AudioCollectionResponse::set_type(::Remote::AudioCollectionResponse_Type value) {
assert(::Remote::AudioCollectionResponse_Type_IsValid(value));
set_has_type();
type_ = value;
}
// optional .Remote.Error error = 2;
inline bool AudioCollectionResponse::has_error() const {
return (_has_bits_[0] & 0x00000002u) != 0;
}
inline void AudioCollectionResponse::set_has_error() {
_has_bits_[0] |= 0x00000002u;
}
inline void AudioCollectionResponse::clear_has_error() {
_has_bits_[0] &= ~0x00000002u;
}
inline void AudioCollectionResponse::clear_error() {
if (error_ != NULL) error_->::Remote::Error::Clear();
clear_has_error();
@@ -4130,29 +4225,6 @@ inline void AudioCollectionResponse::set_allocated_error(::Remote::Error* error)
}
}
// optional .Remote.AudioCollectionResponse.Type type = 2;
inline bool AudioCollectionResponse::has_type() const {
return (_has_bits_[0] & 0x00000002u) != 0;
}
inline void AudioCollectionResponse::set_has_type() {
_has_bits_[0] |= 0x00000002u;
}
inline void AudioCollectionResponse::clear_has_type() {
_has_bits_[0] &= ~0x00000002u;
}
inline void AudioCollectionResponse::clear_type() {
type_ = 1;
clear_has_type();
}
inline ::Remote::AudioCollectionResponse_Type AudioCollectionResponse::type() const {
return static_cast< ::Remote::AudioCollectionResponse_Type >(type_);
}
inline void AudioCollectionResponse::set_type(::Remote::AudioCollectionResponse_Type value) {
assert(::Remote::AudioCollectionResponse_Type_IsValid(value));
set_has_type();
type_ = value;
}
// optional .Remote.AudioCollectionResponse.GenreList genre_list = 3;
inline bool AudioCollectionResponse::has_genre_list() const {
return (_has_bits_[0] & 0x00000004u) != 0;
remote/messages/messages.pb.cc
+2 -2
View File
@@ -129,7 +129,7 @@ void protobuf_AddDesc_messages_2eproto() {
"_collection_response\030\003 \001(\0132\037.Remote.Audi"
"oCollectionResponse\022-\n\016media_response\030\004 "
"\001(\0132\025.Remote.MediaResponse\"H\n\004Type\022\020\n\014Au"
"thResponse\020\001\022\033\n\027AduioCollectionResponse\020"
"thResponse\020\001\022\033\n\027AudioCollectionResponse\020"
"\002\022\021\n\rMediaResponse\020\003", 660);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"messages.proto", &protobuf_RegisterTypes);
@@ -548,7 +548,7 @@ bool ServerMessage_Type_IsValid(int value) {
#ifndef _MSC_VER
const ServerMessage_Type ServerMessage::AuthResponse;
const ServerMessage_Type ServerMessage::AduioCollectionResponse;
const ServerMessage_Type ServerMessage::AudioCollectionResponse;
const ServerMessage_Type ServerMessage::MediaResponse;
const ServerMessage_Type ServerMessage::Type_MIN;
const ServerMessage_Type ServerMessage::Type_MAX;
remote/messages/messages.pb.h
+2 -2
View File
@@ -63,7 +63,7 @@ inline bool ClientMessage_Type_Parse(
}
enum ServerMessage_Type {
ServerMessage_Type_AuthResponse = 1,
ServerMessage_Type_AduioCollectionResponse = 2,
ServerMessage_Type_AudioCollectionResponse = 2,
ServerMessage_Type_MediaResponse = 3
};
bool ServerMessage_Type_IsValid(int value);
@@ -280,7 +280,7 @@ class ServerMessage : public ::google::protobuf::Message {
typedef ServerMessage_Type Type;
static const Type AuthResponse = ServerMessage_Type_AuthResponse;
static const Type AduioCollectionResponse = ServerMessage_Type_AduioCollectionResponse;
static const Type AudioCollectionResponse = ServerMessage_Type_AudioCollectionResponse;
static const Type MediaResponse = ServerMessage_Type_MediaResponse;
static inline bool Type_IsValid(int value) {
return ServerMessage_Type_IsValid(value);
remote/proto/collection.proto
+22 -16
View File
@@ -5,6 +5,12 @@ package Remote;
message AudioCollectionRequest
{
message BatchParameter
{
required uint32 offset = 1; // First element requested
required uint32 size = 2; // Number of elements requested. Server may not honor this size if too big
}
message GetGenreList
{
optional string filter_name = 1; // Genre that contains 'filterName' in its name
@@ -18,7 +24,7 @@ message AudioCollectionRequest
optional string filter_name = 1; // Artist that contains 'filterName' in its name
repeated string filter_genre = 2; // Artist that has at least a track of the genre
optional uint32 preferred_batch_size = 3;
required BatchParameter batch_parameter = 3;
}
message GetReleaseList
@@ -29,7 +35,8 @@ message AudioCollectionRequest
repeated string filter_genre = 3; // Release that has at least a track of the genre
optional bool get_cover = 4; // Request cover art for each release
optional uint32 preferred_batch_size = 5;
required BatchParameter batch_parameter = 5;
}
message GetTrackList
@@ -43,15 +50,17 @@ message AudioCollectionRequest
optional uint32 track_number = 6; // Disc number
optional bool get_cover = 7; // Request cover art for each track
optional uint32 preferred_batch_size = 8;
required BatchParameter batch_parameter = 8;
}
enum Type
{
TypeGetArtistList = 0;
TypeGetReleaseList = 1;
TypeGetTrackList = 2;
TypeGetGenreList = 0;
TypeGetArtistList = 1;
TypeGetReleaseList = 2;
TypeGetTrackList = 3;
}
required Type type = 1;
@@ -67,25 +76,21 @@ message AudioCollectionResponse
{
message GenreList
{
required bool last = 1; // More messages follow if last = 0
repeated Genre genres = 2;
}
message ArtistList
{
required bool last = 1; // More messages follow if last = 0
repeated Artist artists = 2;
}
message ReleaseList
{
required bool last = 1; // More messages follow if last = 0
repeated Release releases = 2;
}
message TrackList
{
required bool last = 1; // More messages follow if last = 0
repeated Track tracks = 2;
}
@@ -138,16 +143,17 @@ message AudioCollectionResponse
}
enum Type {
TypeGenreList = 1;
TypeArtistList = 2;
TypeReleaseList = 3;
TypeTrackList = 4;
TypeError = 1;
TypeGenreList = 2;
TypeArtistList = 3;
TypeReleaseList = 4;
TypeTrackList = 5;
}
required Error error = 1;
optional Type type = 2;
optional Type type = 1;
optional Error error = 2;
optional GenreList genre_list = 3;
optional ArtistList artist_list = 4;
optional ReleaseList release_list = 5;
remote/proto/messages.proto
+1 -1
View File
@@ -27,7 +27,7 @@ message ServerMessage
enum Type
{
AuthResponse = 1;
AduioCollectionResponse = 2;
AudioCollectionResponse = 2;
MediaResponse = 3;
}
remote/server/AudioCollectionRequestHandler.cpp
+33 -10
View File
@@ -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
+2 -2
View File
@@ -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
+4 -4
View File
@@ -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
+8 -4
View File
@@ -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
+2 -2
View File
@@ -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:
test/RemoteClientServer.cpp
+21 -7
View File
@@ -56,20 +56,34 @@ class TestClient
void getArtists(std::vector<std::string>& artists)
{
// Send request
Remote::ClientMessage msg;
Remote::ClientMessage request;
msg.set_type( Remote::ClientMessage_Type_AudioCollectionRequest );
request.set_type( Remote::ClientMessage_Type_AudioCollectionRequest );
msg.mutable_audio_collection_request()->set_type( Remote::AudioCollectionRequest_Type_TypeGetArtistList);
msg.mutable_audio_collection_request()->mutable_get_artists()->set_preferred_batch_size(64);
request.mutable_audio_collection_request()->set_type( Remote::AudioCollectionRequest_Type_TypeGetArtistList);
request.mutable_audio_collection_request()->mutable_get_artists()->mutable_batch_parameter()->set_size(64);
request.mutable_audio_collection_request()->mutable_get_artists()->mutable_batch_parameter()->set_offset(0);
sendMsg(msg);
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!");
if (!response.audio_collection_response().has_artist_list())
throw std::runtime_error("not an artist_list!");
for (int i = 0; i < response.audio_collection_response().artist_list().artists_size(); ++i)
{
if (!response.audio_collection_response().artist_list().artists(i).has_name())
throw std::runtime_error("no artist name!");
artists.push_back( response.audio_collection_response().artist_list().artists(i).name() );
}
}
@@ -167,7 +181,7 @@ class TestClient
};
int main(int argc, char* argv[])
int main()
{
try {