Merge lp:~botevmg/unity-mail/gmailThread into lp:~mitya57/unity-mail/unity-mail

[Alex Botev]

Feature added: So far if you edit the unity-mail.conf and add Inbox[] url when you click on a message it opens the mail inbox. For gmail it is possible to directly open the message thread, which is what I added. Might be a bit clumsy solution, but works great for me.

[Dmitry Shachnev (mitya57)]

Thanks! In general looks good, but I will be able to test/merge it only next week.

[lp:~botevmg/unity-mail/gmailThread]

472. By Alex Botev on 2015-02-17

Change _ to temp as it is in fact used for gettext

[Dmitry Shachnev (mitya57)]

I have now merged your branch with some changes/simplifications. Thanks a lot again!

=== modified file 'UnityMail/application.py'
--- UnityMail/application.py	2014-05-05 12:08:00 +0000
+++ UnityMail/application.py	2015-02-17 06:12:02 +0000
@@ -85,7 +85,7 @@
 class Message(object):
 	"""Message object"""
 	def __init__(self, account_id, account_position, title, folder, message_id,
-		         timestamp):
+		         timestamp, thread_id=None):
 		self.is_active = True
 		self.account_id = account_id
 		self.account_position = account_position
@@ -93,6 +93,7 @@
 		self.folder = folder
 		self.message_id = message_id
 		self.timestamp = timestamp
+		self.thread_id = thread_id	
 
 class UnityMail(object):
 	"""Main Unity Mail Application"""
@@ -165,7 +166,7 @@
 			if message.message_id == sourceid:
 				urlid = self.get_urlid(message.account_id)
 				if urlid:
-					open_url_or_command(urlid)
+					open_url_or_command(name=urlid, thread=message.thread_id)
 				else:
 					self.mark_message_as_read(message)
 				if message.is_active and with_unity:
@@ -377,6 +378,14 @@
 		for m in ui:
 			signal.alarm(3)
 			typ, msg_data = self.mail_client[cn].fetch(m, '(BODY.PEEK[HEADER])')
+			thread_id = None
+			if "gmail" in self.login[cn]:
+				try:
+					temp, thread_id = self.mail_client[cn].fetch(m, '(X-GM-THRID X-GM-MSGID)')
+					thread_id = bytes.decode(thread_id[0])
+					thread_id = hex(int(thread_id[thread_id.index('X-GM-THRID')+10:thread_id.index('X-GM-MSGID')].strip()))[2:]
+				except Exception:
+					thread_id = None
 			msg = None
 			for response_part in msg_data:
 				if isinstance(response_part, tuple):
@@ -416,7 +425,7 @@
 						sender = sender[1:pos+1]+sender[pos+2:]
 				ilabel = subj if subj else _('No subject')
 				message = Message(account_id=cn, account_position=m, title=ilabel,
-					folder=folder_name, message_id=message_id, timestamp=timestamp)
+					folder=folder_name, message_id=message_id, timestamp=timestamp, thread_id=thread_id)
 				self.unread_messages.append(message)
 				if self.enable_notifications:
 					self.notifications_queue.append((sender, subj, cn))
 
=== modified file 'UnityMail/config.py'
--- UnityMail/config.py	2014-05-05 12:08:00 +0000
+++ UnityMail/config.py	2015-02-17 06:12:02 +0000
@@ -57,13 +57,17 @@
   'Inbox': 'https://mail.google.com/mail/#inbox',
    'Sent': 'https://mail.google.com/mail/#sent' }
 
-def open_url_or_command(name):
+def open_url_or_command(name, thread=None):
 	config = ConfigFile(config_file_path)
 	if config.has_option('URLs', name):
 		url = config.get('URLs', name)
 		if url.startswith('Exec:'):
 			subprocess.call(url[5:], shell=True)
 		else:
+			if thread:
+				if url[-1] != '/':
+					thread = '/' + thread
+				url = url + thread
 			webbrowser.open(url)
 	else:
 		try:
 
=== modified file 'unity-mail'
--- unity-mail	2012-08-13 10:15:00 +0000
+++ unity-mail	2015-02-17 06:12:02 +0000
@@ -1,9 +1,21 @@
 #!/usr/bin/python3
-# Unity Mail
+# Unity Mail, QuickList URL processor
 # Author: Dmitry Shachnev <[e-mail]>
 # License: GNU GPL 3 or higher; http://www.gnu.org/licenses/gpl.html
 
-from UnityMail.application import UnityMail
-
-if __name__ == '__main__':
-	UnityMail()
+import sys
+import subprocess
+
+from os.path import exists
+from UnityMail.config import config_dir, open_url_or_command, print_names
+
+if (exists('/usr/share/unity-mail/unity-mail-autostart.desktop') and
+not exists(config_dir+'/autostart/unity-mail-autostart.desktop')):
+	# First run of Unity Mail, open um-config
+	subprocess.call('um-config')
+elif len(sys.argv) > 1:
+	open_url_or_command(sys.argv[1])
+else:
+	print('Error: please specify URL name.')
+	print_names()
+	sys.exit(1)