diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2023-12-30 05:13:51 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-30 05:13:51 +1000 |
| commit | 376bf594a0829892721d6d30a47eb370c4b7aee4 (patch) | |
| tree | b4077902c3d9112a144f68b03bae10717f9131b5 | |
| parent | eed73990a0d781b8c44f9a65a755b239035d23ee (diff) | |
| parent | a9490cc86754364c3339031b2064cec78850ea13 (diff) | |
Merge pull request #24347 from fuzzard/bp_redact_toast
[BP] changed: Redact paths in audio/video error toasts
| -rw-r--r-- | xbmc/music/MusicDatabase.cpp | 6 | ||||
| -rw-r--r-- | xbmc/video/VideoDatabase.cpp | 16 |
2 files changed, 16 insertions, 6 deletions
diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp index a1bd42b418..8468168beb 100644 --- a/xbmc/music/MusicDatabase.cpp +++ b/xbmc/music/MusicDatabase.cpp @@ -11891,7 +11891,8 @@ void CMusicDatabase::ExportToXML(const CLibExportSettings& settings, CLog::Log(LOGERROR, "CMusicDatabase::{}: Album nfo export failed! ('{}')", __FUNCTION__, nfoFile); CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, - g_localizeStrings.Get(20302), nfoFile); + g_localizeStrings.Get(20302), + CURL::GetRedacted(nfoFile)); iFailCount++; } } @@ -12035,7 +12036,8 @@ void CMusicDatabase::ExportToXML(const CLibExportSettings& settings, CLog::Log(LOGERROR, "CMusicDatabase::{}: Artist nfo export failed! ('{}')", __FUNCTION__, nfoFile); CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, - g_localizeStrings.Get(20302), nfoFile); + g_localizeStrings.Get(20302), + CURL::GetRedacted(nfoFile)); iFailCount++; } } diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp index 568fbd7b04..c000d68258 100644 --- a/xbmc/video/VideoDatabase.cpp +++ b/xbmc/video/VideoDatabase.cpp @@ -10100,7 +10100,9 @@ void CVideoDatabase::ExportToXML(const std::string &path, bool singleFile /* = t if(!xmlDoc.SaveFile(nfoFile)) { CLog::Log(LOGERROR, "{}: Movie nfo export failed! ('{}')", __FUNCTION__, nfoFile); - CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(20302), nfoFile); + CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, + g_localizeStrings.Get(20302), + CURL::GetRedacted(nfoFile)); iFailCount++; } } @@ -10245,7 +10247,9 @@ void CVideoDatabase::ExportToXML(const std::string &path, bool singleFile /* = t { CLog::Log(LOGERROR, "{}: Musicvideo nfo export failed! ('{}')", __FUNCTION__, nfoFile); - CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(20302), nfoFile); + CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, + g_localizeStrings.Get(20302), + CURL::GetRedacted(nfoFile)); iFailCount++; } } @@ -10345,7 +10349,9 @@ void CVideoDatabase::ExportToXML(const std::string &path, bool singleFile /* = t if(!xmlDoc.SaveFile(nfoFile)) { CLog::Log(LOGERROR, "{}: TVShow nfo export failed! ('{}')", __FUNCTION__, nfoFile); - CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(20302), nfoFile); + CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, + g_localizeStrings.Get(20302), + CURL::GetRedacted(nfoFile)); iFailCount++; } } @@ -10441,7 +10447,9 @@ void CVideoDatabase::ExportToXML(const std::string &path, bool singleFile /* = t if(!xmlDoc.SaveFile(nfoFile)) { CLog::Log(LOGERROR, "{}: Episode nfo export failed! ('{}')", __FUNCTION__, nfoFile); - CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(20302), nfoFile); + CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, + g_localizeStrings.Get(20302), + CURL::GetRedacted(nfoFile)); iFailCount++; } } |