Update Quark public API

Author: haeter525

quark/report.py

@@ -6,7 +6,11 @@
 
 from quark.core.quark import Quark
 from quark.core.struct.ruleobject import RuleObject
-from quark.utils.tools import find_rizin
+from quark.utils.tools import (
+    find_rizin_in_PATH,
+    find_rizin_in_configuration_folder,
+)
+from quark.config import COMPATIBLE_RAZIN_VERSIONS
 
 
 class Report:
@@ -46,9 +50,11 @@ def analysis(self, apk, rule, core_library="androguard", rizin_path=None):
             if rizin_path:
                 self.rizin_path = rizin_path
             elif not self.rizin_path:
-                self.rizin_path = find_rizin(
-                    disable_rizin_installation=self.disable_rizin_installation
-                )
+                self.rizin_path = find_rizin_in_PATH(COMPATIBLE_RAZIN_VERSIONS)
+                if not self.rizin_path:
+                    self.rizin_path = find_rizin_in_configuration_folder(
+                        COMPATIBLE_RAZIN_VERSIONS
+                    )
 
                 if not self.rizin_path:
                     raise ValueError("Cannot found a valid Rizin executable.")

tests/test_report.py

@@ -164,7 +164,7 @@ def test_analysis_with_specified_rizin_path(
                 "quark.core.quark.Quark.generate_json_report"
             ) as mock_generate_report:
                 with patch(
-                    "quark.utils.tools.find_rizin_instance"
+                    "quark.utils.tools.find_rizin_in_PATH"
                 ) as mock_find_rizin:
 
                     sample_report = Report()