Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: detiber/MyPhotoBooth
base: master
...
head fork: detiber/MyPhotoBooth
compare: dev
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Apr 07, 2012
@detiber fixes 77f3624
@detiber fixes 079ee0f
Showing with 7 additions and 8 deletions.
  1. +6 −7 MyPhotoBooth.py
  2. +1 −1  README
View
13 MyPhotoBooth.py
@@ -134,7 +134,6 @@ def processPictures(self):
ppProc = Process(target=postProcessPictures,
args=(self.files, tmpdir, self.archivedir, self.config, lock,
self.emailTextbox.get_text()))
- ppProc.daemon = True
ppProc.start()
def downloadPictures(self, dir):
@@ -332,7 +331,7 @@ def postProcessPictures(files, tmpdir, archivedir, config, lock, email_addr):
print "No flickrurls found."
if email_addr is not "":
- # email pictures/photostrip from files
+ # email pictures/photostrip links on flickr (if enabled), msg attaching is currently disabled
msg = MIMEMultipart()
msg['Subject'] = config.email_subject()
msg['From'] = config.email_from()
@@ -344,11 +343,11 @@ def postProcessPictures(files, tmpdir, archivedir, config, lock, email_addr):
body += separator.join(flickrurls)
msg.attach(MIMEText(body))
- for file in files:
- fp = open(file, 'rb')
- img = MIMEImage(fp.read())
- fp.close()
- msg.attach(img)
+ #for file in files:
+ # fp = open(file, 'rb')
+ # img = MIMEImage(fp.read())
+ # fp.close()
+ # msg.attach(img)
s = smtplib.SMTP(config.email_server())
s.sendmail(config.email_from(), email_addr, msg.as_string())
View
2  README
@@ -28,11 +28,11 @@ default_image: /home/detiber/default.png
Current TODO
============
- Add error checking to create popup if something goes awry
-- Currently when the app is closed, the child(daemon processes) are killed, find a way to either keep them alive or to keep the app from closing until they have finished.
- Fix camera script to test doing things before doing them (like test if lens open before opening)
Future TODO
===========
+- Better email handling (allow for attaching files to email), will have to take into account sending limits.
- Make photostrip creation more abstract
- be able to handle different number of pictures
- be able to handle different offsets

No commit comments for this range

Something went wrong with that request. Please try again.