[PVR] : 4 fixes related to chanel icons #4227

alexmaloteaux · 2014-02-17T23:18:44Z

This pr fixes 4 issues related to pvr channels icon :

When masterlockcode is set and user click on the logo button in channel manager, the password dialog box is shown twice and user need to enter the password 2 times.
This is resolved by removing and uneeded call to g_passwordManager.IsMasterLockUnlocked in CGUIDialogPVRChannelManager::OnClickButtonChannelLogo

2)When user set a user defined logo; the iconpath is emptied upon xbmc restart. This is fixed by setting the userseticon flag to true when user choose its own icon.

When the icon path related file does not exists anymore, it should be emptied. This is particulary boring when UserSetIcon is set because it will never been emptied regarding how updatefromclient works. This is fixed by veryfing if the file exists in CPVRChannelGroup::SearchAndSetChannelIcons
When user set a custom name for a channel in Channel manager, SearchAndSetChannelIcons should also search for an icon file based on that name.

t-nelson · 2014-02-17T23:24:04Z

@opdenkamp @xhaggi for review please

alexmaloteaux · 2014-02-18T01:08:10Z

@t-nelson splitting ?? how ?? they are all related to the same files and wont merge/build all i think

t-nelson · 2014-02-18T01:27:46Z

http://stackoverflow.com/questions/4307095/git-how-to-split-up-a-commit-buried-in-history

In general we want at least one commit for each distinct feature added/bug fixed. You can make more if it's logical. They can always be squashed later. Multiple fixes per commit are a complete PITA to review and even further pain revert later if there's a problem with only part of it.

alexmaloteaux · 2014-02-18T10:02:15Z

@t-nelson ok will know for the feature and won't happen again :) . I have not splitted the first 3 fixes in separated commits; Maybe for this times lets first @opdenkamp and @xhaggi review it, i guess they will figure out easily this pr. If not i ll got to the boring, time consuming tasks of splitting it and realeasing 1 by 1 .. Regards

opdenkamp · 2014-02-18T10:03:51Z

before i have a look at it: please fix up the cosmetics. we use 2 spaces, no tabs

alexmaloteaux · 2014-02-18T11:19:39Z

@xhaggi it was like this, so by adding bForceUserSetIconUpdate i m sure to not break anything.
do we need to know if an user has set the icon path to empty? -> i guess original devs would better answer this..

alexmaloteaux · 2014-02-20T08:34:52Z

@xhaggi , @opdenkamp you want me to split it ?

xhaggi · 2014-02-20T10:19:17Z

yes please split your commit in logical parts and apply the cosmetics.

alexmaloteaux · 2014-02-20T16:48:47Z

@xhaggi i already applied the cosmetics . Will check your link concerning the commit splitting thanks

alexmaloteaux · 2014-02-20T17:02:57Z

@xhaggi @t-nelson after splitting can i push diretly to this pr or i need to create a new one ?

fritsch · 2014-02-20T17:11:36Z

Force push

t-nelson · 2014-02-20T19:20:06Z

To elaborate. When you force push the branch to your repo, github will automatically update this PR.

alexmaloteaux · 2014-02-21T14:42:38Z

@xhaggi @t-nelson @opdenkamp ok hope it is better now ..

t-nelson · 2014-02-21T16:38:27Z

Thanks for splitting this up. Would you mind dropping the "Fix Nx:" prefixes from the messages and prefixing them "[PVR]" instead.

alexmaloteaux · 2014-02-21T16:56:04Z

@t-nelson done

xhaggi · 2014-02-21T18:06:46Z

Sorry but could you please add fix: to the commit message and use a short one line message + separated details if needed.

[pvr] fix: password prompt appears twice in channel manager

detailed description

t-nelson · 2014-02-21T18:17:24Z

Hehe. I think maybe we need an "XBMC git guidelines" in contributing.md.

xhaggi · 2014-02-21T20:09:59Z

1st commit (password prompt appears twice) is fine with me

xhaggi · 2014-02-21T20:15:10Z

@alexmaloteaux could you please extract the first commit into a separate PR so we could merge it independently.

t-nelson · 2014-02-21T20:20:56Z

1st commit (password prompt appears twice) is fine with me

Something else seems wrong though. We shouldn't be prompting the user unless bPromptUser is set though, no?

xhaggi · 2014-02-21T20:52:26Z

