Merge lp:~sazius/heybuddy/minor_fixes into lp:heybuddy

[Mats Sjöberg]

When your StatusNet instance has a shorter character limit than someone posting remotely the posts will get truncated. This is very annoying. These posts, however contain an "attachment" in the XML which is an URL to the full text. This patch makes heybuddy fetch that for truncated posts.

(A minor fix is also that an URL in parentheses, e.g. "(http://foo/bar)" will no longer have the ")" erroneously included in the link.)

[lp:~sazius/heybuddy/minor_fixes]

349. By Mats Sjöberg on 2013-08-17

Added a check if attachment size is a digit to avoid annoying error messages.

[jezra (jezra)]

Uh oh, this sounds like a "feature". Because this requires adding a new module and making an extra http request, there needs to be a preference option to enable this (it should be disabled by default).

[Mats Sjöberg (sazius)]

> Uh oh, this sounds like a "feature". Because this requires adding a new module
> and making an extra http request, there needs to be a preference option to
> enable this (it should be disabled by default).

You might argue if it is _really_ a new "feature" or not... :-) But yeah, maybe it's best to have it a preference option since it does add HTTP traffic. I'll add that and make a new merge request when done.

[lp:~sazius/heybuddy/minor_fixes]

350. By Mats Sjöberg on 2013-08-18

Removed debugging output.

351. By Mats Sjöberg <email address hidden> on 2013-08-31

Dent expansion now with 100% more configurability!

[Mats Sjöberg (sazius)]

OK, I now added a config check box, disabled by default. Also please note, that I'm not a Python and even less PyGTK expert so the code is far from perfect.

review: Needs Resubmitting

[jezra (jezra)]

Did you have a tasty beverage while coding?

[Mats Sjöberg (sazius)]

Yes, somewhat unusually I was drinking wine. Now I'm having a local ESB :-)

=== modified file 'Communicator.py'
--- Communicator.py	2012-09-08 16:34:36 +0000
+++ Communicator.py	2013-08-31 16:29:00 +0000
@@ -113,6 +113,10 @@
 			gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 							 (gobject.TYPE_STRING,gobject.TYPE_STRING,)
 			),
+                'attachment-received': (
+			gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+							 (gobject.TYPE_STRING,gobject.TYPE_STRING,)
+			),
 	}
 	
 	def __init__(self, app_name=None, cert_file=None, apiroot="http://identi.ca/api", version=""):
@@ -422,3 +426,6 @@
 		data = {'url':longurl, 'format':'simple'}
 		url = "http://is.gd/create.php?" + urlencode(data)  
 		self.process_httprequest(url, 'shortened_url', longurl, True) 
+
+        def fetch_attachment(self, url):
+                self.process_httprequest(url, 'attachment-received', url, True)

=== modified file 'Dent.py'
--- Dent.py	2012-07-16 22:36:42 +0000
+++ Dent.py	2013-08-31 16:29:00 +0000
@@ -84,6 +84,7 @@
 		vbox = gtk.VBox(False,0)
 		#vbox.set_border_width(5)
 		user_box.pack_start(vbox,True,True,0)
+
 		self.text_label = gtk.Label()		
 		self.text_label.set_markup( data['markup'] )
 		self.text_label.set_alignment(0,0)
@@ -214,6 +215,9 @@
 		
 		vbox.pack_start(hbox1,False,False,0)
 		self.add(user_box)
+
+        def update_text(self, text):
+		self.text_label.set_markup(text)
 	
 	def event_box_realized(self,widget):
 		hand2 = gtk.gdk.Cursor(gtk.gdk.HAND2)

=== modified file 'SettingsPage.py'
--- SettingsPage.py	2012-07-16 22:36:42 +0000
+++ SettingsPage.py	2013-08-31 16:29:00 +0000
@@ -21,6 +21,10 @@
 			gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 						 (gobject.TYPE_BOOLEAN,)
 		),
