Merge lp:~bizauionica/nuvola-player/grooveshark-popup into lp:nuvola-player/2.5.x

[Ionică Bizău]

GrooveShark popup that appears sometimes is annoying.
I added an interval that verifies if the popup appeared and click the <Resume> button if so.

PS: This is my first time when I contribute on Launchpad :-)

[Jiří Janoušek (fenryxo)]

Sorry for late response, but I haven't somehow received e-mail about this merge proposal :-( Will take a look at it in following days.

[Ionică Bizău (bizauionica)]

Please tell anything that I have to modify. This is my first contribution in a project hosted on Launchpad. :-)

I'm a big fan of Git and GitHub (https://github.com/IonicaBizau).

[Jiří Janoušek (fenryxo)]

> I'm a big fan of Git and GitHub (https://github.com/IonicaBizau).

Nuvola Player 3 is hosted at GitHub, so your future contributions will be easier foy you ;-)

Code review:

- Please add yourself to the list of copyright holders at the top of integration.js.
- Is the 60-second interval short enough? As an user, it would be faster to click the resume button myself instead of wainting one minute in the worst case. 5 or 10-second interval might provide better user experience.

review: Needs Fixing

[lp:~bizauionica/nuvola-player/grooveshark-popup]

848. By Ionică Bizău on 2014-09-15

Removed unwanted spaces.

849. By Ionică Bizău on 2014-09-15

Added myself as contributor in Grooveshark integration JS file.

850. By Ionică Bizău on 2014-09-15

5-second interval instead of 60

851. By Ionică Bizău on 2014-09-15

Added an additional check before closing the popup.

852. By Ionică Bizău on 2014-09-15

Replaced spaces with tabs.

[Ionică Bizău (bizauionica)]

> Nuvola Player 3 is hosted at GitHub, so your future contributions will be easier foy you ;-)

Where is it hosted? I'd be happy to bring my contributions there too. Also, it's not bad to learn bzr as well. :-)

> Please add yourself to the list of copyright holders at the top of integration.js.

Done

> Is the 60-second interval short enough?

True. I set 5 seconds.

Other fixes:
 - removed unwanted spaces (trailing ones)
 - close popup when is playing

Clicking that button was making song start (even it was paused).

review: Needs Resubmitting

[Jiří Janoušek (fenryxo)]

Please revert unnecessary changes regarding whitespace.

review: Needs Fixing

[Jiří Janoušek (fenryxo)]

> Where is it hosted?

https://github.com/tiliado

[lp:~bizauionica/nuvola-player/grooveshark-popup]

853. By Ionică Bizău on 2014-09-16

Added tabs that were been removed back.

[Ionică Bizău (bizauionica)]

> Please revert unnecessary changes regarding whitespace.

I tried to fix them, but I cannot rollback them... In my opinion they are very ugly. :-)

review: Needs Resubmitting

[Jiří Janoušek (fenryxo)]

> I tried to fix them, but I cannot rollback them...

Just add a few tabs/spaces at positions indicated by the diff bellow.

> In my opinion they are very ugly. :-)

It's generally a good practise not to be stubborn and to follow coding style of a project you would like to contribute to.

review: Needs Fixing

[lp:~bizauionica/nuvola-player/grooveshark-popup]

854. By Ionică Bizău on 2014-10-01

Added trailing spaces back in COPYRIGHT content.

855. By Ionică Bizău on 2014-10-01

Added more trailing spaces.

[Ionică Bizău (bizauionica)]

> Just add a few tabs/spaces at positions indicated by the diff bellow.

It wasn't that hard. :-) A good way to exercise using bzr.

> It's generally a good practise not to be stubborn and to follow coding style of a project you would like to contribute to.

Indeed! However, I don't think it's a good idea to apply this to deleting trailing spaces. :-)

Please review it again. Thanks!

[Jiří Janoušek (fenryxo)]

review: Approve

[Ionică Bizău (bizauionica)]

Thanks for approving!

When will my changes be updated on PPA?

[Jiří Janoušek (fenryxo)]

> When will my changes be updated on PPA?

With release 2.5.0, maybe this week.

[Ionică Bizău (bizauionica)]

Awesome, thank you!

=== modified file 'data/nuvolaplayer/services/grooveshark/integration.js'
--- data/nuvolaplayer/services/grooveshark/integration.js	2013-12-22 18:57:54 +0000
+++ data/nuvolaplayer/services/grooveshark/integration.js	2014-10-01 13:40:26 +0000
@@ -1,5 +1,6 @@
 /*
  * Copyright 2011-2012 Jiří Janoušek <[e-mail]>
+ * Copyright 2014 Ionică Bizău <[e-mail]>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met: 
@@ -171,6 +172,13 @@
 			throw (this.name + ": " + e.message);
 		}
 	}
+
+	// Close popup that blocks song playing
+	setInterval(function () {
+		if (Grooveshark.getCurrentSongStatus().status === "paused") { return; }
+		var r = document.querySelector("span[data-translate-text='LB_INTERACTION_TIME_RESUME']")
+		r && r.click();
+	}, 1000 * 5);
 	
 	Nuvola.integration = new Integration(); // Singleton ;-)
 })(window._Nuvola);

=== modified file 'src/nuvola/gui/aboutdialog.vala'
--- src/nuvola/gui/aboutdialog.vala	2013-07-15 06:43:38 +0000
+++ src/nuvola/gui/aboutdialog.vala	2014-10-01 13:40:26 +0000
@@ -56,7 +56,8 @@
 			"Janez Troha <[e-mail]>",
 			"Adam Wolfe Gordon <[e-mail]>",
 			"Stefan Lohmaier <[e-mail]>",
-			"Michael Mims <[e-mail]>"
+			"Michael Mims <[e-mail]>",
+			"Ionică Bizău <[e-mail]>"
 		};
 		
 		var box = get_content_area() as Gtk.Box;