wip2

Author: Dimitris Rongotis

openformats/formats/android.py

@@ -19,7 +19,24 @@ class AndroidDumbXml(DumbXml):
     # def __init__(self, source, text_position=0):
     #     super().__init__(source, text_position)
     #     self.text_position = text_position
-    
+    def _find_next_lt(self, start):
+        in_cdata = False
+        for ptr in six.moves.xrange(start, len(self.source)):
+            candidate = self.source[ptr]
+            if in_cdata:
+                if (candidate == ']' and
+                        self.source[ptr:ptr + len("]]>")] == "]]>"):
+                    in_cdata = False
+            else:
+                if candidate == self.LESS_THAN:
+                    # Check against CDATA
+                    if self.source[ptr:ptr + len("<![CDATA[")] == "<![CDATA[":
+                        self._text_position=ptr+len("<![CDATA[")
+                        in_cdata = True
+                    else:
+                        return ptr
+        # We reached the end of the string, lets return accordingly
+        return len(self.source)
 
     @property
     def content(self):
@@ -33,15 +50,10 @@ def content(self):
             return self.text
         if self.content_end is None:
             return None
-       
-        pattern = re.compile(r'!\[CDATA')
-        match = pattern.search(self._text)
-      
-        if match:
-            self._text_position = self._text_position+match.start()+match.end()
-            return self.source[self.text_position:self.content_end-3]
-        else:
-            return self.source[self.text_position:self.content_end]
+        result = self.source[self.text_position:self.content_end]
+        if result.endswith("]]>"):
+            result = self.source[self.text_position:self.content_end-len("]]>")]
+        return result
 
 
 class AndroidHandler(Handler):
@@ -159,16 +171,10 @@ def _handle_string(self, child):
             product,
             child
         )
-        pattern = re.compile(r'!\[CDATA')
-        match = pattern.search(child.content)
+      
         if string is not None:
             # <string>My Text</string>
             #         ^
-           
-        
-            print(string.string)
-            from ipdb import set_trace
-            #set_trace()
             self.transcriber.copy_until(child.text_position)
             self.transcriber.add(string.template_replacement)
             # <string>My Text</string>
@@ -399,12 +405,11 @@ def _get_child_attributes(self, child):
     def compile(self, template, stringset, is_source=True, language_info=None,
                 **kwargs):
         resources_tag_position = template.index(self.PARSE_START)
-
         self.transcriber = Transcriber(template[resources_tag_position:])
         source = self.transcriber.source
 
         parsed = AndroidDumbXml(source)
