WEBDIENSTE/volatility3
1
0
Fork 0
mirror of https://github.com/volatilityfoundation/volatility3.git synced 2026-09-30 05:24:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make some typing fixes and remove specification of the iterator.

Browse Source
This commit is contained in:
Mike Auty
2018-12-07 01:47:16 +00:00
committed by ikelos
parent 5a331f9f01
commit 4fabb762d2
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
volatility/framework/interfaces/layers.py
+5 -10
View File
@@ -171,9 +171,7 @@ class DataLayerInterface(configuration.ConfigurableInterface, validity.ValidityR
context: interfaces.context.ContextInterface,
scanner: ScannerInterface,
progress_callback: validity.ProgressCallback = None,
sections: typing.Iterable[typing.Tuple[int, int]] = None,
scan_iterator: typing.Optional[typing.Callable[['ScannerInterface', int, int],
typing.Iterable[IteratorValue]]] = None) -> \
sections: typing.Iterable[typing.Tuple[int, int]] = None) -> \
typing.Iterable[typing.Any]:
"""Scans a Translation layer by chunk
@@ -182,9 +180,6 @@ class DataLayerInterface(configuration.ConfigurableInterface, validity.ValidityR
if progress_callback is not None and not callable(progress_callback):
raise TypeError("Progress_callback is not callable")
if scan_iterator is None:
scan_iterator = self._scan_iterator
scanner = self._check_type(scanner, ScannerInterface)
scanner.context = context
scanner.layer_name = self.name
@@ -196,7 +191,7 @@ class DataLayerInterface(configuration.ConfigurableInterface, validity.ValidityR
try:
progress = DummyProgress() # type: ProgressValue
scan_iterator = functools.partial(scan_iterator, scanner, sections)
scan_iterator = functools.partial(self._scan_iterator, scanner, sections)
scan_metric = self._scan_metric(scanner, sections)
if scanner.thread_safe and not constants.DISABLE_MULTITHREADED_SCANNING:
progress = multiprocessing.Manager().Value("Q", 0)
@@ -232,7 +227,7 @@ class DataLayerInterface(configuration.ConfigurableInterface, validity.ValidityR
def _coalesce_sections(self,
sections: typing.Iterable[typing.Tuple[int, int]]) -> typing.Iterable[
typing.Tuple[int, int]]:
result = []
result = [] # type: typing.List[typing.Tuple[int, int]]
position = 0
for (start, length) in sorted(sections):
if not result:
@@ -298,7 +293,7 @@ class DataLayerInterface(configuration.ConfigurableInterface, validity.ValidityR
def _scan_metric(self,
_scanner: 'ScannerInterface',
sections: typing.Iterable[typing.Tuple[int, int]]) -> typing.Callable[[int], float]:
sections: typing.List[typing.Tuple[int, int]]) -> typing.Callable[[int], float]:
if not sections:
raise ValueError("Sections have no size, nothing to scan")
@@ -306,7 +301,7 @@ class DataLayerInterface(configuration.ConfigurableInterface, validity.ValidityR
min_address, _ = sections[0]
max_address = last_section + last_length
def _actual_scan_metric(self, value: int) -> float:
def _actual_scan_metric(value: int) -> float:
return max(0, ((value - min_address) * 100) / (max_address - min_address))
return _actual_scan_metric