diff --git a/src/controller/posts.py b/src/controller/posts.py index a5e47f1..b5f26b8 100644 --- a/src/controller/posts.py +++ b/src/controller/posts.py @@ -43,10 +43,10 @@ class postController(object): self.dialog.set_title(title) message = u"" if self.post.has_key("text"): - message = self.post["text"] + message = utils.clean_text(self.post["text"]) if self.post.has_key("attachment"): print self.post["attachment"].keys() - message = message+session.add_attachment(self.post["attachment"]) + message = message+session.add_attachment(self.post["attachment"]) self.dialog.set_post(message) def load_all_components(self): diff --git a/src/sessionmanager/session.py b/src/sessionmanager/session.py index 444f336..f90d496 100644 --- a/src/sessionmanager/session.py +++ b/src/sessionmanager/session.py @@ -51,9 +51,9 @@ def add_text(status): message = "" if status.has_key("text"): if len(status["text"]) < 140: - message = status["text"] + message = utils.clean_text(status["text"]) else: - message = status["text"][:139] + message = utils.clean_text(status["text"][:139]) return message def compose_new(status, session): @@ -88,7 +88,6 @@ def compose_status(status, session): created_at = original_date.humanize(locale=languageHandler.getLanguage()) if status.has_key("copy_owner_id"): user = _(u"{0} has shared the {1}'s post").format(user, session.get_user_name(status["copy_owner_id"])) - print status.keys() if status["post_type"] == "post" or status["post_type"] == "copy": message += add_text(status) if status.has_key("attachment") and len(status["attachment"]) > 0: diff --git a/src/utils.py b/src/utils.py index 4cbd8f7..6c27848 100644 --- a/src/utils.py +++ b/src/utils.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +""" Some utilities. I no have idea how I should put these, so...""" import os import requests import re @@ -50,4 +51,9 @@ def download_file(url, local_filename, window): msg = _(u"Downloading {0} ({1}%)").format(os.path.basename(local_filename), done) window.change_status(msg) window.change_status(_(u"Ready")) - return local_filename \ No newline at end of file + return local_filename + +def clean_text(text): + """ Replaces all HTML entities and put the plain text equivalent if it's possible.""" + text = text.replace("
", "\n") + return text \ No newline at end of file