@t-nelson we don't need to call IsMasterLockUnlocked() as IsProfileLockUnlocked() do it for us
https://github.com/xbmc/xbmc/blob/4372e0d63cd05961b81c0d08d1180e77f44f8de2/xbmc/GUIPassword.cpp?source=cc#L195

t-nelson · 2014-02-21T20:58:38Z

Ah I missed the master/profile difference.

Fine by me.

@opdenkamp's button

On Fri, Feb 21, 2014 at 1:52 PM, Sascha Woo notifications@github.comwrote:

@t-nelson https://github.com/t-nelson we don't need to call
IsMasterLockUnlocked() as IsProfileLockUnlocked() do it for us

https://github.com/xbmc/xbmc/blob/4372e0d63cd05961b81c0d08d1180e77f44f8de2/xbmc/GUIPassword.cpp?source=cc#L195

Reply to this email directly or view it on GitHubhttps://github.com//pull/4227#issuecomment-35772302
.

xbmc/pvr/channels/PVRChannelGroup.cpp

-      continue;
+    {
+      //check if the file exist or empty it
+      if(VerifyChannelIconPath(groupMember.channel))


alexmaloteaux · 2014-02-28T00:26:43Z

@xhaggi @opdenkamp regarding how the userseticon flag was used in SetIconPath before the PR. i think it is safe to remove the force flag and just make one little change as in the 5b452bd commit

opdenkamp · 2014-02-28T09:08:29Z

I'll review over the week end.

xbmc/pvr/channels/PVRChannel.cpp

@@ -753,6 +750,11 @@ bool CPVRChannel::IsUserSetIcon(void) const
  return m_bIsUserSetIcon;
 }

+bool CPVRChannel::IsIconExists() const
+{
+  return  (CFile::Exists(IconPath()));


alexmaloteaux · 2014-03-14T18:46:36Z

@Jalle19 renamed that, @xhaggi applied the cosmetics

xhaggi · 2014-03-15T18:55:10Z

could you please squash the commits

t-nelson · 2014-03-21T19:05:34Z

@alexmaloteaux please squash the history down to one commit per fix and we'll get this in.

alexmaloteaux · 2014-03-22T15:36:18Z

@t-nelson ok like this ?

t-nelson · 2014-03-22T15:48:58Z

Fine by my eye.

@opdenkamp, @xhaggi, A last pass by one of you, please.

jenkins build this please

xhaggi · 2014-03-23T08:12:22Z

@alexmaloteaux finally please squash commit 19e3053 into 165578b

opdenkamp · 2014-03-23T13:18:45Z

ok for gotham when squashed

xhaggi · 2014-03-25T06:33:50Z

@alexmaloteaux if you don't have time let me know. i will cherry pick your stuff and finish things so we can merge it.

alexmaloteaux · 2014-03-25T17:52:40Z

@xhaggi i don't get it is it merged ?

…ld be used too when searching icons

alexmaloteaux · 2014-03-25T18:19:13Z

@xhaggi ok done ; read the comments i think it is better to keep updatechannel like this

xhaggi · 2014-03-25T18:23:22Z

sorry but you squashed different commits into one. (the last one in the one before)

alexmaloteaux · 2014-03-25T18:34:41Z

@xhaggi one per fix with all the cosmetics and so on included in the last one

xhaggi · 2014-03-25T18:40:09Z

i told you that the last commit should be squashed into commit 165578b. you squashed the last one in the previous one. It would be nice if you could separate all the stuff related to commit 165578b into this commit. if you need help let me know.

alexmaloteaux · 2014-03-26T09:21:07Z

@xhaggi the older commits history is deleted due to -force i think; only way is the boring part of git rebase ; git -p add ; manual stuff ; ... i guess; do you have an easier solution ? sorry fir misunderstood ..

xhaggi · 2014-03-26T09:30:33Z

@alexmaloteaux now you have to do a manual part. you could do a git rebase and edit the corresponing commits then c/p your changes and continue rebasing or you could start from scratch, rename your local branch, create a new one with the same name, c/p your changes then commit and so on and later do a force push.

xhaggi · 2014-03-26T10:40:12Z

@alexmaloteaux BTW the commit history is not deleted, but you have to use a gui client for git which supports to show commits without branch assignments. or you know the commit id ;)

alexmaloteaux · 2014-03-26T11:34:05Z

