Merge pull request #1859 from CastagnaIT/err_msg

[Cleanup] Make GUI error messages less technical

Author: CastagnaIT

inputstream.adaptive/resources/language/resource.language.en_gb/strings.po

@@ -366,3 +366,35 @@ msgstr ""
 msgctxt "#30301"
 msgid "Unable to play the stream.{[CR]Error: {error-details}}"
 msgstr ""
+
+msgctxt "#30302"
+msgid "The decryptor path is not set in the add-on settings."
+msgstr ""
+
+msgctxt "#30303"
+msgid "A problem occurred with the DRM decryptor."
+msgstr ""
+
+msgctxt "#30304"
+msgid "Cannot load Widevine CDM library."
+msgstr ""
+
+msgctxt "#30305"
+msgid "Cannot initialize Widevine CDM library."
+msgstr ""
+
+msgctxt "#30306"
+msgid "The configuration to play the stream is incomplete or missing."
+msgstr ""
+
+msgctxt "#30307"
+msgid "Cannot download the stream manifest file."
+msgstr ""
+
+msgctxt "#30308"
+msgid "A problem occurred in the stream initialization."
+msgstr ""
+
+msgctxt "#30309"
+msgid "No audio/video stream can be played."
+msgstr ""

src/Session.cpp

@@ -100,7 +100,7 @@ SResult SESSION::CSession::Initialize(std::string manifestUrl)
 
   CURL::HTTPResponse manifestResp;
   if (!CURL::DownloadFile(manifestUrl, manifestHeaders, {"etag", "last-modified"}, manifestResp))
-    return SResult::Error("Cannot download the manifest file.");
+    return SResult::Error(GUI::GetLocalizedString(30307));
 
   // The download speed with small file sizes is not accurate, we should download at least 512Kb
   // to have a sufficient acceptable value to calculate the bandwidth,
@@ -115,12 +115,18 @@ SResult SESSION::CSession::Initialize(std::string manifestUrl)
 
   m_adaptiveTree = PLAYLIST_FACTORY::CreateAdaptiveTree(manifestResp);
   if (!m_adaptiveTree)
-    return SResult::Error("Unable to determine type of manifest file.");
+  {
+    LOG::LogF(LOGERROR, "Unable to determine type of manifest file.");
+    return SResult::Error(GUI::GetLocalizedString(30308));
+  }
 
   m_adaptiveTree->Configure(m_reprChooser, kodiProps.GetManifestUpdParams());
 
   if (!m_adaptiveTree->Open(manifestResp.effectiveUrl, manifestResp.headers, manifestResp.data))
-    return SResult::Error("Cannot parse the manifest file.");
+  {
+    LOG::LogF(LOGERROR, "Cannot parse the manifest file.");
+    return SResult::Error(GUI::GetLocalizedString(30308));
+  }
 
   m_adaptiveTree->PostOpen();
   m_reprChooser->PostInit();
@@ -349,7 +355,7 @@ void SESSION::CSession::InitializePeriod()
   {
     LOG::LogF(LOGERROR,
               "No stream can be played, common causes: resolution limits or HDCP problem");
-    GUI::ErrorDialog("No stream can be played");
+    GUI::ErrorDialog(GUI::GetLocalizedString(30309));
   }
 }
 

src/decrypters/DrmEngine.cpp

@@ -51,22 +51,25 @@ SResult CreateDRM(std::string_view keySystem, std::shared_ptr<DRM::IDecrypter>&
   std::string decrypterPath = CSrvBroker::GetSettings().GetDecrypterPath();
   if (decrypterPath.empty())
   {
-    return SResult::Error("Decrypter path not set in the add-on settings.");
+    LOG::LogF(LOGERROR, "No decrypter path set in the add-on settings");
+    return SResult::Error(GUI::GetLocalizedString(30302));
   }
 
   drm = DRM::FACTORY::GetDecrypter(KSToCryptoKeySystem(keySystem));
 
   if (!drm)
   {
-    return SResult::Error("Unable to create the DRM decrypter.");
+    LOG::LogF(LOGERROR, "Unable to create the DRM decrypter");
+    return SResult::Error(GUI::GetLocalizedString(30303));
   }
 
   drm->SetLibraryPath(decrypterPath);
 
   if (!drm->Initialize())
   {
     drm = nullptr;
-    return SResult::Error("Unable to initialize the DRM decrypter.");
+    LOG::LogF(LOGERROR, "Unable to initialize the DRM decrypter");
+    return SResult::Error(GUI::GetLocalizedString(30303));
   }
 
   return SResultCode::OK;

src/decrypters/widevine/WVCdmAdapter.cpp

@@ -14,6 +14,7 @@
 #include "cdm/debug.h"
 #include "decrypters/Helpers.h"
 #include "utils/FileUtils.h"
+#include "utils/GUIUtils.h"
 #include "utils/log.h"
 
 using namespace UTILS;
@@ -101,11 +102,11 @@ SResult CWVCdmAdapter::Initialize(const DRM::Config& config, CWVDecrypter* host)
   if (!cdmAdapter->LoadCDM())
   {
     LOG::Log(LOGERROR, "Unable to load widevine shared library (%s)", cdmPath.c_str());
-    return SResult::Error("Cannot load Widevine CDM.");
+    return SResult::Error(GUI::GetLocalizedString(30304));
   }
 
   if (!cdmAdapter->Initialize())
-    return SResult::Error("Cannot initialize Widevine CDM.");
+    return SResult::Error(GUI::GetLocalizedString(30305));
 
   const std::vector<uint8_t>& cert = m_config.license.serverCert;
   if (!cert.empty())

src/decrypters/widevine/WVDecrypter.cpp

@@ -13,6 +13,7 @@
 #include "WVCencSingleSampleDecrypter.h"
 #include "utils/Base64Utils.h"
 #include "utils/FileUtils.h"
+#include "utils/GUIUtils.h"
 #include "utils/StringUtils.h"
 #include "utils/log.h"
 
@@ -63,8 +64,8 @@ SResult CWVDecrypter::OpenDRMSystem(const DRM::Config& config)
 {
   if (config.license.serverUri.empty())
   {
-    LOG::LogF(LOGERROR, "The DRM license server url has not been specified");
-    return SResult::Error("Missing DRM license server URL.");
+    LOG::LogF(LOGERROR, "The DRM license server url has not been configured");
+    return SResult::Error(GUI::GetLocalizedString(30306));
   }
 
   auto cdmAdapter = std::make_shared<CWVCdmAdapter>();

src/decrypters/widevineandroid/WVDecrypter.cpp

@@ -13,6 +13,7 @@
 #include "common/AdaptiveDecrypter.h"
 #include "decrypters/Helpers.h"
 #include "utils/Base64Utils.h"
+#include "utils/GUIUtils.h"
 #include "utils/log.h"
 
 #include <jni/src/ClassLoader.h>
@@ -56,8 +57,8 @@ SResult CWVDecrypterA::OpenDRMSystem(const DRM::Config& config)
 {
   if (config.license.serverUri.empty())
   {
-    LOG::LogF(LOGERROR, "The DRM license server url has not been specified");
-    return SResult::Error("Missing DRM license server URL.");
+    LOG::LogF(LOGERROR, "The DRM license server url has not been configured");
+    return SResult::Error(GUI::GetLocalizedString(30306));
   }
 
   m_WVCdmAdapter = std::make_shared<CWVCdmAdapterA>(config.keySystem, config, m_classLoader, this);