WIP, Remote Client/Server, switching to id

remote/proto/collection.proto

@@ -13,16 +13,12 @@ message AudioCollectionRequest
 
 	message GetGenreList
 	{
-		optional string	filter_name		= 1;	// Genre that contains 'filterName' in its name
-
 		required BatchParameter batch_parameter = 2;
 	}
 
 	message GetArtistList
 	{
-		// Search Filters
-		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
+		repeated uint64	genre_id		= 2;	// Artist that has at least a track of the genre
 
 		required BatchParameter batch_parameter = 3;
 	}
@@ -30,9 +26,8 @@ message AudioCollectionRequest
 	message GetReleaseList
 	{
 		// Search filters
-		optional string	filter_name		= 1;	// Release that contains 'filterName' in its name
-		repeated string	artist_name		= 2;	// Release that contains at least a track of this artist
-		repeated string filter_genre		= 3;	// Release that has at least a track of the genre
+		repeated uint64	artist_id		= 2;	// Release that contains at least a track of this artist
+		repeated uint64	filter_genre		= 3;	// Release that has at least a track of the genre
 
 		optional bool	get_cover		= 4;	// Request cover art for each release
 
@@ -43,15 +38,14 @@ message AudioCollectionRequest
 	{
 		// Search filters
 		optional string	filter_name		= 1;	// Track that contains 'filterName' in its name
-		repeated string	release_name		= 2;	// Track that is part of the release
-		repeated string	artist_name		= 3;	// Track made by this artist
-		repeated string filter_genre		= 4;	// Track that has at least a track of the genre
-		optional uint32 disc_number		= 5;	// Track number
-		optional uint32 track_number		= 6;	// Disc number
 
-		optional bool	get_cover		= 7;	// Request cover art for each track
+		repeated uint64	artist_id		= 2;	// Track that belongs to these artists
+		repeated uint64	release_id		= 3;	// Track that is part of these releases
+		repeated uint64	genre_id		= 4;    // Track that has at least a track of the genre
 
-		required BatchParameter batch_parameter = 8;
+		optional bool	get_cover		= 5;	// Request cover art for each track
+
+		required BatchParameter batch_parameter = 6;
 	}
 
 
@@ -94,45 +88,55 @@ message AudioCollectionResponse
 		repeated Track	tracks	= 2;
 	}
 
-	message Genre
-	{
-		required string name	= 1;
-	}
-
 	message CoverArt
 	{
 		optional string	mime_type	= 1;
+
 		repeated bytes data		= 2;
 	}
 
+	message Genre
+	{
+		required uint64	id		= 1;
+
+		required string name		= 2;
+	}
+
 	message Artist
 	{
-		required string name		= 1;
-		required uint32 nb_releases	= 2;
+		required uint64	id		= 1;
+
+		required string name		= 2;
+		required uint32 nb_releases	= 3;
 	}
 
 	message Release
 	{
-		required string name			= 1;
+		required uint64	id		= 1;
 
-		required uint32 nb_tracks		= 2;
-		required uint32 duration_secs		= 3;
+		required string name		= 2;
 
-		optional CoverArt coverArt	= 4;
+		required uint32 nb_tracks	= 3;
+		required uint32 duration_secs	= 4;
+
+		optional string	release_date	= 5;
+
+		optional CoverArt coverArt	= 6;
 	}
 
 	message Track
 	{
-		required int64	media_id	= 1;
+		required uint64	id		= 1;
+
 		optional uint32 disc_number	= 2;
 		optional uint32 track_number	= 3;
 
-		optional string	artist			= 4;
-		optional string	release			= 5;
+		optional string	artist		= 4;
+		optional string	release		= 5;
 
-		required string	name			= 6;
+		required string	name		= 6;
 
-		required uint32	duration_secs		= 7;
+		required uint32	duration_secs	= 7;
 
 		optional string	release_date	= 8;
 		optional string	original_release_date	= 9;

remote/server/AudioCollectionRequestHandler.cpp

@@ -70,9 +70,6 @@ AudioCollectionRequestHandler::processGetGenres(const AudioCollectionRequest::Ge
 	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;
-
 	Wt::Dbo::Transaction transaction( _db.getSession() );
 
 	Wt::Dbo::collection<Genre::pointer> genres = Genre::getAll( _db.getSession(), request.batch_parameter().offset(), std::max(static_cast<std::size_t>(request.batch_parameter().size()), _maxListGenres) );
@@ -84,6 +81,7 @@ AudioCollectionRequestHandler::processGetGenres(const AudioCollectionRequest::Ge
 		AudioCollectionResponse_Genre* genre = response.add_genres();
 
 		genre->set_name((*it)->getName());
+		genre->set_id(it->id());
 	}
 
 	return true;
@@ -106,12 +104,9 @@ AudioCollectionRequestHandler::processGetArtists(const AudioCollectionRequest::G
 		std::cerr << "Warning: batch parameter size too high (" << request.batch_parameter().size() << ")" << std::endl;
 
 
-	if (request.has_filter_name())
-		std::cout << "Filter name = " << request.filter_name() << std::endl;
-
-	for (int id = 0; id < request.filter_genre_size(); ++id)
+	for (int id = 0; id < request.genre_id_size(); ++id)
 	{
-		std::cout << "Filter genre " << id << " = '" << request.filter_genre(id) << "'" << std::endl;
+		std::cout << "Genre id " << id << " = '" << request.genre_id(id) << "'" << std::endl;
 	}
 
 
@@ -133,6 +128,7 @@ AudioCollectionRequestHandler::processGetArtists(const AudioCollectionRequest::G
 
 		artist->set_name((*it)->getName());
 		artist->set_nb_releases(0);		// TODO
+		artist->set_id(it->id());
 	}
 
 	std::cout << "Getting artists DONE" << std::endl;