Merge lp:~cprofitt/ubuntu-desktop-accomplishments/multimedia-added-music into lp:ubuntu-desktop-accomplishments

[Charles Profitt]

Added improvements to music added script with fixed recursion for sub-folders
Added Music in Rhythmbox award and script

[Rafał Cieślak (rafalcieslak256)]

Thanks for your awesome work, Charles!
I have spotted some problems with your accomplishments, which caused them not to display in the viewer (have you actually tested them?). However, they were very simple, so I fixed them for you.
First thing was that your new accomplishment depended on itself - which made it always locked. Second - there was missing 'collection = ubuntu-desktop', and the category was incorrect, I changed it to 'category = Multimedia'. Also - the script file was not marked as executable.
Anyway, I am merging, that's a nice accomplishment, and thanks for fixing the added-music script! ;-)

review: Approve

[Charles Profitt (cprofitt)]

Rafal:

Thanks... I will make sure to check those better. I think I added the depends when I had two steps and removed it w/o testing again.

---- "Rafal Cieślak" <email address hidden> wrote:
> Review: Approve
>
> Thanks for your awesome work, Charles!
> I have spotted some problems with your accomplishments, which caused them not to display in the viewer (have you actually tested them?). However, they were very simple, so I fixed them for you.
> First thing was that your new accomplishment depended on itself - which made it always locked. Second - there was missing 'collection = ubuntu-desktop', and the category was incorrect, I changed it to 'category = Multimedia'. Also - the script file was not marked as executable.
> Anyway, I am merging, that's a nice accomplishment, and thanks for fixing the added-music script! ;-)
> --
> https://code.launchpad.net/~cprofitt/ubuntu-desktop-accomplishments/multimedia-added-music/+merge/109439
> You are the owner of lp:~cprofitt/ubuntu-desktop-accomplishments/multimedia-added-music.

=== added file 'accomplishments/ubuntu-desktop/bn/multimedia/musicinrhythmbox.accomplishment'
--- accomplishments/ubuntu-desktop/bn/multimedia/musicinrhythmbox.accomplishment	1970-01-01 00:00:00 +0000
+++ accomplishments/ubuntu-desktop/bn/multimedia/musicinrhythmbox.accomplishment	2012-06-08 21:27:19 +0000
@@ -0,0 +1,19 @@
+[accomplishment]
+title = Used Rhythmbox
+description = You have used Rhythmbox.
+category = Accessories:Accomplishments
+icon = default.png
+author = Charles Profitt <[e-mail]>
+depends=ubuntu-desktop/musicinrhythmbox
+summary = Rhythmbox is a music player in Ubuntu. You can use it to play music from local or shared music stores, or on-line stream radios.
+	This accomplishment is awarded when you have used added music to your Rhythmbox library
+steps = Click the <i>Dash Home</i>
+	Enter <i>Rhythmbox</i>
+	You will be presented with the Rhythmbox application
+	Click the <i>Rhythmbox</i> icon
+	Right click the 'music' entry under library and choose 'import file...' for a single song or 'import folder...' for a folder of music
+	Navigate to the folder or song desired
+tips = You can even buy music through Rhythmbox
+pitfalls = Using a network share could resultin Rhythmbox reporting that you have missing files if you have not mounted the share prior to launching Rhythmbox.
+help = Click the <i>Help</i> menu.
+
 
=== added file 'accomplishments/ubuntu-desktop/en/multimedia/musicinrhythmbox.accomplishment'
--- accomplishments/ubuntu-desktop/en/multimedia/musicinrhythmbox.accomplishment	1970-01-01 00:00:00 +0000
+++ accomplishments/ubuntu-desktop/en/multimedia/musicinrhythmbox.accomplishment	2012-06-08 21:27:19 +0000
@@ -0,0 +1,19 @@
+[accomplishment]
+title = Used Rhythmbox
+description = You have used Rhythmbox.
+category = Accessories:Accomplishments
+icon = default.png
+author = Charles Profitt <[e-mail]>
+depends=ubuntu-desktop/musicinrhythmbox
+summary = Rhythmbox is a music player in Ubuntu. You can use it to play music from local or shared music stores, or on-line stream radios.
+	This accomplishment is awarded when you have used added music to your Rhythmbox library
+steps = Click the <i>Dash Home</i>
+	Enter <i>Rhythmbox</i>
+	You will be presented with the Rhythmbox application
+	Click the <i>Rhythmbox</i> icon
+	Right click the 'music' entry under library and choose 'import file...' for a single song or 'import folder...' for a folder of music
+	Navigate to the folder or song desired
+tips = You can even buy music through Rhythmbox
+pitfalls = Using a network share could resultin Rhythmbox reporting that you have missing files if you have not mounted the share prior to launching Rhythmbox.
+help = Click the <i>Help</i> menu.
+
 
