aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xbmc/addons/AddonInstaller.cpp56
-rw-r--r--xbmc/addons/AddonInstaller.h8
-rw-r--r--xbmc/addons/AddonManager.cpp23
-rw-r--r--xbmc/addons/AddonManager.h3
-rw-r--r--xbmc/filesystem/PluginDirectory.cpp5
5 files changed, 65 insertions, 30 deletions
diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp
index e9f39b185b..44fd977b99 100644
--- a/xbmc/addons/AddonInstaller.cpp
+++ b/xbmc/addons/AddonInstaller.cpp
@@ -38,6 +38,7 @@
#include "GUIUserMessages.h" // for callback
#include "utils/StringUtils.h"
#include "dialogs/GUIDialogKaiToast.h"
+#include "dialogs/GUIDialogProgress.h"
using namespace std;
using namespace XFILE;
@@ -69,6 +70,9 @@ CAddonInstaller &CAddonInstaller::Get()
void CAddonInstaller::OnJobComplete(unsigned int jobID, bool success, CJob* job)
{
+ if (success)
+ CAddonMgr::Get().FindAddons();
+
CSingleLock lock(m_critSection);
if (strncmp(job->GetType(), "repoupdate", 10) == 0)
{ // repo job finished
@@ -80,11 +84,8 @@ void CAddonInstaller::OnJobComplete(unsigned int jobID, bool success, CJob* job)
JobMap::iterator i = find_if(m_downloadJobs.begin(), m_downloadJobs.end(), bind2nd(find_map(), jobID));
if (i != m_downloadJobs.end())
m_downloadJobs.erase(i);
- lock.Leave();
}
-
- if (success)
- CAddonMgr::Get().FindAddons();
+ lock.Leave();
CGUIMessage msg(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE);
g_windowManager.SendThreadMessage(msg);
@@ -156,6 +157,53 @@ bool CAddonInstaller::Cancel(const CStdString &addonID)
return false;
}
+bool CAddonInstaller::PromptForInstall(const CStdString &addonID, AddonPtr &addon)
+{
+ // we assume that addons that are enabled don't get to this routine (i.e. that GetAddon() has been called)
+ if (CAddonMgr::Get().GetAddon(addonID, addon, ADDON_UNKNOWN, false))
+ return false; // addon is installed but disabled, and the user has specifically activated something that needs
+ // the addon - should we enable it?
+
+ // check we have it available
+ CAddonDatabase database;
+ database.Open();
+ if (database.GetAddon(addonID, addon))
+ { // yes - ask user if they want it installed
+ if (!CGUIDialogYesNo::ShowAndGetInput(g_localizeStrings.Get(24076), g_localizeStrings.Get(24100),
+ addon->Name().c_str(), g_localizeStrings.Get(24101)))
+ return false;
+ if (Install(addonID, true))
+ {
+ CGUIDialogProgress *progress = (CGUIDialogProgress *)g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
+ if (progress)
+ {
+ progress->SetHeading(13413); // Downloading
+ progress->SetLine(0, "");
+ progress->SetLine(1, addon->Name());
+ progress->SetLine(2, "");
+ progress->SetPercentage(0);
+ progress->StartModal();
+ while (true)
+ {
+ progress->Progress();
+ unsigned int percent;
+ if (progress->IsCanceled())
+ {
+ Cancel(addonID);
+ break;
+ }
+ if (!GetProgress(addonID, percent))
+ break;
+ progress->SetPercentage(percent);
+ }
+ progress->Close();
+ }
+ return CAddonMgr::Get().GetAddon(addonID, addon);
+ }
+ }
+ return false;
+}
+
bool CAddonInstaller::Install(const CStdString &addonID, bool force, const CStdString &referer, bool background)
{
AddonPtr addon;
diff --git a/xbmc/addons/AddonInstaller.h b/xbmc/addons/AddonInstaller.h
index f16cf4583a..15bcd9f1ee 100644
--- a/xbmc/addons/AddonInstaller.h
+++ b/xbmc/addons/AddonInstaller.h
@@ -35,6 +35,14 @@ public:
bool GetProgress(const CStdString &addonID, unsigned int &percent) const;
bool Cancel(const CStdString &addonID);
+ /*! \brief Prompt the user as to whether they wish to install an addon.
+ \param addonID the addon ID of the item to install.
+ \param addon [out] the installed addon for later use.
+ \return true on successful install, false otherwise.
+ \sa Install
+ */
+ bool PromptForInstall(const CStdString &addonID, ADDON::AddonPtr &addon);
+
/*! \brief Install an addon if it is available in a repository
\param addonID the addon ID of the item to install
\param force whether to force the install even if the addon is already installed (eg for updating). Defaults to false.
diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
index dc2d48ff4b..4a61c7edb9 100644
--- a/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp
@@ -20,7 +20,6 @@
*/
#include "AddonManager.h"
#include "Addon.h"
-#include "AddonInstaller.h"
#include "DllLibCPluff.h"
#include "utils/StringUtils.h"
#include "utils/JobManager.h"
@@ -32,7 +31,6 @@
#include "settings/AdvancedSettings.h"
#include "utils/log.h"
#include "tinyXML/tinyxml.h"
-#include "dialogs/GUIDialogYesNo.h"
#ifdef HAS_VISUALISATION
@@ -392,7 +390,7 @@ bool CAddonMgr::GetAddons(const TYPE &type, VECADDONS &addons, bool enabled /* =
return addons.size() > 0;
}
-bool CAddonMgr::GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &type/*=ADDON_UNKNOWN*/, bool enabledOnly /*= true*/, bool install /*= false*/)
+bool CAddonMgr::GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &type/*=ADDON_UNKNOWN*/, bool enabledOnly /*= true*/)
{
CSingleLock lock(m_critSection);
@@ -406,25 +404,6 @@ bool CAddonMgr::GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &typ
return false;
return NULL != addon.get();
}
- else
- {
- if (install)
- {
- if (!CGUIDialogYesNo::ShowAndGetInput(g_localizeStrings.Get(24076), g_localizeStrings.Get(24100),
- str.c_str(), g_localizeStrings.Get(24101)))
- return false;
-
- if (CAddonInstaller::Get().Install(str.c_str(), true, "", false))
- {
- cp_plugin_info_t *cpaddon = m_cpluff->get_plugin_info(m_cp_context, str.c_str(), &status);
- addon = GetAddonFromDescriptor(cpaddon);
- m_cpluff->release_info(m_cp_context, cpaddon);
- if (status == CP_OK && cpaddon)
- return NULL != addon.get();
- }
- }
- }
-
if (cpaddon)
m_cpluff->release_info(m_cp_context, cpaddon);
diff --git a/xbmc/addons/AddonManager.h b/xbmc/addons/AddonManager.h
index bbbb06240a..8166974786 100644
--- a/xbmc/addons/AddonManager.h
+++ b/xbmc/addons/AddonManager.h
@@ -86,10 +86,9 @@ namespace ADDON
\param addon [out] the retrieved addon pointer - only use if the function returns true.
\param type type of addon to retrieve - defaults to any type.
\param enabledOnly whether we only want enabled addons - set to false to allow both enabled and disabled addons - defaults to true.
- \param install whether to install the requested addon in case it's not yet installed - defaults to false.
\return true if an addon matching the id of the given type is available and is enabled (if enabledOnly is true).
*/
- bool GetAddon(const CStdString &id, AddonPtr &addon, const TYPE &type = ADDON_UNKNOWN, bool enabledOnly = true, bool install = false);
+ bool GetAddon(const CStdString &id, AddonPtr &addon, const TYPE &type = ADDON_UNKNOWN, bool enabledOnly = true);
bool HasAddons(const TYPE &type, bool enabled = true);
bool GetAddons(const TYPE &type, VECADDONS &addons, bool enabled = true);
bool GetAllAddons(VECADDONS &addons, bool enabled = true, bool allowRepos = false);
diff --git a/xbmc/filesystem/PluginDirectory.cpp b/xbmc/filesystem/PluginDirectory.cpp
index f978b2cea5..aa4612e3c3 100644
--- a/xbmc/filesystem/PluginDirectory.cpp
+++ b/xbmc/filesystem/PluginDirectory.cpp
@@ -25,6 +25,7 @@
#include "PluginDirectory.h"
#include "utils/URIUtils.h"
#include "addons/AddonManager.h"
+#include "addons/AddonInstaller.h"
#include "addons/IAddon.h"
#ifdef HAS_PYTHON
#include "interfaces/python/XBPython.h"
@@ -77,7 +78,7 @@ bool CPluginDirectory::StartScript(const CStdString& strPath, bool retrievingDir
{
CURL url(strPath);
- if (!CAddonMgr::Get().GetAddon(url.GetHostName(), m_addon, ADDON_PLUGIN, true, true))
+ if (!CAddonMgr::Get().GetAddon(url.GetHostName(), m_addon, ADDON_PLUGIN) && !CAddonInstaller::Get().PromptForInstall(url.GetHostName(), m_addon))
{
CLog::Log(LOGERROR, "Unable to find plugin %s", url.GetHostName().c_str());
return false;
@@ -408,7 +409,7 @@ bool CPluginDirectory::RunScriptWithParams(const CStdString& strPath)
return false;
AddonPtr addon;
- if (!CAddonMgr::Get().GetAddon(url.GetHostName(), addon, ADDON_PLUGIN, true , true))
+ if (!CAddonMgr::Get().GetAddon(url.GetHostName(), addon, ADDON_PLUGIN) && !CAddonInstaller::Get().PromptForInstall(url.GetHostName(), addon))
{
CLog::Log(LOGERROR, "Unable to find plugin %s", url.GetHostName().c_str());
return false;
generated by cgit v1.2.3 (git 2.26.2) at 2025-02-17 04:36:11 +0000