1.1 --- a/scripts/getfiles.py Tue Jan 07 23:47:15 2014 +0100
1.2 +++ b/scripts/getfiles.py Tue Jan 07 23:48:32 2014 +0100
1.3 @@ -1,4 +1,10 @@
1.4 -#!/usr/bin/env python
1.5 +# -*- coding: iso-8859-1 -*-
1.6 +"""
1.7 + getfiles - Obtain files using MoinMessage
1.8 +
1.9 + @copyright: 2013, 2014 by Paul Boddie <paul@boddie.org.uk>
1.10 + @license: GNU GPL (v2 or later), see COPYING.txt for details.
1.11 +"""
1.12
1.13 from MoinMessage import *
1.14 from email.mime.application import MIMEApplication
2.1 --- a/scripts/sendfiles.py Tue Jan 07 23:47:15 2014 +0100
2.2 +++ b/scripts/sendfiles.py Tue Jan 07 23:48:32 2014 +0100
2.3 @@ -1,6 +1,12 @@
2.4 -#!/usr/bin/env python
2.5 +# -*- coding: iso-8859-1 -*-
2.6 +"""
2.7 + sendfiles - Send files using MoinMessage
2.8
2.9 -from MoinMessage import Message, GPG, sendMessage
2.10 + @copyright: 2013, 2014 by Paul Boddie <paul@boddie.org.uk>
2.11 + @license: GNU GPL (v2 or later), see COPYING.txt for details.
2.12 +"""
2.13 +
2.14 +from MoinMessage import Message, GPG, sendMessage, timestamp
2.15 from email.mime.application import MIMEApplication
2.16 from os.path import split
2.17 import sys
2.18 @@ -40,14 +46,18 @@
2.19
2.20 # Get the e-mail message itself.
2.21
2.22 - message = message.get_payload()
2.23 + email_message = message.get_payload()
2.24
2.25 # Encrypt, sign and send the message.
2.26
2.27 gpg = GPG()
2.28 - message = gpg.encryptMessage(message, recipient)
2.29 - message = gpg.signMessage(message, signer)
2.30 - resp = sendMessage(message, url)
2.31 + encrypted_message = gpg.encryptMessage(email_message, recipient)
2.32 +
2.33 + timestamp(encrypted_message)
2.34 + encrypted_message["Update-Action"] = "store"
2.35 + message_to_send = gpg.signMessage(encrypted_message, signer)
2.36 +
2.37 + resp = sendMessage(message_to_send, url)
2.38
2.39 print resp
2.40