Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FavouritesDirectory] fix for adding addons to favourites via addonbrowser #11421

Merged
merged 1 commit into from
Jan 14, 2017

Conversation

phil65
Copy link
Contributor

@phil65 phil65 commented Jan 11, 2017

Fixes some scenarios where adding addons as favourites doesnt work properly.
@tamland

Copy link
Member

@Montellese Montellese left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good apart from the minors.

@@ -197,8 +197,15 @@ std::string CFavouritesDirectory::GetExecutePath(const CFileItem &item, const st
execute = StringUtils::Format("ActivateWindow(%s,%s,return)", contextWindow.c_str(), StringUtils::Paramify(item.GetPath()).c_str());
}
//! @todo STRING_CLEANUP
else if (item.IsScript() && item.GetPath().size() > 9) // plugin://<foo>
else if (StringUtils::StartsWith(item.GetPath(), "script://"))

This comment was marked as spam.

execute = StringUtils::Format("RunScript(%s)", StringUtils::Paramify(item.GetPath().substr(9)).c_str());
else if (StringUtils::StartsWith(item.GetPath(), "plugin://"))

This comment was marked as spam.

execute = StringUtils::Format("RunScript(%s)", StringUtils::Paramify(item.GetPath().substr(9)).c_str());
else if (StringUtils::StartsWith(item.GetPath(), "plugin://"))
execute = StringUtils::Format("PunPlugin(%s)", StringUtils::Paramify(item.GetPath().substr(9)).c_str());
else if (item.IsAddonsPath())

This comment was marked as spam.

@phil65
Copy link
Contributor Author

phil65 commented Jan 11, 2017

@Montellese updated.

@phil65
Copy link
Contributor Author

phil65 commented Jan 11, 2017

jenkins build this please.

execute = StringUtils::Format("RunScript(%s)", StringUtils::Paramify(item.GetPath().substr(9)).c_str());
else if (item.IsPlugin() && item.GetPath().size() > 9) // plugin://<foo>
execute = StringUtils::Format("PunPlugin(%s)", StringUtils::Paramify(item.GetPath().substr(9)).c_str());

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

@phil65
Copy link
Contributor Author

phil65 commented Jan 11, 2017

updated.

@phil65 phil65 force-pushed the fav_addons branch 2 times, most recently from f938749 to 0e28538 Compare January 11, 2017 23:49
@phil65
Copy link
Contributor Author

phil65 commented Jan 12, 2017

jenkins build this please.

@phil65
Copy link
Contributor Author

phil65 commented Jan 12, 2017

worth a backport?

else if (item.IsAddonsPath() && item.GetPath().size() > 9) // addons://<foo>
{
CURL url(item.GetPath());
execute = StringUtils::Format("RunAddon(%s)", url.GetFileName());

This comment was marked as spam.

@phil65
Copy link
Contributor Author

phil65 commented Jan 14, 2017

jenkins build this please.

@phil65 phil65 merged commit 0deb0ba into xbmc:master Jan 14, 2017
@MartijnKaijser MartijnKaijser added Type: Fix non-breaking change which fixes an issue v18 Leia labels Jan 20, 2017
@MartijnKaijser MartijnKaijser added this to the L 18.0-alpha1 milestone Jan 20, 2017
MartijnKaijser added a commit that referenced this pull request Jan 21, 2017
@phil65 phil65 deleted the fav_addons branch November 1, 2017 23:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport: Done Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants