From c885b7a4c47f16a1c69612215a1cab5c9f7df5eb Mon Sep 17 00:00:00 2001
From: Rusty Wagner <rusty@vector35.com>
Date: Tue, 21 May 2019 14:37:36 -0400
Subject: Bring Python triage plugin changes to C++, don't default to raw files
 always opening in triage view

---
 examples/triage/files.cpp      |  6 +++---
 examples/triage/triage.cpp     | 10 +++++-----
 examples/triage/view.cpp       |  4 ++--
 python/examples/triage/view.py |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/examples/triage/files.cpp b/examples/triage/files.cpp
index a736b81d..8ae97f33 100644
--- a/examples/triage/files.cpp
+++ b/examples/triage/files.cpp
@@ -82,11 +82,11 @@ void TriageFilePicker::openSelectedFiles()
 		f->createBinaryViews();
 		for (auto data: f->getAllDataViews())
 		{
-			BinaryNinja::Settings().Set("analysis.mode", BinaryNinja::Settings().Get<std::string>("triage.analysis_mode"), data);
-			BinaryNinja::Settings().Set("triage.always_prefer", true, data);
+			BinaryNinja::Settings().Set("analysis.mode", BinaryNinja::Settings().Get<std::string>("triage.analysisMode"), data);
+			BinaryNinja::Settings().Set("triage.preferSummaryView", true, data);
 			if (data->GetTypeName() != "Raw")
 			{
-				std::string linearSweepMode = BinaryNinja::Settings().Get<std::string>("triage.linear_sweep");
+				std::string linearSweepMode = BinaryNinja::Settings().Get<std::string>("triage.linearSweep");
 				if (linearSweepMode == "none")
 				{
 					BinaryNinja::Settings().Set("analysis.linearSweep.autorun", false, data);
diff --git a/examples/triage/triage.cpp b/examples/triage/triage.cpp
index d88180a0..37431d65 100644
--- a/examples/triage/triage.cpp
+++ b/examples/triage/triage.cpp
@@ -13,7 +13,7 @@ extern "C"
 #endif
 	{
 		BinaryNinja::Settings().RegisterGroup("triage", "Triage");
-		BinaryNinja::Settings().RegisterSetting("triage.always_prefer",
+		BinaryNinja::Settings().RegisterSetting("triage.preferSummaryView",
 			R"({
 				"title" : "Always Prefer Triage Summary View",
 				"type" : "boolean",
@@ -21,17 +21,17 @@ extern "C"
 				"description" : "Always prefer opening binaries in Triage Summary view, even when performing full analysis."
 			})");
 
-		BinaryNinja::Settings().RegisterSetting("triage.prefer_for_raw",
+		BinaryNinja::Settings().RegisterSetting("triage.preferSummaryViewForRaw",
 			R"({
 				"title" : "Prefer Triage Summary View for Raw Files",
 				"type" : "boolean",
-				"default" : true,
+				"default" : false,
 				"description" : "Prefer opening raw files in Triage Summary view."
 			})");
 
 		ViewType::registerViewType(new TriageViewType());
 
-		BinaryNinja::Settings().RegisterSetting("triage.analysis_mode",
+		BinaryNinja::Settings().RegisterSetting("triage.analysisMode",
 			R"({
 				"title" : "Triage Analysis Mode",
 				"type" : "string",
@@ -44,7 +44,7 @@ extern "C"
 					"Perform full analysis of the binary." ]
 			})");
 
-		BinaryNinja::Settings().RegisterSetting("triage.linear_sweep",
+		BinaryNinja::Settings().RegisterSetting("triage.linearSweep",
 			R"({
 				"title" : "Triage Linear Sweep Mode",
 				"type" : "string",
diff --git a/examples/triage/view.cpp b/examples/triage/view.cpp
index 73e036a5..e4077521 100644
--- a/examples/triage/view.cpp
+++ b/examples/triage/view.cpp
@@ -221,8 +221,8 @@ TriageViewType::TriageViewType(): ViewType("Triage", "Triage Summary")
 int TriageViewType::getPriority(BinaryViewRef data, const QString&)
 {
 	bool full = BinaryNinja::Settings().Get<std::string>("analysis.mode", data) == "full";
-	bool alwaysPrefer = BinaryNinja::Settings().Get<bool>("triage.always_prefer", data);
-	bool preferForRaw = BinaryNinja::Settings().Get<bool>("triage.prefer_for_raw", data);
+	bool alwaysPrefer = BinaryNinja::Settings().Get<bool>("triage.preferSummaryView", data);
+	bool preferForRaw = BinaryNinja::Settings().Get<bool>("triage.preferSummaryViewForRaw", data);
 	if (data->IsExecutable() && (alwaysPrefer || !full))
 		return 100;
 	if (data->GetLength() > 0)
diff --git a/python/examples/triage/view.py b/python/examples/triage/view.py
index f0a2dffa..7cc8a172 100644
--- a/python/examples/triage/view.py
+++ b/python/examples/triage/view.py
@@ -204,7 +204,7 @@ Settings().register_setting("triage.preferSummaryViewForRaw", """
 	{
 		"title" : "Prefer Triage Summary View for Raw Files",
 		"type" : "boolean",
-		"default" : true,
+		"default" : false,
 		"description" : "Prefer Triage Summary View when opening a binary that is Raw file type."
 	}
 	""")
-- 
cgit v1.3.1