diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2019-01-11 15:19:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 15:19:54 +0100 |
| commit | baff0a183898f68ada89d73e8456f3a919292a55 (patch) | |
| tree | 7a635b47c89c93561098a71e8001dac05fee7a34 | |
| parent | 0972f367cd0b41d7737212d051d9116490d57f71 (diff) | |
| parent | d4d01d73dc8265a8c71c489226e9e58c4b83f365 (diff) | |
Merge pull request #15228 from pkerling/videoinfoscanner-redact18.0rc5-Leia
VideoInfoScanner: Correctly redact URLs
| -rw-r--r-- | xbmc/video/VideoInfoScanner.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/xbmc/video/VideoInfoScanner.cpp b/xbmc/video/VideoInfoScanner.cpp index 470e97f803..49e9b1899e 100644 --- a/xbmc/video/VideoInfoScanner.cpp +++ b/xbmc/video/VideoInfoScanner.cpp @@ -985,7 +985,7 @@ namespace VIDEO continue; if (!EnumerateEpisodeItem(items[i].get(), episodeList)) - CLog::Log(LOGDEBUG, "VideoInfoScanner: Could not enumerate file %s", CURL::GetRedacted(CURL::Decode(items[i]->GetPath())).c_str()); + CLog::Log(LOGDEBUG, "VideoInfoScanner: Could not enumerate file {}", CURL::GetRedacted(items[i]->GetPath())); } return true; } @@ -1102,7 +1102,7 @@ namespace VIDEO strLabel = item->GetPath(); // URLDecode in case an episode is on a http/https/dav/davs:// source and URL-encoded like foo%201x01%20bar.avi - strLabel = CURL::Decode(strLabel); + strLabel = CURL::Decode(CURL::GetRedacted(strLabel)); for (unsigned int i=0;i<expression.size();++i) { @@ -1308,9 +1308,7 @@ namespace VIDEO strTitle = StringUtils::Format("%s - %ix%i - %s", showInfo->m_strTitle.c_str(), movieDetails.m_iSeason, movieDetails.m_iEpisode, strTitle.c_str()); } - std::string redactPath(CURL::GetRedacted(CURL::Decode(pItem->GetPath()))); - - CLog::Log(LOGDEBUG, "VideoInfoScanner: Adding new item to %s:%s", TranslateContent(content).c_str(), redactPath.c_str()); + CLog::Log(LOGDEBUG, "VideoInfoScanner: Adding new item to {}:{}", TranslateContent(content), CURL::GetRedacted(pItem->GetPath())); long lResult = -1; if (content == CONTENT_MOVIES) |