codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-08-30 08:01:57 +00:00
Code Issues Releases Wiki Activity

Completed the merge

Browse Source
This commit is contained in:
U-BASIS\dsmyda
2021-01-25 16:14:48 -05:00
parent 345ce14a40
commit ca3e985714
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pythonExamples/Aug2015DataSourceTutorial/FindContactsDb_v2.py
View File

@@ -101,19 +101,11 @@ class ContactsDbIngestModule(DataSourceIngestModule):
self.context = context
# Where the analysis is done.
<<<<<<< HEAD
# The 'data_source' object being passed in is of type org.sleuthkit.datamodel.Content.
# See: http://www.sleuthkit.org/sleuthkit/docs/jni-docs/4.6.0/interfaceorg_1_1sleuthkit_1_1datamodel_1_1_content.html
# 'progress_bar' is of type org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress
# See: http://sleuthkit.org/autopsy/docs/api-docs/4.6.0/classorg_1_1sleuthkit_1_1autopsy_1_1ingest_1_1_data_source_ingest_module_progress.html
def process(self, data_source, progress_bar):
=======
# The 'dataSource' object being passed in is of type org.sleuthkit.datamodel.Content.
# See: http://www.sleuthkit.org/sleuthkit/docs/jni-docs/latest/interfaceorg_1_1sleuthkit_1_1datamodel_1_1_content.html
# 'progressBar' is of type org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress
# See: http://sleuthkit.org/autopsy/docs/api-docs/latest/classorg_1_1sleuthkit_1_1autopsy_1_1ingest_1_1_data_source_ingest_module_progress.html
def process(self, dataSource, progressBar):
>>>>>>> db1553ba4e186f1fe50e706a18113f6539779cee
# we don't know how much work there is yet
progress_bar.switchToIndeterminate()