Merge branch 'development'

Author: davidjosearaujo

.gitignore

@@ -1 +1,3 @@
 .github
+build
+*.egg-info

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) [2022] [David José Araújo Ferreira]
+Copyright (c) [2022-2023] [David José Araújo Ferreira]
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

capparser/__init__.py

@@ -0,0 +1,3 @@
+from .element import *
+from .enums import *
+from .capparser import *

capparser/capparser.py

@@ -1,5 +1,5 @@
-import element
-import enums
+from . import element
+from . import enums
 import xml.etree.ElementTree as ET
 import inspect
 
@@ -55,9 +55,10 @@ def writeAlertToFile(alert, filePath):
     with open(filePath, "wb") as files:
         tree.write(files)
 
-def _recursiveDeparser(obj, outputFilePath=None):
+def _recursiveDeparser(obj):
     root = ET.Element(str(obj))
     attrs = _filterOrderAttributes(inspect.getmembers(obj))
+    
     for attr in attrs:
         if attr[0] == "xmlns":
             root.set(attr[0], attr[1][0])
@@ -67,13 +68,14 @@ def _recursiveDeparser(obj, outputFilePath=None):
                     root.append(_recursiveDeparser(item))
                 else:
                     child = ET.SubElement(root, attr[0])
-                    child.text = item
+                    child.text = str(item)
         else:
             if isinstance(attr[1][0], element.Alert) or isinstance(attr[1][0], element.Info) or isinstance(attr[1][0], element.EventCode) or isinstance(attr[1][0], element.Parameter) or isinstance(attr[1][0], element.Resource) or isinstance(attr[1][0], element.Area) or isinstance(attr[1][0], element.Geocode):
                 root.append(_recursiveDeparser(attr[1][0]))
             else:
                 child = ET.SubElement(root, attr[0])
-                child.text = attr[1][0]
+                child.text = str(attr[1][0])
+                
     return root
 
 

capparser/element.py

@@ -1,5 +1,5 @@
+from . import enums
 from datetime import datetime, timezone
-import enums
 import random
 import re
 
@@ -17,7 +17,7 @@ def __init__(self, identifier=None, sender="CAPParser", sent=None, status=enums.
             raise Exception("Identifier must be a string")
         if not isinstance(sender, str):
             raise Exception("Sender must be a string")
-        if not isinstance(sent, datetime) and sent != None:
+        if not isinstance(sent, str) and sent != None:
             raise Exception("Sent must be a datetime object")
         if not isinstance(status, enums.Status):
             raise Exception("Status must be a enums.Status object")
@@ -146,7 +146,7 @@ def addAddress(self, address):
             self.addresses = ("", 9)
 
         if ' ' in address:
-            address = "\"" + address.strips() + "\""
+            address = "\"" + address.strip() + "\""
 
         if "\"CAP Default Address\"" in self.addresses[0]:
             self.addresses = (self.addresses[0].replace("\"CAP Default Address\"", ""),9)
@@ -292,7 +292,7 @@ def __init__(self, category=[enums.Category.Other], event="CAPParser Default Eve
             raise Exception("Certainty must be an enums.Certainty object")
 
         self.language = (None, 0)
-        self.category = ([], 1)  
+        self.category = (category, 1)  
         self.event = (event, 2)  
         self.responseType = ([], 3)
         self.urgency = (urgency, 4)    

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="capparser",
-    version="1.0.5",
+    version="2.0.0",
     author="David Araújo",
     author_email="david2araujo5@gmail.com",
     description="Common Alerting Protocol (CAP) parser",