Merge lp:~joshbrown/photostory/datafiles into lp:~photostory/photostory/trunk

[Josh Brown]

[lp:~joshbrown/photostory/datafiles]

19. By Josh Brown on 2010-08-19

Changed all instances of `picture` to `photo`.

[Josh Brown (joshbrown)]

Since there hasn't been any activity for a while, I'm going to go ahead and merge this.

=== modified file 'MANIFEST'
--- MANIFEST	2010-08-16 16:38:18 +0000
+++ MANIFEST	2010-08-19 11:52:40 +0000
@@ -3,6 +3,11 @@
 photostory.desktop
 setup.py
 pictures
+<<<<<<< TREE
 data/db
 data/photostory.svg
 data/num
+=======
+photostory.svg
+data/nopic.png
+>>>>>>> MERGE-SOURCE

=== removed directory 'data'
=== removed file 'data/db'
--- data/db	2010-07-30 01:33:34 +0000
+++ data/db	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-(dp1
-.
\ No newline at end of file

=== removed file 'data/num'
--- data/num	2010-07-30 01:33:34 +0000
+++ data/num	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-I0
-.
\ No newline at end of file

=== modified file 'install.diff'
--- install.diff	2010-08-16 10:03:30 +0000
+++ install.diff	2010-08-19 11:52:40 +0000
@@ -1,50 +1,10 @@
---- photostory	2010-08-16 10:51:49.585558000 +0100
-+++ photostory	2010-08-16 10:57:08.908925045 +0100
-@@ -25,8 +25,8 @@
-         self.movPath = None
-         self.adj = gtk.Adjustment(5, 1, 10, 1)
-         self.pic=None
--        self.db = cPickle.load(open('data/db', 'rb'))
--        self.ind = int(cPickle.load(open('data/num', 'rb')))
-+        self.db = cPickle.load(open('/usr/local/share/photostory/data/db', 'rb'))
-+        self.ind = int(cPickle.load(open('/usr/local/share/photostory/data/num', 'rb')))
-         todayPicName = "pictures/" + str(self.ind) + ".png"
-         todayDate = None
- 
-@@ -37,8 +37,8 @@
-         def closedown(win):
-             print 'ind ' + str(self.ind)
-             print 'db' + str(self.db)
--            cPickle.dump(self.db, open('data/db', 'wb'))
--            cPickle.dump(self.ind, open('data/num', 'wb'))
-+            cPickle.dump(self.db, open('/usr/local/share/photostory/data/db', 'wb'))
-+            cPickle.dump(self.ind, open('/usr/local/share/photostory/data/num', 'wb'))
-             gtk.main_quit()
- 
-         def about(aboutBut):
-@@ -152,14 +152,14 @@
-                 gaps = 0
-                 i = 0
-                 for element in self.db:
--                    oldPath = "pictures/" + str(i) + ".png"
-+                    oldPath = "/usr/local/share/photostory/pictures/" + str(i) + ".png"
-                     if not os.path.exists(oldPath):
-                         gaps += 1
-                         i += 1
--                    oldPath = "pictures/" + str(i) + ".png"
-+                    oldPath = "/usr/local/share/photostory/pictures/" + str(i) + ".png"
-                     if os.path.exists(oldPath):
-                         key = getKey(self.db, oldPath)
--                        newPath = "pictures/" + str(i-gaps) + ".png"
-+                        newPath = "/usr/local/share/photostory/pictures/" + str(i-gaps) + ".png"
-                         os.rename(oldPath, newPath)
-                         self.db[key] = newPath
-                     i += 1
-@@ -196,7 +196,7 @@
+--- photostory	2010-08-16 17:23:41.744783667 +0100
++++ photostory	2010-08-16 17:29:36.963710900 +0100
+@@ -211,7 +211,7 @@
          win.set_default_size(900, 600)
          win.set_resizable(False)
          win.set_title("Photostory")
--        win.set_icon_from_file("data/photostory.svg")
+-        win.set_icon_from_file("photostory.svg")
 +        win.set_icon_from_file("/usr/local/share/photostory/data/photostory.svg")
          movie = gtk.DrawingArea()
          hbox = gtk.HBox(homogeneous=False, spacing=3)

=== modified file 'photostory'
--- photostory	2010-08-15 12:59:17 +0000
+++ photostory	2010-08-19 11:52:40 +0000
@@ -25,9 +25,24 @@
         self.movPath = None
         self.adj = gtk.Adjustment(5, 1, 10, 1)
         self.pic=None
-        self.db = cPickle.load(open('data/db', 'rb'))
-        self.ind = int(cPickle.load(open('data/num', 'rb')))
-        todayPicName = "pictures/" + str(self.ind) + ".png"
+
+        # 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'))
+
+        # If the `~/.photostory/db` pickle doesn't exist, create it:
+        if not os.path.isfile(os.path.expanduser('~/.photostory/db')):
+            cPickle.dump({}, open(os.path.expanduser('~/.photostory/db'), 'w'))
+
+        # If the `~/.photostory/num` pickle doesn't exist, create it:
+        if not os.path.isfile(os.path.expanduser('~/.photostory/num')):
+            cPickle.dump(0, open(os.path.expanduser('~/.photostory/num'), 'w'))
+
+        # Load the `db` and `num` pickles:
+        self.db = cPickle.load(open(os.path.expanduser('~/.photostory/db'), 'rb'))
+        self.ind = int(cPickle.load(open(os.path.expanduser('~/.photostory/num'), 'rb')))
+
+        todayPicName = os.path.expanduser('~/.photostory/photos/') + str(self.ind) + ".png"
         todayDate = None
 
         def chooseDay(cal):
@@ -37,14 +52,14 @@
         def closedown(win):
             print 'ind ' + str(self.ind)
             print 'db' + str(self.db)
-            cPickle.dump(self.db, open('data/db', 'wb'))
-            cPickle.dump(self.ind, open('data/num', 'wb'))
+            cPickle.dump(self.db, open(os.path.expanduser('~/.photostory/db'), 'wb'))
+            cPickle.dump(self.ind, open(os.path.expanduser('~/.photostory/num'), 'wb'))
             gtk.main_quit()
 
         def about(aboutBut):
             dAbout = gtk.AboutDialog()
             dAbout.set_name("Photostory")
-            dAbout.set_comments("Photostory is an application that lets you tell the story of your life in pictures, by taking a snapshot of you each day. You can then make these into a video to share with friends or on the internet.")
+            dAbout.set_comments("Photostory is an application that lets you tell the story of your life in photos, by taking a snapshot of you each day. You can then make these into a video to share with friends or on the internet.")
             dAbout.set_artists(("Josh Brown", ""))
             dAbout.set_authors(("Joel Auterson", "David Turner"))
             dAbout.set_website("http://launchpad.net/photostory")
@@ -67,7 +82,7 @@
 
                 filmPipe = gst.Pipeline("filmPipe")
                 filmSrc = gst.element_factory_make("multifilesrc", "filmSrc")
-                filmSrc.set_property("location", "pictures/%d.png")
+                filmSrc.set_property("location", "photos/%d.png")
                 filmFilt1 = gst.element_factory_make("capsfilter", "filmFilt1")
                 filmCap1 = gst.Caps("image/png,framerate=" + str(self.adj.get_value()) + "/1,pixel-aspect-ratio=1/1")
                 filmFilt1.set_property("caps", filmCap1)
@@ -92,7 +107,7 @@
             movDia.set_resizable(False)
             filmBut.set_sensitive(False)
             movVbox = gtk.VBox(homogeneous=False, spacing=2)
-            movLabel = gtk.Label("Here you can create a video made up of all your pictures. \n\nJust choose a save location and hit 'create'.\n\nRemember, the path must end in '.mp4'.\n")
+            movLabel = gtk.Label("Here you can create a video made up of all your photos. \n\nJust choose a save location and hit 'create'.\n\nRemember, the path must end in '.mp4'.\n")
             movFileButton = gtk.Button(label="Choose a location")
             movButton = gtk.Button(label="Create")
             
@@ -147,19 +162,19 @@
                 os.remove(self.db[date])
                 setPic("")
                 if date == todayDate:
-                    takeBut.set_label("Take today's picture")
+                    takeBut.set_label("Take today's photo")
                     takeBut.set_sensitive(True)
                 gaps = 0
                 i = 0
                 for element in self.db:
-                    oldPath = "pictures/" + str(i) + ".png"
+                    oldPath = os.path.expanduser('~/.photostory/photos/') + str(i) + ".png"
                     if not os.path.exists(oldPath):
                         gaps += 1
                         i += 1
-                    oldPath = "pictures/" + str(i) + ".png"
+                    oldPath = os.path.expanduser('~/.photostory/photos/') + str(i) + ".png"
                     if os.path.exists(oldPath):
                         key = getKey(self.db, oldPath)
-                        newPath = "pictures/" + str(i-gaps) + ".png"
+                        newPath = os.path.expanduser('~/.photostory/photos/') + str(i-gaps) + ".png"
                         os.rename(oldPath, newPath)
                         self.db[key] = newPath
                     i += 1
@@ -173,18 +188,18 @@
             if date in self.db:
                 self.pic = gtk.Image()
                 self.pic.set_from_file(self.db[date])
-                takeBut.set_label("Picture taken for this day.")
+                takeBut.set_label("Photo taken for this day.")
                 takeBut.set_sensitive(False)
             else: 
                 if date == todayDate:
-                    takeBut.set_label("Take today's picture")
+                    takeBut.set_label("Take today's photo")
                     takeBut.set_sensitive(True)
                 else:
-                    takeBut.set_label("Take today's picture")
+                    takeBut.set_label("Take today's photo")
                     takeBut.set_sensitive(False)
                 self.pic = gtk.Label()
                 self.pic.set_justify(gtk.JUSTIFY_CENTER)
-                self.pic.set_markup("<span size='54000'>No Picture\nToday</span>");
+                self.pic.set_markup("<span size='54000'>No Photo\nToday</span>");
                 self.pic.set_size_request(640, 480)
             vbox1.pack_start(self.pic)
             vbox1.pack_start(hbox2)
@@ -196,14 +211,14 @@
         win.set_default_size(900, 600)
         win.set_resizable(False)
         win.set_title("Photostory")
-        win.set_icon_from_file("data/photostory.svg")
+        win.set_icon_from_file("photostory.svg")
         movie = gtk.DrawingArea()
         hbox = gtk.HBox(homogeneous=False, spacing=3)
         vbox1 = gtk.VBox(homogeneous=False)
         vbox2 = gtk.VBox(homogeneous = False)   
         filmBut = gtk.Button(label="Create Film")
         filmBut.connect("clicked", movify)
-        deleteBut = gtk.Button(label="Delete Picture")
+        deleteBut = gtk.Button(label="Delete Photo")
         deleteBut.connect("clicked", deletePic)
         shareBut = gtk.Button(label="Share Video")
         hbox2 = gtk.HBox(homogeneous=True)
@@ -214,7 +229,7 @@
         todayDate = cal.get_date()
         cal.connect("day-selected", chooseDay)
         
-        takeBut = gtk.Button(label="Take today's picture")
+        takeBut = gtk.Button(label="Take today's photo")
         takeBut.connect("clicked", capture)
         
         setPic(todayDate)

=== renamed file 'data/photostory.svg' => 'photostory.svg'
=== removed directory 'pictures'
=== modified file 'setup.py'
--- setup.py	2010-07-21 16:54:55 +0000
+++ setup.py	2010-08-19 11:52:40 +0000
@@ -2,7 +2,6 @@
 # Installation script for Photostory
 
 from distutils.core import setup
-from glob import glob
 import os
 
 # Change the paths to point to the correct directories:
@@ -21,11 +20,10 @@
                 'video'],
       url='http://launchpad.net/photostory',
       license='GNU GPL v3',
-      data_files=[ # FIXME: Create empty 'pictures' directory.
+      data_files=[
                   ('share/bin', ['photostory']),
-                  ('share/photostory/data', glob('data/*')),
                   ('share/applications/', ['photostory.desktop']),
-                  ('share/icons/hicolor/scalable/apps', ['data/photostory.svg']),
+                  ('share/icons/hicolor/scalable/apps', ['photostory.svg']),
                  ],
       requires=['gst', 'gtk2']
      )