Merge lp:~joshbrown/photostory/0.9_to_0.95 into lp:~photostory/photostory/import

[Josh Brown]

[Josh Brown (joshbrown)]

Excellent work writing the script Joel, however I have made a few minor changes that should make the script cleaner and more compact; I'd be grateful if you could double-check that my version works and then merge it in. I also think that the main branch (currently <import>) should perhaps be re-created under a less ambiguous name (such as <0.9_to_0.95>), although this isn't hugely important as I don't expect the branch to be in use for a long amount of time.

[Joel Auterson (joel-auterson)]

Josh - how exactly does this reformat? The files come out looking the same, correct?

[Josh Brown (joshbrown)]

The files should come out in the specified YYYY-MM-DD.png format. The main change is the way in which this formatting is handled, in this version it's handled in a single line:

filename = '{0}{1:04d}-{2:02d}-{3:02d}.png'.format(NEWdb, year, month, day)

[Joel Auterson (joel-auterson)]

Very clever, I wouldn't have thought of doing that.

review: Approve

=== renamed file 'photostory_import.py' => 'photostory_0.9_to_0.95.py'
--- photostory_import.py	2011-02-15 10:24:41 +0000
+++ photostory_0.9_to_0.95.py	2011-02-15 17:26:19 +0000
@@ -1,34 +1,30 @@
-#!/usr/bin/python
-
-#Photostory 0.95 - Importer for previous versions
-#by Joel Auterson ([e-mail])
-#http://www.launchpad.net/photostory
-
-import cPickle
-import os
-import os.path
-import shutil
+#!/usr/bin/env python
+
+# Photostory 0.9 -> 0.95 Data Converter
+# by Joel Auterson ([e-mail])
+# http://launchpad.net/photostory
+
+# The format with which data is stored has been changed in Photostory 0.95.
+# Users must manually run this script before uninstalling Photostory 0.9 to
+# move and reformat their data as the new 0.95 format.
+
+import os, cPickle, shutil
+
+OLDdb = '/usr/share/photostory/data/db'
+NEWdb = os.path.expanduser('~/.photostory/photos/')
 
 # If the `~/.photostory/photos` directory doesn't exist, create it:
-if not os.path.exists(os.path.expanduser('~/.photostory/photos')):
-    os.makedirs(os.path.expanduser('~/.photostory/photos'))
-
-db = cPickle.load(open('/usr/share/photostory/data/db', 'rb'))
-n = 0
-
-while (n < len(db)):
+if not os.path.exists(NEWdb): os.makedirs(NEWdb)
+
+db = cPickle.load(open(OLDdb, 'rb'))
+
+# Move and rename each photo to `~/.photostory/photos/YYYY-MM-DD.png`:
+for n in range(len(db)):
     dateTuple = db.keys()[n]
     year = dateTuple[0]
     month = dateTuple[1] + 1
     day = dateTuple[2]
-
-    if (month < 10):
-        month = "0" + str(month)
-    if (day < 10):
-        day = "0" + str(day)
-
-    theFile = os.path.expanduser("~/.photostory/photos/") + str(year) + "-" + str(month) + "-" + str(day) + ".png"
-    shutil.copy(db[dateTuple], theFile)
-    n = n + 1
-
-print 'Done.'
+    filename = '{0}{1:04d}-{2:02d}-{3:02d}.png'.format(NEWdb, year, month, day)
+    shutil.copy(db[dateTuple], filename)
+
+print 'Reformatting complete.'