From dd6840ac65b328529a63fca9cabec2cab640fe10 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 2 Oct 2024 15:36:05 -0400 Subject: [PATCH 1/3] Fix prefix in bookmarkPath No effects were observed on Make-managed files. References: * https://github.com/casework/CASE-Mapping-Python/issues/78 Reported-by: Fabrizio Turchi Signed-off-by: Alex Nelson --- case_mapping/uco/observable.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/case_mapping/uco/observable.py b/case_mapping/uco/observable.py index fd7216a..0090f11 100644 --- a/case_mapping/uco/observable.py +++ b/case_mapping/uco/observable.py @@ -662,7 +662,7 @@ def __init__( self, accessedTime=None, application_id=None, - bookmarkPath=None, + bookmarkPath: Optional[str] = None, modifiedTime=None, createdTime=None, urlTargeted_id=None, @@ -681,7 +681,7 @@ def __init__( """ super().__init__() self["@type"] = "uco-observable:BrowserBookmarkFacet" - self._str_vars(**{"observable:bookmarkPath": bookmarkPath}) + self._str_vars(**{"uco-observable:bookmarkPath": bookmarkPath}) self._int_vars(**{"uco-observable:visitCount": visitCount}) self._node_reference_vars( **{ From 54f60325acd9f98913feb7f40c11d57ec4e8405c Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 2 Oct 2024 15:37:08 -0400 Subject: [PATCH 2/3] Fix copy-paste error No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- case_mapping/uco/observable.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/case_mapping/uco/observable.py b/case_mapping/uco/observable.py index 0090f11..925a911 100644 --- a/case_mapping/uco/observable.py +++ b/case_mapping/uco/observable.py @@ -691,7 +691,7 @@ def __init__( ) self._datetime_vars( **{ - "uco-observable:observableCreatedTime": accessedTime, + "uco-observable:observableCreatedTime": createdTime, "uco-observable:modifiedTime": modifiedTime, "uco-observable:accessedTime": accessedTime, } From 2610a79f9749c96a63711ff8fcd8031d78006f56 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 2 Oct 2024 15:41:38 -0400 Subject: [PATCH 3/3] Review types No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- case_mapping/uco/observable.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/case_mapping/uco/observable.py b/case_mapping/uco/observable.py index 925a911..fdee589 100644 --- a/case_mapping/uco/observable.py +++ b/case_mapping/uco/observable.py @@ -660,14 +660,14 @@ def __init__( class BrowserBookmarkFacet(Facet): def __init__( self, - accessedTime=None, - application_id=None, + accessedTime: Optional[datetime] = None, + application_id: Optional[ObservableObject] = None, bookmarkPath: Optional[str] = None, - modifiedTime=None, - createdTime=None, - urlTargeted_id=None, - visitCount=None, - ): + modifiedTime: Optional[datetime] = None, + createdTime: Optional[datetime] = None, + urlTargeted_id: Optional[ObservableObject] = None, + visitCount: Optional[int] = None, + ) -> None: """ This CASEObject represents a grouping of characteristics unique to a saved shortcut that directs a WWW (World Wide Web) browser software program to a particular WWW accessible resource.