=== added file 'accomplishments/ubuntu-desktop/pl/multimedia/musicinrhythmbox.accomplishment'
--- accomplishments/ubuntu-desktop/pl/multimedia/musicinrhythmbox.accomplishment	1970-01-01 00:00:00 +0000
+++ accomplishments/ubuntu-desktop/pl/multimedia/musicinrhythmbox.accomplishment	2012-06-08 21:27:19 +0000
@@ -0,0 +1,19 @@
+[accomplishment]
+title = Used Rhythmbox
+description = You have used Rhythmbox.
+category = Accessories:Accomplishments
+icon = default.png
+author = Charles Profitt <[e-mail]>
+depends=ubuntu-desktop/musicinrhythmbox
+summary = Rhythmbox is a music player in Ubuntu. You can use it to play music from local or shared music stores, or on-line stream radios.
+	This accomplishment is awarded when you have used added music to your Rhythmbox library
+steps = Click the <i>Dash Home</i>
+	Enter <i>Rhythmbox</i>
+	You will be presented with the Rhythmbox application
+	Click the <i>Rhythmbox</i> icon
+	Right click the 'music' entry under library and choose 'import file...' for a single song or 'import folder...' for a folder of music
+	Navigate to the folder or song desired
+tips = You can even buy music through Rhythmbox
+pitfalls = Using a network share could resultin Rhythmbox reporting that you have missing files if you have not mounted the share prior to launching Rhythmbox.
+help = Click the <i>Help</i> menu.
+
 
=== modified file 'scripts/ubuntu-desktop/multimedia/multimedia-added-music.py'
--- scripts/ubuntu-desktop/multimedia/multimedia-added-music.py	2012-06-06 18:17:23 +0000
+++ scripts/ubuntu-desktop/multimedia/multimedia-added-music.py	2012-06-08 21:27:19 +0000
@@ -10,13 +10,30 @@
 	startStr = content[0:13]
 	if startStr == 'XDG_MUSIC_DIR':
 		musicDir = content
+
+# recursive function to go through sub-directories
+def test_for_music(directory):
+    dirList = os.listdir(directory)
+    for fname in dirList:
+        filepath = os.path.join(directory, fname)
+        if os.path.isdir(filepath):
+            test_for_music(filepath)
+        else:
+            filetype = commands.getstatusoutput('file -b "' +filepath + '"')
+            if "audio" in filetype[1]:
+                # audio file present
+                sys.exit(0)
+                
+
+# removes extra characters around directory
 musicDir = musicDir[21:]
 musicDir = musicDir[:-2]
-fileCount = commands.getstatusoutput('ls ~/'+musicDir+'/ -1 | wc -l')
-fileCount =  fileCount[1:]
-if fileCount[0] == 0:
-	#user has no music
-	sys.exit(1)
-else:
-	#user has music
-	sys.exit(0)
+
+music = os.path.join(homeDir, musicDir)
+test_for_music(music)
+
+
+    
+#user has no music
+sys.exit(1)
+
 
=== added file 'scripts/ubuntu-desktop/multimedia/musicinrhythmbox.py'
--- scripts/ubuntu-desktop/multimedia/musicinrhythmbox.py	1970-01-01 00:00:00 +0000
+++ scripts/ubuntu-desktop/multimedia/musicinrhythmbox.py	2012-06-08 21:27:19 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/python
+import commands, sys, os
+homeDir = os.getenv("HOME")
+path = os.path.join(homeDir,'.local/share/rhythmbox/rhythmdb.xml') 
+
+
+if os.path.exists(path):
+	#user has used Rhythmbox now we need to test for the existence of music
+        # test for the existence of <entry type="song"> in the rhythmdb.xml
+        file = open(path)
+
+        # convert file to string
+        data = file.read()
+
+        # we do not need to keep the file open
+        file.close()
+
+        # test for the existence of a song in the file
+        if "song" in data:                
+                #user has music in Rhythmbox
+                sys.exit(0)
+                # print "user has music"
+        else:
+                #user does not have music in Rhythmbox
+                sys.exit(0)
+                # print "user does not have music"
+
+else:
+        # user has not used Rhythmbox
+	sys.exit(1)
+