Merge lp:~tvec623/ubuntu-desktop-accomplishments/20120814_accomp_importshowell into lp:ubuntu-desktop-accomplishments

[Tony Vec]

Added: New accomplishment set called importshotwell
Minor Fix: Fixed small typos for clarity in multimedia-added-music and musicinrhythmbox accomplishments

[Rafał Cieślak (rafalcieslak256)]

Great accomplishment, Tony! Thanks for submitting it. I have tested it, and I have two notes for you:

 * In the 'steps' field, step 4 is unclear ("Click the icon"). While I know that you meant 'click the icon you are presented with in dash search results' (though it took me some time to guess), I'd suggest to merge this step with the previous one, because it makes an impression that one needs to click some icon /after/ they launch Shotwell. And, after all, the point of this accomplishment is not explaining how to launch an application via dash, but how to get shotwell to manage one's images :-)
 * For some reason I am not awarded with this accomplishment even though I have imported photos to Shotwell. The script still exits with code 1... I have done a simple debugging, and it seems that ~/.shotwell directory is not present on my system. Can it be it stores my images DB in some other location? It would be great if you managed to fix this. If you need me to assist you by trying some scripts on my system which misses the ~/.shotwell directory, feel free to get in touch with me at #ubuntu-accomplishments on freenode :-)

review: Needs Fixing

[Matt Fischer (mfisch)]

Tony,

Any updates?

[Matt Fischer (mfisch)]

Tony,

Thanks for your work on this. Daniel picked up the code and is merging it in a new MP now and you will still get credit.

Unmerged revisions

=== added file 'accomplishments/ubuntu-desktop/en/multimedia/importshotwell.accomplishment'
--- accomplishments/ubuntu-desktop/en/multimedia/importshotwell.accomplishment	1970-01-01 00:00:00 +0000
+++ accomplishments/ubuntu-desktop/en/multimedia/importshotwell.accomplishment	2012-08-14 23:18:22 +0000
@@ -0,0 +1,18 @@
+[accomplishment]
+title = Import To Shotwell   
+description = Import photos/videos into Shotwell Photo Manager
+category = Multimedia
+icon = default.png
+author = Tony Vec <[e-mail]>
+collection = ubuntu-desktop
+summary = Shotwell Photo Manager allows you to import, organize, view, and edit images 
+	This accomplishment is awarded when you <b>import photos or videos</b> to your Shotwell library
+steps = Click the <i>Dash Home</i>
+	Enter <i>Shotwell Photo Manager</i>
+	You will be presented with the Shotwell application
+	Click the the icon 
+	To import, you can: <ul><li>Drag and drop a folder/file onto the application; or</li><li> Go to <b>File</b> and choose <b>Import from folder...</b>; Select the folder you want imported and press <b>OK</b></li></ul>
+tips = Shotwell supports JPEG, PNG, TIFF, BMP, and RAW photo files. It even supports video files!
+pitfalls = Shotwell does not support GIF images.
+links = http://yorba.org/shotwell/help/
+

=== modified file 'accomplishments/ubuntu-desktop/en/multimedia/multimedia-added-music.accomplishment'
--- accomplishments/ubuntu-desktop/en/multimedia/multimedia-added-music.accomplishment	2012-05-22 16:41:31 +0000
+++ accomplishments/ubuntu-desktop/en/multimedia/multimedia-added-music.accomplishment	2012-08-14 23:18:22 +0000
@@ -1,7 +1,7 @@
 [accomplishment]
 id = ubuntu-desktop/multimedia-added-music
 title = Added Music
-description = You have added music to your computer
+description = You have added music to your computer through Rhythmbox
 category = Multimedia
 icon = default.png
 summary = There lots of different types of music you can 

=== modified file 'accomplishments/ubuntu-desktop/en/multimedia/musicinrhythmbox.accomplishment'
--- accomplishments/ubuntu-desktop/en/multimedia/musicinrhythmbox.accomplishment	2012-06-10 11:46:06 +0000
+++ accomplishments/ubuntu-desktop/en/multimedia/musicinrhythmbox.accomplishment	2012-08-14 23:18:22 +0000
@@ -14,6 +14,6 @@
 	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.
+pitfalls = Using a network share could result in 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 'scripts/ubuntu-desktop/multimedia/importshotwell.py'
--- scripts/ubuntu-desktop/multimedia/importshotwell.py	1970-01-01 00:00:00 +0000
+++ scripts/ubuntu-desktop/multimedia/importshotwell.py	2012-08-14 23:18:22 +0000
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+import os
+import sqlite3
+import sys
+
+homeDir = os.getenv('HOME')
+path = os.path.join(homeDir,'.shotwell/data/photo.db') 
+
+if os.path.exists(path):
+    #connect to Shotwell library db
+    db = sqlite3.connect(path)
+
+    photo_curs = db.cursor()
+    video_curs = db.cursor()
+
+    photo_curs.execute('SELECT count(id) FROM PhotoTable')
+    video_curs.execute('SELECT count(id) FROM VideoTable')
+    
+    image_count = photo_curs.fetchone()
+    video_count = video_curs.fetchone()
+
+    #Close the cursor and Database
+    photo_curs.close()
+    video_curs.close()
+    db.close()
+
+    if image_count[0] > 0 or video_count[0] > 0:
+        #user has images in Shotwell
+        print image_count[0], video_count[0]
+        sys.exit(0)
+    else:
+        #user does not have images in Shotwell
+        sys.exit(1)
+else:
+    sys.exit(1)