+                'option-expand-long-dents': (
+                        gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+                                                 (gobject.TYPE_BOOLEAN,)
+                ),
 		'option-ctrl-enter': (
 			gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 						 (gobject.TYPE_BOOLEAN,)
@@ -148,6 +152,9 @@
 		
 		self.api_retweet = gtk.CheckButton(_("Use retweet API instead of default redent style"))
 		self.api_retweet.connect("toggled", self.option_toggled,'option-api-retweet')
+
+                self.expand_long_dents = gtk.CheckButton(_("Expand too long dents from remote servers"))
+                self.expand_long_dents.connect("toggled", self.option_toggled, 'option-expand-long-dents')
 		
 		self.enable_notifications = gtk.CheckButton(_("Enable notifications"))
 		self.enable_notifications.connect("toggled", self.option_toggled,'option-notifications')
@@ -178,6 +185,7 @@
 		options_box.pack_start(self.disable_https,False,False,0)
 		options_box.pack_start(self.ignore_activity,False,False,0)
 		options_box.pack_start(self.api_retweet,False,False,0)
+                options_box.pack_start(self.expand_long_dents,False,False,0)
 		options_box.pack_start(self.open_fullscreen,False,False,0)
 
 		#does the app have notifications?
@@ -296,6 +304,9 @@
 	def set_api_retweet(self,boolean):
 		self.api_retweet.set_active(boolean)
 
+        def set_expand_long_dents(self,boolean):
+                self.expand_long_dents.set_active(boolean)
+
 	#More Code for notifications			
 	def set_notifications(self,boolean):
 		self.enable_notifications.set_active(boolean)

=== modified file 'XMLProcessor.py'
--- XMLProcessor.py	2012-07-16 22:36:42 +0000
+++ XMLProcessor.py	2013-08-31 16:29:00 +0000
@@ -142,6 +142,29 @@
 		#what server is this shit from?
 		profile_url = self.get_node_text(status,"statusnet:profile_url")
 		dict['profile_url'] = profile_url
+
+                # put attachments in a neat array if there are any
+                attachments = status.getElementsByTagName('attachments')
+                if attachments.length:
+                        enclosures = attachments[0].getElementsByTagName('enclosure')
+                        dict['attachments'] = []
+                        for i in range(enclosures.length):
+                                item = enclosures.item(i)
+                                a = { 'mimetype': item.getAttribute('mimetype'),
+                                      'url': item.getAttribute('url')}
+                                size_str = item.getAttribute('size')
+                                if size_str.isdigit():
+                                        a['size'] = int(size_str)
+                                dict['attachments'].append(a)
+
+                # this should say if dent is truncated... but doesn't
+                #dict['truncated'] = self.get_node_text(status, "truncated")
+                # this is what actually works (fugly hack!)
+                sn_html = self.get_node_text(status, "statusnet:html")
+                dict['truncated'] = False
+                if sn_html.find("class=\"attachment more\" title=\"Show more\"") != -1:
+                        dict['truncated'] = True
+
 		# we should clean the source ( if there is one )
 		if dict['source']!=None:
 			dict['source']=self.re_source_sub.sub( '', dict['source'])

=== modified file 'heybuddy.py'
--- heybuddy.py	2013-01-15 00:33:09 +0000
+++ heybuddy.py	2013-08-31 16:29:00 +0000
@@ -33,6 +33,7 @@
 import re
 import time
 import subprocess
+import HTMLParser
 #this might be on Maemo
 from PlatformSpecific import has_hildon,links_unavailable
 #what are the custom classes that I need?
@@ -137,7 +138,10 @@
 		self.regex_group = re.compile("(^| )!([\w-]+)")
 		self.regex_user=re.compile("(^|[^A-z0-9])@(\w+)")
 		self.regex_just_user=re.compile("@(\w+)")
-		self.regex_url=re.compile("(http[s]?://.*?)(\.$|\. |\s|$)",re.IGNORECASE)
+		self.regex_url=re.compile("(http[s]?://.*?)(\.$|\. |\s|\)|$)",re.IGNORECASE)
+                #regex's for parsing html attachments
+		self.regex_find_body = re.compile("\<body\>(.*)\<\/body\>")
+		self.regex_remove_tags = re.compile('<[^>]*>')
 		#get the initial dents
 		self.initial_dents = self.conf.get('settings','initial_dents',default='20' )
 		self.dent_limit = int(self.initial_dents)*2
@@ -187,12 +191,16 @@
 		self.comm.connect('verify_credentialsXML',self.process_verifycredentialsXML)
 		self.comm.connect('configXML',self.process_configXML)
 		self.comm.connect('shortened_url',self.shortened_url)
+		self.comm.connect('attachment-received',self.attachment_received)
 		#are we disabling https?
 		self.comm.set_disable_https( self.conf.get_bool_option('disable_https') )
 		#create an image cacher thingy
 		self.imagecache = ImageCache()
 		self.imagecache.set_disabled( self.conf.get_bool_option('no_avatars') )
 		self.imagecache.connect('get-widget-image', self.get_widget_image)
+
+                # keep track of dents to notify of updated attachments
+		self.dent_map = {}
 	
 		#Create notify-er if has pynotify
 		if has_pynotify:
@@ -339,6 +347,8 @@
 		self.settingspage.set_no_avatars( self.options['no_avatar'] )
 		self.options['api_retweet'] = self.conf.get_bool_option('api_retweet')
 		self.settingspage.set_api_retweet( self.options['api_retweet']	)
+                self.options['expand_long_dents'] = self.conf.get_bool_option('expand_long_dents')
+                self.settingspage.set_expand_long_dents( self.options['expand_long_dents'] )
 		self.options['notifications']= self.conf.get_bool_option('notifications')
 		self.settingspage.set_notifications( self.options['notifications'] )
 		self.options['notify_replies']= self.conf.get_bool_option('notify_replies')
@@ -355,6 +365,7 @@
 		self.settingspage.connect('option-context-backwards',self.option_changed, 'context_backwards')
 		self.settingspage.connect('option-no-avatars',self.option_changed, 'no_avatars')
 		self.settingspage.connect('option-api-retweet', self.option_changed, 'api_retweet')
+		self.settingspage.connect('option-expand-long-dents', self.option_changed, 'expand_long_dents')
 		self.settingspage.connect('option-notifications',self.option_changed, 'notifications')
 		self.settingspage.connect('option-notify-replies',self.option_changed, 'notify_replies')
 		self.settingspage.connect('option-ignore-activity',self.option_changed, 'ignore_activity')
@@ -822,6 +833,14 @@
 			dent.connect('favorite-clicked',self.favorite_clicked)
 			dent.connect('unfavorite-clicked',self.unfavorite_clicked)
 			dent.connect('open-link',self.open_link)
+
+                        # if dent was truncated, fetch the rest which
+                        # should be in an html attachment
+                        if self.options['expand_long_dents'] and data['truncated'] and 'attachments' in data:
+                                for a in data['attachments']:
+                                        if a['mimetype'] == 'text/html':
+                                                self.fetch_attachment(dent, a['url'])
+
 			if target_page!=self.userpage:
 				#get the image for this dent
 				self.imagecache.add_image_to_widget(data['profile_image_url'],dent)
@@ -990,6 +1009,7 @@
 			if not filtered_status:
 				#get the markup
 				data['markup'] = self.markup_dent_text(data['text'])
+
 				#did this dent connect
 				if not self.connect_dent(data,target_page,is_direct_dent=is_direct):
 					continue
@@ -1365,6 +1385,24 @@
 	
 	def shortened_url(self, widget, url, old_url):
 		self.mainwindow.shortened_url( url, old_url)
+
+        def fetch_attachment(self, dent, url):
+                # if we aren't already fetching that url, then start fetching it
+                if url not in self.dent_map:
+                        self.comm.fetch_attachment(url)
+                        self.dent_map[url] = []
+                # in any case add this dent widget to the list to be notified
+                self.dent_map[url].append(dent)
+
+        def attachment_received(self, widget, html, url):
+                # do some ugly HTML parsing
+                h = HTMLParser.HTMLParser()
+                text = self.regex_remove_tags.sub('', self.regex_find_body.findall(html)[0])
+                text = h.unescape(text)
+                # notify all dent widgets with the updated text
+                if url in self.dent_map:
+                        for dent in self.dent_map.pop(url):
+                                dent.update_text(self.markup_dent_text(text))
 	
 	def remember_credentials(self, widget, remember):
 		self.options['remember_credentials'] = remember