-
+       
         # Check against 'tools:locale' attribute
         if language_info is not None and 'tools:locale' in parsed.attrib:
             value_position, value = next((
@@ -464,10 +469,23 @@ def _compile_string(self, child):
         It will compile the tag if matching string exists. Otherwise it will
         skip it.
         """
+       
+        def _search_for_cdata(_destination):
+            result = False
+            if len(_destination) > 1:
+                _string = _destination[1]
+                pattern = re.compile(r'!\[CDATA')
+                match = pattern.search(_string)
+                if match:
+                    result= True
+            return result
         if self._should_compile(child):
+           
+            
             self.transcriber.copy_until(child.text_position)
             self.transcriber.add(self.next_string.string)
-            self.transcriber.skip_until(child.content_end)
+            ret = _search_for_cdata(self.transcriber.__dict__['destination'])
+            self.transcriber.skip_until(child.content_end if not ret else child.content_end-len("]]>"))
             self.transcriber.copy_until(child.tail_position)
             self.transcriber.mark_section_start()
             self.transcriber.copy_until(child.end)

openformats/tests/formats/android/files/1_en_cdata.xml

@@ -12,19 +12,18 @@
 from openformats.strings import OpenString
 
 
-class AndroidUnescapedTestCase( unittest.TestCase):
-    handler = AndroidUnescapedHandler()
+class AndroidUnescapedTestCase(CommonFormatTestMixin, unittest.TestCase):
     HANDLER_CLASS = AndroidUnescapedHandler
     TESTFILE_BASE = "openformats/tests/formats/android/files"
 
-    # def setUp(self):
-    #     super(AndroidUnescapedTestCase, self).setUp()
-    #     self.handler = AndroidUnescapedHandler()
+    def setUp(self):
+        super(AndroidUnescapedTestCase, self).setUp()
+        self.handler = AndroidUnescapedHandler()
 
     def test_string(self):
         self.maxDiff = None
         random_key = generate_random_string()
-        uploaded_string = """<![CDATA[<b>Before using Onshape, you must agree to the Terms of Use and Privacy Policy. See Terms of Use below and link to the Privacy Policy <a href = \"https://www.onshape.com/privacy-center/privacy-policy\">here</a>.</b>]]>"""
+        uploaded_string = """&amp; &lt; &gt; \\' \\n \\t \\@ \\? \\" <xliff:g id="1">%1$s</xliff:g> \@ \?"""
         uploaded_openstring = OpenString(random_key, uploaded_string, order=0)
         uploaded_hash = uploaded_openstring.template_replacement
 
@@ -35,12 +34,8 @@ def test_string(self):
         """
         source = source_python_template.format(key=random_key, string=uploaded_string)
         template, stringset = self.handler.parse(source)
-        from icecream import ic
-        ic(template)
-        from ipdb import set_trace
-        #set_trace()
         compiled = self.handler.compile(template, [uploaded_openstring])
-        ic(compiled)
+
         self.assertEqual(
             template,
             source_python_template.format(key=random_key, string=uploaded_hash),
@@ -49,6 +44,46 @@ def test_string(self):
         self.assertEqual(stringset[0].__dict__, uploaded_openstring.__dict__)
         self.assertEqual(compiled, source)
 
+
+    def test_cdata_string(self):
+        self.maxDiff = None
+        random_key = generate_random_string()
+        uploaded_string = """<![CDATA[<b>test</b>]]>"""
+        saved_string = """<b>test</b>"""
+        uploaded_openstring = OpenString(random_key, saved_string, order=0)
+        uploaded_hash = uploaded_openstring.template_replacement
+
+        source_python_template = """
+            <resources>
+                <string name="{key}">{string}</string>
+            </resources>
+        """
+        cdata_source_python_template = """
+            <resources>
+                <string name="{key}"><![CDATA[{string}]]></string>
+            </resources>
+        """
+
+        source = source_python_template.format(key=random_key, string=uploaded_string)
+        template, stringset = self.handler.parse(source)
+       
+        compiled = self.handler.compile(template, [uploaded_openstring])
+        self.assertEqual(
+            template,
+            cdata_source_python_template.format(key=random_key, string=uploaded_hash),
+        )
+        self.assertEqual(len(stringset), 1)
+        self.assertEqual(stringset[0].__dict__, uploaded_openstring.__dict__)
+        self.assertEqual(compiled, source)
+
+    def test_escape(self):
+        rich = '&>"\n\t@? <xliff:g id="1">%1$s &</xliff:g> @ ?'
+        raw = '&amp;&gt;\\"\\n\\t\\@\\? <xliff:g id="1">%1$s &</xliff:g> \\@ \\?'
+
+        self.assertEqual(
+            AndroidUnescapedHandler.escape(rich),
+            raw,
+        )
     def test_escape(self):
         rich = '&>"\n\t@? <xliff:g id="1">%1$s &</xliff:g> @ ?'
         raw = '&amp;&gt;\\"\\n\\t\\@\\? <xliff:g id="1">%1$s &</xliff:g> \\@ \\?'

openformats/tests/formats/android/test_android_unescaped.py

@@ -122,6 +122,9 @@ def test_one_child(self):
             ('<r><a>hello <![CDATA[</a>]]></a></r>',
              '<a>hello <![CDATA[</a>]]></a>', 32, 3, 'a', [], {}, 6,
              'hello <![CDATA[</a>]]>', 32, '', 32),
+            # ('<resource><string name="onshape_edu_plan"><![CDATA[<b>Onshape Education Plan</b>]]></string></resource>',
+            #  '<a>hello <![CDATA[</a>]]></a>', 32, 3, 'a', [], {}, 6,
+            #  'hello <![CDATA[</a>]]>', 32, '', 32),
             ('<r><a>hello world</a> tail</r>', '<a>hello world</a> tail', 26,
              3, 'a', [], {}, 6, 'hello world', 21, ' tail', 26),
             ('<r><a b="c">hello world</a> tail</r>',