@xhaggi theres is 3 commit (after final squash) and 3 fix; maybe just editing final commit messgae will do ; otherwise too boring .. :)

Jalle19 · 2014-03-26T11:43:12Z

Just merge it, no point in testing the guy's gitfu.

xhaggi · 2014-03-26T13:22:12Z

i did the magic git rebase/split stuff in PR #4477

t-nelson · 2014-03-26T13:38:52Z

Just merge it, no point in testing the guy's gitfu.

We aren't testing his git fu. We're keeping our history clean. It makes
future bisecting and reverting much easier.

You never need a GUI to do something with git. Use git reflog to find the
time the tip was moved before the offending rebase. Do a hard reset to that
point (eg. git reset --hard HEAD@{4}). Then try again.

MartijnKaijser added this to the Pending for inclusion milestone Feb 21, 2014

opdenkamp reviewed Feb 25, 2014
View reviewed changes

xbmc/pvr/channels/PVRChannelGroup.cpp

continue;

{

//check if the file exist or empty it

if(VerifyChannelIconPath(groupMember.channel))

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

xhaggi reviewed Mar 4, 2014
View reviewed changes

xbmc/pvr/channels/PVRChannel.cpp

@@ -753,6 +750,11 @@ bool CPVRChannel::IsUserSetIcon(void) const

return m_bIsUserSetIcon;

}

bool CPVRChannel::IsIconExists() const

{

return (CFile::Exists(IconPath()));

This comment was marked as spam.

Sign in to view

xhaggi closed this Mar 4, 2014

[PVR] If a user set a custom name for the pvr channel, this name shou…

d88053a

…ld be used too when searching icons

[PVR] use StringUtils::Empty instead of std::string()

c8b0bc9

[PVR] fix identation

e49041d

xhaggi mentioned this pull request Mar 26, 2014

[pvr] fixes related to chanel icons #4477

Merged

xhaggi closed this Mar 26, 2014

t-nelson removed the Gotham label Mar 27, 2014

MartijnKaijser modified the milestones: Abandoned, obsolete or superseeded, Pending for inclusion Jun 7, 2014

[PVR] : 4 fixes related to chanel icons #4227

[PVR] : 4 fixes related to chanel icons #4227

Conversation

alexmaloteaux commented Feb 17, 2014

t-nelson commented Feb 17, 2014

alexmaloteaux commented Feb 18, 2014

t-nelson commented Feb 18, 2014

alexmaloteaux commented Feb 18, 2014

opdenkamp commented Feb 18, 2014

alexmaloteaux commented Feb 18, 2014

alexmaloteaux commented Feb 20, 2014

xhaggi commented Feb 20, 2014

alexmaloteaux commented Feb 20, 2014

alexmaloteaux commented Feb 20, 2014

fritsch commented Feb 20, 2014

t-nelson commented Feb 20, 2014

alexmaloteaux commented Feb 21, 2014

t-nelson commented Feb 21, 2014

alexmaloteaux commented Feb 21, 2014

xhaggi commented Feb 21, 2014

t-nelson commented Feb 21, 2014

xhaggi commented Feb 21, 2014

xhaggi commented Feb 21, 2014

t-nelson commented Feb 21, 2014

xhaggi commented Feb 21, 2014

t-nelson commented Feb 21, 2014

This comment was marked as spam.

This comment was marked as spam.

alexmaloteaux commented Feb 28, 2014

opdenkamp commented Feb 28, 2014

This comment was marked as spam.

alexmaloteaux commented Mar 14, 2014

xhaggi commented Mar 15, 2014

t-nelson commented Mar 21, 2014

alexmaloteaux commented Mar 22, 2014

t-nelson commented Mar 22, 2014

xhaggi commented Mar 23, 2014

opdenkamp commented Mar 23, 2014

xhaggi commented Mar 25, 2014

alexmaloteaux commented Mar 25, 2014

alexmaloteaux commented Mar 25, 2014

xhaggi commented Mar 25, 2014

alexmaloteaux commented Mar 25, 2014

xhaggi commented Mar 25, 2014

alexmaloteaux commented Mar 26, 2014

xhaggi commented Mar 26, 2014

xhaggi commented Mar 26, 2014

alexmaloteaux commented Mar 26, 2014

Jalle19 commented Mar 26, 2014

xhaggi commented Mar 26, 2014

t-nelson commented Mar 26, 2014