MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

update timestamp comparison method

master
Emmanuelle Vargas-Gonzalez 2019-09-17 11:08:01 -04:00
parent ea0df70806
commit 98ecdf53e3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stix2/environment.py
View File

@ -3,9 +3,11 @@
import copy import copy
import logging import logging
import math import math
import time
from .core import parse as _parse from .core import parse as _parse
from .datastore import CompositeDataSource, DataStoreMixin from .datastore import CompositeDataSource, DataStoreMixin
from .utils import STIXdatetime, parse_into_datetime
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -418,9 +420,12 @@ def _check_property_present(prop, obj1, obj2):
def _partial_timestamp_based(t1, t2, tdelta): def _partial_timestamp_based(t1, t2, tdelta):
from .utils import parse_into_datetime if not isinstance(t1, STIXdatetime):
stix_t1, stix_t2 = parse_into_datetime(t1), parse_into_datetime(t2) t1 = parse_into_datetime(t1)
return 1 - min(abs(stix_t1.timestamp() - stix_t2.timestamp()) / (86400 * tdelta), 1) if not isinstance(t2, STIXdatetime):
t2 = parse_into_datetime(t2)
t1, t2 = time.mktime(t1.timetuple()), time.mktime(t2.timetuple())
return 1 - min(abs(t1 - t2) / (86400 * tdelta), 1)
def _partial_list_based(l1, l2): def _partial_list_based(l1, l2):