jsonrpc: add "tagversion" property to Application.GetProperties' "ver…

…sion" property
xbmc · Aug 22, 2014 · 3b9d078 · 3b9d078
1 parent f41af78
commit 3b9d078
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/xbmc/interfaces/json-rpc/ApplicationOperations.cpp b/xbmc/interfaces/json-rpc/ApplicationOperations.cpp
@@ -125,11 +125,20 @@ JSONRPC_STATUS CApplicationOperations::GetPropertyValue(const std::string &prope
     result["revision"] = CCompileInfo::GetSCMID();
     std::string tag = CCompileInfo::GetSuffix();
     if (StringUtils::StartsWithNoCase(tag, "alpha"))
+    {
       result["tag"] = "alpha";
+      result["tagversion"] = StringUtils::Mid(tag, 5);
+    }
     else if (StringUtils::StartsWithNoCase(tag, "beta"))
+    {
       result["tag"] = "beta";
+      result["tagversion"] = StringUtils::Mid(tag, 4);
+    }
     else if (StringUtils::StartsWithNoCase(tag, "rc"))
+    {
       result["tag"] = "releasecandidate";
+      result["tagversion"] = StringUtils::Mid(tag, 2);
+    }
     else if (tag.empty())
       result["tag"] = "stable";
     else

diff --git a/xbmc/interfaces/json-rpc/schema/types.json b/xbmc/interfaces/json-rpc/schema/types.json
@@ -1420,7 +1420,8 @@
           "major": { "type": "integer", "minimum": 0, "required": true },
           "minor": { "type": "integer", "minimum": 0, "required": true },
           "revision": { "type": [ "string", "integer" ] },
-          "tag": { "type": "string", "enum": [ "prealpha", "alpha", "beta", "releasecandidate", "stable" ], "required": true }
+          "tag": { "type": "string", "enum": [ "prealpha", "alpha", "beta", "releasecandidate", "stable" ], "required": true },
+          "tagversion": { "type": "string" }
         }
       }
     }

diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt
@@ -1 +1 @@
-6.17.0
+6.18.0