WIP remote client/server tests

2014-05-07 13:31:47 +02:00
parent 57944e5415
commit 8f4d3e5e23
20 changed files with 3381 additions and 3081 deletions
@@ -1,5 +1,7 @@
 import "common.proto";

+package Remote;
+
 message AuthRequest
 {
 	required	string	user_name	= 1;
@@ -1,6 +1,8 @@
 import "common.proto";

-message CollectionRequest
+package Remote;
+
+message AudioCollectionRequest
 {

 	message GetGenreList
@@ -61,8 +63,80 @@ message CollectionRequest
 }


-message CollectionResponse
+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;
+	}
+
+	message Genre
+	{
+		required string name	= 1;
+	}
+
+	message CoverArt
+	{
+		optional string	mime_type	= 1;
+		repeated bytes data		= 2;
+	}
+
+	message Artist
+	{
+		required string name		= 1;
+		required uint32 nb_releases	= 2;
+	}
+
+	message Release
+	{
+		required string name			= 1;
+
+		required uint32 nb_tracks		= 2;
+		required uint32 duration_secs		= 3;
+
+		optional CoverArt coverArt	= 4;
+	}
+
+	message Track
+	{
+		required int64	media_id	= 1;
+		optional uint32 disc_number	= 2;
+		optional uint32 track_number	= 3;
+
+		optional string	artist			= 4;
+		optional string	release			= 5;
+
+		required string	name			= 6;
+
+		required uint32	duration_secs		= 7;
+
+		optional string	release_date	= 8;
+		optional string	original_release_date	= 9;
+
+		repeated string genres		= 10;
+
+		optional bytes	coverArt	= 11;
+	}
+
 	enum Type {
 		TypeGenreList	= 1;
 		TypeArtistList	= 2;
@@ -80,77 +154,6 @@ message CollectionResponse
 	optional TrackList	track_list	= 6;
 }

-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;
-}
-
-message Genre
-{
-	required string name	= 1;
-}
-
-message CoverArt
-{
-	optional string	mime_type	= 1;
-	repeated bytes data		= 2;
-}
-
-message Artist
-{
-	required string name		= 1;
-	required uint32 nb_releases	= 2;
-}
-
-message Release
-{
-	required string name			= 1;
-
-	required uint32 nb_tracks		= 2;
-	required uint32 duration_secs		= 3;
-
-	optional CoverArt coverArt	= 4;
-}
-
-message Track
-{
-	required int64	media_id	= 1;
-	optional uint32 disc_number	= 2;
-	optional uint32 track_number	= 3;
-
-	optional string	artist			= 4;
-	optional string	release			= 5;
-
-	required string	name			= 6;
-
-	required uint32	duration_secs		= 7;
-
-	optional string	release_date	= 8;
-	optional string	original_release_date	= 9;
-
-	repeated string genres		= 10;
-
-	optional bytes	coverArt	= 11;
-}



@@ -1,4 +1,6 @@

+package Remote;
+
 message Error
 {
 	required bool	error	= 1;
@@ -1,5 +1,7 @@
 import "common.proto";

+package Remote;
+
 enum CodecType
 {
 	CodecTypeOGG	= 1;
@@ -3,20 +3,22 @@ import "auth.proto";
 import "collection.proto";
 import "media.proto";

+package Remote;
+
 message ClientMessage
 {
 	enum Type
 	{
 		AuthRequest		= 1;
-		CollectionRequest	= 2;
+		AudioCollectionRequest	= 2;
 		MediaRequest		= 3;
 	}

 	required Type	type	= 1;

-	optional AuthRequest		auth_request		= 2;
-	optional CollectionRequest	collection_request	= 3;
-	optional MediaRequest		media_request		= 4;
+	optional AuthRequest		auth_request			= 2;
+	optional AudioCollectionRequest	audio_collection_request	= 3;
+	optional MediaRequest		media_request			= 4;
 }


@@ -25,15 +27,15 @@ message ServerMessage
 	enum Type
 	{
 		AuthResponse		= 1;
-		CollectionResponse	= 2;
+		AduioCollectionResponse	= 2;
 		MediaResponse		= 3;
 	}

 	required Type	type	= 1;

-	optional AuthResponse		auth_response		= 2;
-	optional CollectionResponse	collection_response	= 3;
-	optional MediaResponse		media_response		= 4;
+	optional AuthResponse			auth_response			= 2;
+	optional AudioCollectionResponse	audio_collection_response	= 3;
+	optional MediaResponse			media_response			= 4;
 }