GitLab

at 2019-11-03T20:59:27Z

Refactor XHTML event code

- Move xhtml data into additional_data
- Remove xhtml event attribute
- Allows now to store both message and xhtml data in the database
- Always store xhtml data

 

 from nbxmpp.protocol import NodeProcessed

 from nbxmpp.protocol import NS_DATA

+from nbxmpp.protocol import NS_XHTML

 from nbxmpp.structs import StanzaHandler

 from nbxmpp.structs import StanzaIDData

+from nbxmpp.structs import XHTMLData

 from nbxmpp.util import error_factory

 from nbxmpp.const import MessageType

 

         forms = stanza.getTags('x', namespace=NS_DATA)

         if forms:

             properties.forms = forms

-        properties.xhtml = stanza.getXHTML()

+

+        xhtml = stanza.getXHTML()

+        if xhtml is None:

+            return

+

+        if xhtml.getTag('body', namespace=NS_XHTML) is None:

+            log.warning('xhtml without body found')

+            log.warning(stanza)

+            return

+

+        properties.xhtml = XHTMLData(xhtml)

 

     @staticmethod

     def _parse_type(stanza):

 from nbxmpp.protocol import NS_MUC_USER

 from nbxmpp.protocol import NS_MAM_1

 from nbxmpp.protocol import NS_MAM_2

+from nbxmpp.protocol import NS_XHTML

 from nbxmpp.protocol import NodeProcessed

 from nbxmpp.protocol import InvalidFrom

 from nbxmpp.protocol import InvalidStanza

                             archive=stanza.getFrom(),

                             namespace=result.getNamespace(),

                             timestamp=delay_timestamp)

+

+

+def build_xhtml_body(xhtml, xmllang=None):

+    try:

+        if xmllang is not None:

+            body = '<body xmlns="%s" xml:lang="%s">%s</body>' % (

+                NS_XHTML, xmllang, xhtml)

+        else:

+            body = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml)

+    except Exception as error:

+        log.error('Error while building xhtml node: %s', error)

+        return None

+    return body
 from precis_i18n import get_profile

 from nbxmpp.stringprepare import nameprep

 from nbxmpp.simplexml import Node

-from nbxmpp.simplexml import NodeBuilder

 

 def ascii_upper(s):

     return s.upper()

                 payload=payload, timestamp=timestamp, xmlns=xmlns, node=node)

         if body:

             self.setBody(body)

-        if xhtml:

+        if xhtml is not None:

             self.setXHTML(xhtml)

         if subject is not None:

             self.setSubject(subject)

         """

         return self.getTagData('body')

 

-    def getXHTML(self, xmllang=None):

-        """

-        Return serialized xhtml-im element text of the message

-

-        TODO: Returning a DOM could make rendering faster.

-        """

-        xhtml = self.getTag('html', namespace=NS_XHTML_IM)

-        if xhtml:

-            if xmllang:

-                body = xhtml.getTag('body',

-                                    namespace=NS_XHTML,

-                                    attrs={'xml:lang': xmllang})

-            else:

-                body = xhtml.getTag('body', namespace=NS_XHTML)

-            return str(body)

-        return None

+    def getXHTML(self):

+        return self.getTag('html', namespace=NS_XHTML_IM)

 

     def getSubject(self):

         """

         Set the text of the message"""

         self.setTagData('body', val)

 

-    def setXHTML(self, val, xmllang=None):

-        """

-        Sets the xhtml text of the message (XEP-0071). The parameter is the

-        "inner html" to the body.

-        """

-        try:

-            if xmllang:

-                dom = NodeBuilder('<body xmlns="%s" xml:lang="%s">%s</body>' \

-                    % (NS_XHTML, xmllang, val)).getDom()

+    def setXHTML(self, body, add=False):

+        if isinstance(body, str):

+            body = Node(node=body)

+        if add:

+            xhtml = self.getTag('html', namespace=NS_XHTML_IM)

+            if xhtml is not None:

+                xhtml.addChild(node=body)

             else:

-                dom = NodeBuilder('<body xmlns="%s">%s</body>' % (NS_XHTML,

-                    val), 0).getDom()

-            if self.getTag('html'):

-                self.getTag('html').addChild(node=dom)

-            else:

-                self.setTag('html', namespace=NS_XHTML_IM).addChild(node=dom)

-        except Exception as e:

-            print("Error" + str(e))

-            # FIXME: log. we could not set xhtml (parse error, whatever)

+                self.addChild('html', namespace=NS_XHTML_IM, payload=body)

+        else:

+            xhtml_nodes = self.getTags('html', namespace=NS_XHTML_IM)

+            for xhtml in xhtml_nodes:

+                self.delChild(xhtml)

+            self.addChild('html', namespace=NS_XHTML_IM, payload=body)

 

     def setSubject(self, val):

         """

 from nbxmpp.protocol import NS_MUC

 from nbxmpp.protocol import NS_MUC_INFO

 from nbxmpp.protocol import NS_CLIENT

+from nbxmpp.protocol import NS_XHTML

 from nbxmpp.protocol import Protocol

 from nbxmpp.const import MessageType

 from nbxmpp.const import AvatarState

             return self.muc_user.role

         except Exception:

             return None

+

+

+class XHTMLData:

+    def __init__(self, xhtml):

+        self._bodys = {}

+        for body in xhtml.getTags('body', namespace=NS_XHTML):

+            lang = body.getXmlLang()

+            self._bodys[lang] = body

+

+    def get_body(self, pref_lang=None):

+        if pref_lang is not None:

+            body = self._bodys.get(pref_lang)

+            if body is not None:

+                return str(body)

+

+        body = self._bodys.get('en')

+        if body is not None:

+            return str(body)

+

+        body = self._bodys.get(None)

+        if body is not None:

+            return str(body)

+        return str(self._bodys.popitem()[1])

Philipp Hörist pushed to branch master at gajim / python-nbxmpp

Commits:

4 changed files:

Changes: