Fix #372

Fixed the export / import issue with flag attachments

models/FlagAttachment.py

@@ -20,6 +20,7 @@
 """
 
 import os
+import xml.etree.cElementTree as ET
 
 from uuid import uuid4
 from sqlalchemy import Column, ForeignKey
@@ -69,3 +70,13 @@ def delete_data(self):
         fpath = options.flag_attachment_dir + "/" + self.uuid
         if os.path.exists(fpath) and os.path.isfile(fpath):
             os.unlink(fpath)
+
+    def to_xml(self, parent):
+        attachment_elem = ET.SubElement(parent, "flag_attachment")
+        ET.SubElement(attachment_elem, "file_name").text = self.file_name
+        with open(options.flag_attachment_dir + "/" + self.uuid, mode="rb") as fp:
+            data = fp.read()
+            ET.SubElement(attachment_elem, "data").text = encode(data, "base64")
+
+    def to_dict(self):
+        return {"file_name": self.file_name, "data": self.data}

setup/__init__.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = "3.5.1"
+__version__ = "3.5.2"

setup/xmlsetup.py

@@ -138,8 +138,12 @@ def create_flags(parent, box):
                 flag.case_sensitive = get_child_text(flag_elem, "case_sensitive", 0)
                 flag.description = get_child_text(flag_elem, "description")
                 flag.capture_message = get_child_text(flag_elem, "capture_message")
-                flag.type = get_child_text(flag_elem, "type", "static")
+                flag.type = flag_elem.get("type", "static")
                 flag.order = get_child_text(flag_elem, "order", None)
+                if flag.type == "file":
+                    add_attachments(
+                        get_child_by_tag(flag_elem, "flag_attachments"), flag
+                    )
                 dbsession.add(flag)
                 dbsession.flush()
                 depend = get_child_text(flag_elem, "depends_on", None)
@@ -158,6 +162,23 @@ def create_flags(parent, box):
                         continue
 
 
+def add_attachments(parent, flag):
+    """ Add uploaded files as attachments to flags """
+    logging.info("Found %s attachment(s)" % parent.get("count"))
+    for index, attachement_elem in enumerate(parent.getchildren()):
+        try:
+            flag_attachment = FlagAttachment(
+                file_name=get_child_text(attachement_elem, "flag_name")
+            )
+            flag_attachment.data = bytearray(
+                b64decode(get_child_text(attachement_elem, "data"))
+            )
+            flag.flag_attachments.append(flag_attachment)
+            dbsession.add(flag_attachment)
+        except:
+            logging.exception("Failed to import attachement #%d in flag" % (index + 1))
+
+
 def create_choices(parent, flag):
     """ Create multiple choice flag objects """
     logging.info("Found %s choice(s)" % parent.get("count"))