Change more names to python_debugger

Author: xusheng6

binjaplug.py

@@ -399,7 +399,7 @@ def serialize_metadata(self):
 		for pair in self.breakpoints:
 			module = pair['module'].replace('\\', '\\\\')
 			tmp.append({'module':module, 'offset':pair['offset']})
-		self.state.bv.store_metadata('debugger.breakpoints', tmp)
+		self.state.bv.store_metadata('python_debugger.breakpoints', tmp)
 
 	'''
 	Load the breakpoints from binary view metadata.
@@ -408,7 +408,7 @@ def serialize_metadata(self):
 	def unserialize_metadata(self):
 		tmp = []
 		try:
-			tmp = self.state.bv.query_metadata('debugger.breakpoints')
+			tmp = self.state.bv.query_metadata('python_debugger.breakpoints')
 			for i in range(len(tmp)):
 				tmp[i]['module'] = tmp[i]['module'].replace('\\\\', '\\')
 		except Exception as e:
@@ -447,12 +447,12 @@ def get_metadata(key, default):
 			except:
 				return default
 
-		self.command_line_args = get_metadata('debugger.command_line_args', [])
+		self.command_line_args = get_metadata('python_debugger.command_line_args', [])
 
-		self.adapter_type = list(DebugAdapter.ADAPTER_TYPE)[get_metadata('debugger.adapter_type', DebugAdapter.ADAPTER_TYPE.DEFAULT.value)]
-		self.remote_host = get_metadata('debugger.remote_host', 'localhost')
-		self.remote_port = get_metadata('debugger.remote_port', 31337)
-		self.request_terminal_emulator = get_metadata('debugger.request_terminal_emulator', False)
+		self.adapter_type = list(DebugAdapter.ADAPTER_TYPE)[get_metadata('python_debugger.adapter_type', DebugAdapter.ADAPTER_TYPE.DEFAULT.value)]
+		self.remote_host = get_metadata('python_debugger.remote_host', 'localhost')
+		self.remote_port = get_metadata('python_debugger.remote_port', 31337)
+		self.request_terminal_emulator = get_metadata('python_debugger.request_terminal_emulator', False)
 
 		# Convenience
 		self.registers = DebuggerRegisters(self)

dockwidgets/AdapterSettingsDialog.py

@@ -98,7 +98,7 @@ def select_adapter(adapter):
 		self.accepted.connect(lambda: self.apply())
 
 	def selectAdapter(self, adapter):
-		self.bv.store_metadata('debugger.adapter_type', adapter.value)
+		self.bv.store_metadata('python_debugger.adapter_type', adapter.value)
 		debug_state = binjaplug.get_state(self.bv)
 		debug_state.adapter_type = adapter
 		self.adapterEntry.setText(adapter.name)
@@ -116,20 +116,20 @@ def apply(self):
 		debug_state = binjaplug.get_state(self.bv)
 		arguments = shlex.split(self.argumentsEntry.text())
 		debug_state.command_line_args = arguments
-		self.bv.store_metadata('debugger.command_line_args', arguments)
+		self.bv.store_metadata('python_debugger.command_line_args', arguments)
 
 		address = self.addressEntry.text()
 		port = int(self.portEntry.text())
 
 		debug_state.remote_host = address
 		debug_state.remote_port = port
 
-		self.bv.store_metadata('debugger.remote_host', address)
-		self.bv.store_metadata('debugger.remote_port', port)
+		self.bv.store_metadata('python_debugger.remote_host', address)
+		self.bv.store_metadata('python_debugger.remote_port', port)
 
 		request_terminal_emulator = self.requestTerminalEmulator.isChecked()
 		debug_state.request_terminal_emulator = request_terminal_emulator
-		self.bv.store_metadata('debugger.request_terminal_emulator', request_terminal_emulator)
+		self.bv.store_metadata('python_debugger.request_terminal_emulator', request_terminal_emulator)
 
 	def updateArguments(self):
 		try:

ui.py

@@ -47,7 +47,7 @@ def __init__(self, state):
 		self.update_highlights()
 		self.update_breakpoints()
 		Settings().register_group("debugger", "Debugger")
-		key = 'debugger.extra_annotations'
+		key = 'python_debugger.extra_annotations'
 		if not Settings().contains(key):
 			Settings().register_setting(key, '{"description" : "Enables automatic additional annotations to be added to the start of functions that will persist after the debugger has moved away. Must break or step across the start of a function to trigger. Currently uses comments but will be migrated to ephemeral comments when that system is finished.", "title" : "Debugger Function Start Annotations", "default" : false, "type" : "boolean"}')