Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

jsonrpc: avoid unnecessary warnings because of bad order in JSON sche…

…ma type definitions
  • Loading branch information...
commit 5fc16bd9cb1ec94ceee189b524d5881f20cc4aab 1 parent af503a5
@Montellese Montellese authored
View
72 xbmc/interfaces/json-rpc/ServiceDescription.h
@@ -95,6 +95,42 @@ namespace JSONRPC
"\"notifications\": { \"$ref\": \"Configuration.Notifications\", \"required\": true }"
"}"
"}",
+ "\"List.Amount\": {"
+ "\"type\": \"integer\","
+ "\"default\": -1,"
+ "\"minimum\": 0"
+ "}",
+ "\"List.Limits\": {"
+ "\"type\": \"object\","
+ "\"properties\": {"
+ "\"start\": { \"type\": \"integer\", \"minimum\": 0, \"default\": 0, \"description\": \"Index of the first item to return\" },"
+ "\"end\": { \"$ref\": \"List.Amount\", \"description\": \"Index of the last item to return\" }"
+ "},"
+ "\"additionalProperties\": false"
+ "}",
+ "\"List.LimitsReturned\": {"
+ "\"type\": \"object\","
+ "\"properties\": {"
+ "\"start\": { \"type\": \"integer\", \"minimum\": 0, \"default\": 0 },"
+ "\"end\": { \"$ref\": \"List.Amount\" },"
+ "\"total\": { \"type\": \"integer\", \"minimum\": 0, \"required\": true }"
+ "},"
+ "\"additionalProperties\": false"
+ "}",
+ "\"List.Sort\": {"
+ "\"type\": \"object\","
+ "\"properties\": {"
+ "\"method\": { \"type\": \"string\", \"default\": \"none\","
+ "\"enum\": [ \"none\", \"label\", \"date\", \"size\", \"file\", \"path\", \"drivetype\", \"title\", \"track\", \"time\", \"artist\","
+ "\"album\", \"albumtype\", \"genre\", \"country\", \"year\", \"rating\", \"votes\", \"top250\", \"programcount\","
+ "\"playlist\", \"episode\", \"season\", \"totalepisodes\", \"watchedepisodes\", \"tvshowstatus\", \"tvshowtitle\","
+ "\"sorttitle\", \"productioncode\", \"mpaa\", \"studio\", \"dateadded\", \"lastplayed\", \"playcount\", \"listeners\","
+ "\"bitrate\", \"random\" ]"
+ "},"
+ "\"order\": { \"type\": \"string\", \"default\": \"ascending\", \"enum\": [ \"ascending\", \"descending\" ] },"
+ "\"ignorearticle\": { \"type\": \"boolean\", \"default\": false }"
+ "}"
+ "}",
"\"Library.Id\": {"
"\"type\": \"integer\","
"\"default\": -1,"
@@ -702,42 +738,6 @@ namespace JSONRPC
"\"type\": \"string\","
"\"enum\": [ \"video\", \"music\", \"pictures\", \"files\", \"programs\" ]"
"}",
- "\"List.Amount\": {"
- "\"type\": \"integer\","
- "\"default\": -1,"
- "\"minimum\": 0"
- "}",
- "\"List.Limits\": {"
- "\"type\": \"object\","
- "\"properties\": {"
- "\"start\": { \"type\": \"integer\", \"minimum\": 0, \"default\": 0, \"description\": \"Index of the first item to return\" },"
- "\"end\": { \"type\": \"integer\", \"minimum\": 0, \"default\": -1, \"description\": \"Index of the last item to return\" }"
- "},"
- "\"additionalProperties\": false"
- "}",
- "\"List.Sort\": {"
- "\"type\": \"object\","
- "\"properties\": {"
- "\"method\": { \"type\": \"string\", \"default\": \"none\","
- "\"enum\": [ \"none\", \"label\", \"date\", \"size\", \"file\", \"path\", \"drivetype\", \"title\", \"track\", \"time\", \"artist\","
- "\"album\", \"albumtype\", \"genre\", \"country\", \"year\", \"rating\", \"votes\", \"top250\", \"programcount\","
- "\"playlist\", \"episode\", \"season\", \"totalepisodes\", \"watchedepisodes\", \"tvshowstatus\", \"tvshowtitle\","
- "\"sorttitle\", \"productioncode\", \"mpaa\", \"studio\", \"dateadded\", \"lastplayed\", \"playcount\", \"listeners\","
- "\"bitrate\", \"random\" ]"
- "},"
- "\"order\": { \"type\": \"string\", \"default\": \"ascending\", \"enum\": [ \"ascending\", \"descending\" ] },"
- "\"ignorearticle\": { \"type\": \"boolean\", \"default\": false }"
- "}"
- "}",
- "\"List.LimitsReturned\": {"
- "\"type\": \"object\","
- "\"properties\": {"
- "\"start\": { \"type\": \"integer\", \"minimum\": 0, \"default\": 0 },"
- "\"end\": { \"type\": \"integer\", \"minimum\": 0, \"default\": -1 },"
- "\"total\": { \"type\": \"integer\", \"minimum\": 0, \"required\": true }"
- "},"
- "\"additionalProperties\": false"
- "}",
"\"List.Filter.Rule\": {"
"\"type\": \"object\","
"\"properties\": {"
View
72 xbmc/interfaces/json-rpc/types.json
@@ -68,6 +68,42 @@
"notifications": { "$ref": "Configuration.Notifications", "required": true }
}
},
+ "List.Amount": {
+ "type": "integer",
+ "default": -1,
+ "minimum": 0
+ },
+ "List.Limits": {
+ "type": "object",
+ "properties": {
+ "start": { "type": "integer", "minimum": 0, "default": 0, "description": "Index of the first item to return" },
+ "end": { "$ref": "List.Amount", "description": "Index of the last item to return" }
+ },
+ "additionalProperties": false
+ },
+ "List.LimitsReturned": {
+ "type": "object",
+ "properties": {
+ "start": { "type": "integer", "minimum": 0, "default": 0 },
+ "end": { "$ref": "List.Amount" },
+ "total": { "type": "integer", "minimum": 0, "required": true }
+ },
+ "additionalProperties": false
+ },
+ "List.Sort": {
+ "type": "object",
+ "properties": {
+ "method": { "type": "string", "default": "none",
+ "enum": [ "none", "label", "date", "size", "file", "path", "drivetype", "title", "track", "time", "artist",
+ "album", "albumtype", "genre", "country", "year", "rating", "votes", "top250", "programcount",
+ "playlist", "episode", "season", "totalepisodes", "watchedepisodes", "tvshowstatus", "tvshowtitle",
+ "sorttitle", "productioncode", "mpaa", "studio", "dateadded", "lastplayed", "playcount", "listeners",
+ "bitrate", "random" ]
+ },
+ "order": { "type": "string", "default": "ascending", "enum": [ "ascending", "descending" ] },
+ "ignorearticle": { "type": "boolean", "default": false }
+ }
+ },
"Library.Id": {
"type": "integer",
"default": -1,
@@ -675,42 +711,6 @@
"type": "string",
"enum": [ "video", "music", "pictures", "files", "programs" ]
},
- "List.Amount": {
- "type": "integer",
- "default": -1,
- "minimum": 0
- },
- "List.Limits": {
- "type": "object",
- "properties": {
- "start": { "type": "integer", "minimum": 0, "default": 0, "description": "Index of the first item to return" },
- "end": { "type": "integer", "minimum": 0, "default": -1, "description": "Index of the last item to return" }
- },
- "additionalProperties": false
- },
- "List.Sort": {
- "type": "object",
- "properties": {
- "method": { "type": "string", "default": "none",
- "enum": [ "none", "label", "date", "size", "file", "path", "drivetype", "title", "track", "time", "artist",
- "album", "albumtype", "genre", "country", "year", "rating", "votes", "top250", "programcount",
- "playlist", "episode", "season", "totalepisodes", "watchedepisodes", "tvshowstatus", "tvshowtitle",
- "sorttitle", "productioncode", "mpaa", "studio", "dateadded", "lastplayed", "playcount", "listeners",
- "bitrate", "random" ]
- },
- "order": { "type": "string", "default": "ascending", "enum": [ "ascending", "descending" ] },
- "ignorearticle": { "type": "boolean", "default": false }
- }
- },
- "List.LimitsReturned": {
- "type": "object",
- "properties": {
- "start": { "type": "integer", "minimum": 0, "default": 0 },
- "end": { "type": "integer", "minimum": 0, "default": -1 },
- "total": { "type": "integer", "minimum": 0, "required": true }
- },
- "additionalProperties": false
- },
"List.Filter.Rule": {
"type": "object",
"properties": {
Please sign in to comment.
Something went wrong with that request. Please try again.