diff options
| author | tamland <thomas.amland@gmail.com> | 2018-02-04 12:55:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-04 12:55:21 +0100 |
| commit | ff58732c989c71f9a15df03252aa8ad97e336a42 (patch) | |
| tree | 053346e23aa462a5238f42a011e772ddd7acb15f | |
| parent | 6562cced5136f3103c52ad58cb554a690784ce3e (diff) | |
| parent | e981a6aed305c6886cff57d1f4ba2a9ab0794ffc (diff) | |
Merge pull request #13410 from tamland/fix_jsonrpc_fav
[jsonrpc] fix GetFavourites after dd29b3e
| -rw-r--r-- | xbmc/interfaces/json-rpc/FavouritesOperations.cpp | 8 | ||||
| -rw-r--r-- | xbmc/interfaces/json-rpc/schema/version.txt | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/xbmc/interfaces/json-rpc/FavouritesOperations.cpp b/xbmc/interfaces/json-rpc/FavouritesOperations.cpp index 491a82d70b..b860d19bb7 100644 --- a/xbmc/interfaces/json-rpc/FavouritesOperations.cpp +++ b/xbmc/interfaces/json-rpc/FavouritesOperations.cpp @@ -21,6 +21,7 @@ #include "FavouritesOperations.h" #include "favourites/FavouritesService.h" #include "input/WindowTranslator.h" +#include "URL.h" #include "utils/StringUtils.h" #include "Util.h" #include "utils/URIUtils.h" @@ -53,7 +54,12 @@ JSONRPC_STATUS CFavouritesOperations::GetFavourites(const std::string &method, I std::string function; std::vector<std::string> parameters; - CUtil::SplitExecFunction(item->GetPath(), function, parameters); + + //FIXME: this path is internal to the favourites system and should not be parsed and exposed + CURL url(item->GetPath()); + std::string internalPath = CURL::Decode(url.GetHostName()); + + CUtil::SplitExecFunction(internalPath, function, parameters); if (parameters.empty()) continue; diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt index 3ab7cb32c5..a91164b0af 100644 --- a/xbmc/interfaces/json-rpc/schema/version.txt +++ b/xbmc/interfaces/json-rpc/schema/version.txt @@ -1 +1 @@ -JSONRPC_VERSION 9.1.0 +JSONRPC_VERSION 9.1.1 |