+ else:
+ # This is a regular file, not in the db yet. Add it.
+ print "This file needs to be added %s" % (absfile)
+ (msg, status) = db.add_message(absfile)
+ # We increases 'added', even on dupe messages. If it is a moved
+ # message, we will deduct it later and increase 'moved' instead
+ added += 1
+
+ if status == STATUS.DUPLICATE_MESSAGE_ID:
+ print "Added msg was in the db"
+ else:
+ print "New message."
+
+ # Finally a list of files (not folders) in the database,
+ # but not the filesystem
+ for db_file in (db_files - fs_files):
+ absfile = os.path.normpath(os.path.join(db_dir.path, db_file))
+
+ # remove a mail message from the db
+ print ("%s is not on the fs anymore. Delete" % absfile)
+ status = db.remove_message(absfile)
+
+ if status == STATUS.SUCCESS:
+ # we just deleted the last reference, so this was a remove
+ removed += 1
+ sys.stderr.write("SUCCESS %d %s %s.\n" %
+ (status, STATUS.status2str(status), absfile))
+ elif status == STATUS.DUPLICATE_MESSAGE_ID:
+ # The filename exists already somewhere else, so this is a move
+ moved += 1
+ added -= 1
+ sys.stderr.write("DUPE %d %s %s.\n" %
+ (status, STATUS.status2str(status), absfile))
+ else:
+ # This should not occur
+ sys.stderr.write("This should not occur %d %s %s.\n" %
+ (status, STATUS.status2str(status), absfile))
+
+ # list of folders in the filesystem. Just descend into dirs
+ for fs_file in fs_files:
+ absfile = os.path.normpath(os.path.join(db_dir.path, fs_file))
+ if os.path.isdir(absfile):
+ # This is a directory. Remove it from the db_folder list.
+ # All remaining db_folders at the end will be not present
+ # on the file system.
+ db_folders.remove(fs_file)
+ if fs_file in ['.notmuch','tmp','.']:
+ continue
+ new = self._add_new_files_recursively(absfile, db)
+ added += new[0]
+ moved += new[0]
+ removed += new[0]
+
+ # we are not interested in anything but directories here
+ #TODO: All remaining elements of db_folders are not in the filesystem
+ #delete those
+
+ return added, moved, removed
+ #Read the mtime of a directory from the filesystem
+ #
+ #* Call :meth:`Database.add_message` for all mail files in
+ # the directory
+
+ #* Call notmuch_directory_set_mtime with the mtime read from the
+ # filesystem. Then, when wanting to check for updates to the
+ # directory in the future, the client can call :meth:`get_mtime`
+ # and know that it only needs to add files if the mtime of the
+ # directory and files are newer than the stored timestamp.
+
+ def get_user_email_addresses(self):
+ """ Reads a user's notmuch config and returns his email addresses as
+ list (name, primary_address, other_address1,...)"""
+
+ #read the config file
+ config = self._get_user_notmuch_config()
+
+ conf = {'name': '', 'primary_email': ''}
+ for entry in conf:
+ if config.has_option('user', entry):
+ conf[entry] = config.get('user', entry)
+
+ if config.has_option('user','other_email'):
+ other = config.get('user','other_email')
+ other = [mail.strip() for mail in other.split(';') if mail]
+ else:
+ other = []
+ # for being compatible. It would be nicer to return a dict.
+ return conf.keys() + other
+
+ def quote_msg_body(self, oldbody ,date, from_address):
+ """Transform a mail body into a quoted text,
+ starting with On foo, bar wrote:
+
+ :param body: a str with a mail body
+ :returns: The new payload of the email.message()
+ """
+
+ # we get handed a string, wrap it in a file-like object
+ oldbody = StringIO(oldbody)
+ newbody = StringIO()
+
+ newbody.write("On %s, %s wrote:\n" % (date, from_address))
+
+ for line in oldbody:
+ newbody.write("> " + line)
+
+ return newbody.getvalue()
+
+ def format_reply(self, msgs):
+ """Gets handed Messages() and displays the reply to them
+
+ This is pretty ugly and hacky. It tries to mimic the "real"
+ notmuch output as much as it can to pass the test suite. It
+ could deserve a healthy bit of love. It is also buggy because
+ it returns after the first message it has handled."""
+
+ for msg in msgs:
+ f = open(msg.get_filename(), "r")
+ reply = email.message_from_file(f)
+
+ # handle the easy non-multipart case:
+ if not reply.is_multipart():
+ reply.set_payload(self.quote_msg_body(reply.get_payload(),
+ reply['date'], reply['from']))
+ else:
+ # handle the tricky multipart case
+ deleted = ""
+ """A string describing which nontext attachements
+ that have been deleted"""
+ delpayloads = []
+ """A list of payload indices to be deleted"""
+ payloads = reply.get_payload()
+
+ for (num, part) in enumerate(payloads):
+ mime_main = part.get_content_maintype()
+ if mime_main not in ['multipart', 'message', 'text']:
+ deleted += "Non-text part: %s\n" % (part.get_content_type())
+ payloads[num].set_payload("Non-text part: %s" %
+ (part.get_content_type()))
+ payloads[num].set_type('text/plain')
+ delpayloads.append(num)
+ elif mime_main == 'text':
+ payloads[num].set_payload(self.quote_msg_body(
+ payloads[num].get_payload(),
+ reply['date'], reply['from']))
+ else:
+ # TODO handle deeply nested multipart messages
+ sys.stderr.write ("FIXME: Ignoring multipart part. Handle me\n")
+ # Delete those payloads that we don't need anymore
+ for item in reversed(sorted(delpayloads)):
+ del payloads[item]
+
+ # Back to single- and multipart handling
+ my_addresses = self.get_user_email_addresses()
+ used_address = None
+ # filter our email addresses from all to: cc: and bcc: fields
+ # if we find one of "my" addresses being used,
+ # it is stored in used_address
+ for header in ['To', 'CC', 'Bcc']:
+ if not header in reply:
+ #only handle fields that exist
+ continue
+ addresses = email.utils.getaddresses(reply.get_all(header, []))
+ purged_addr = []
+ for (name, mail) in addresses:
+ if mail in my_addresses[1:]:
+ used_address = email.utils.formataddr(
+ (my_addresses[0], mail))
+ else:
+ purged_addr.append(email.utils.formataddr((name, mail)))
+
+ if purged_addr:
+ reply.replace_header(header, ", ".join(purged_addr))
+ else:
+ # we deleted all addresses, delete the header
+ del reply[header]
+
+ # Use our primary email address to the From
+ # (save original from line, we still need it)
+ new_to = reply['From']
+ if used_address:
+ reply['From'] = used_address
+ else:
+ email.utils.formataddr((my_addresses[0], my_addresses[1]))
+
+ reply['Subject'] = 'Re: ' + reply['Subject']
+
+ # Calculate our new To: field
+ # add all remaining original 'To' addresses
+ if 'To' in reply:
+ new_to += ", " + reply['To']
+ reply.add_header('To', new_to)
+
+ # Add our primary email address to the BCC
+ new_bcc = my_addresses[1]
+ if 'Bcc' in reply:
+ new_bcc += ', ' + reply['Bcc']
+ reply['Bcc'] = new_bcc
+
+ # Set replies 'In-Reply-To' header to original's Message-ID
+ if 'Message-ID' in reply:
+ reply['In-Reply-To'] = reply['Message-ID']
+
+ #Add original's Message-ID to replies 'References' header.
+ if 'References' in reply:
+ reply['References'] = ' '.join([reply['References'], reply['Message-ID']])
+ else:
+ reply['References'] = reply['Message-ID']
+
+ # Delete the original Message-ID.
+ del(reply['Message-ID'])
+
+ # filter all existing headers but a few and delete them from 'reply'
+ delheaders = filter(lambda x: x not in ['From', 'To', 'Subject', 'CC',
+ 'Bcc', 'In-Reply-To',
+ 'References', 'Content-Type'],
+ reply.keys())
+ map(reply.__delitem__, delheaders)
+
+ # TODO: OUCH, we return after the first msg we have handled rather than
+ # handle all of them
+ # return resulting message without Unixfrom
+ return reply.as_string(False)
+
+
+def main():
+ # Handle command line options
+ #------------------------------------
+ # No option given, print USAGE and exit
+ if len(sys.argv) == 1:
+ Notmuch().cmd_usage()
+ #------------------------------------
+ elif sys.argv[1] == 'setup':