From 16ce5bd6f8b2933d93fcc450e43bb911a417977c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?=
 <oleavr@nowsecure.com>
Date: Sun, 13 Sep 2015 19:02:19 +0200
Subject: [PATCH] Add `get_local_device()` and improve API consistency with
 frida-node

---
 src/frida/__init__.py | 19 +++++++++++--------
 src/frida/core.py     |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/frida/__init__.py b/src/frida/__init__.py
index 1d17044..05d9823 100644
--- a/src/frida/__init__.py
+++ b/src/frida/__init__.py
@@ -43,28 +43,31 @@ ProtocolError = _frida.ProtocolError
 TransportError = _frida.TransportError
 
 def spawn(argv):
-    return get_device_manager().get_device().spawn(argv)
+    return get_local_device().spawn(argv)
 
 def resume(target):
-    get_device_manager().get_device().resume(target)
+    get_local_device().resume(target)
 
 def kill(target):
-    get_device_manager().get_device().kill(target)
+    get_local_device().kill(target)
 
 def attach(target):
-    return get_device_manager().get_device().attach(target)
+    return get_local_device().attach(target)
 
 def enumerate_devices():
     return get_device_manager().enumerate_devices()
 
-def get_device(id, timeout = 0):
-    return _get_device(lambda device: device.id == id, timeout)
+def get_local_device():
+    return _get_device(lambda device: device.type == 'local', timeout=0)
 
 def get_usb_device(timeout = 0):
     return _get_device(lambda device: device.type == 'tether', timeout)
 
-def get_remote_device(timeout = 0):
-    return _get_device(lambda device: device.type == 'remote', timeout)
+def get_remote_device():
+    return _get_device(lambda device: device.type == 'remote', timeout=0)
+
+def get_device(id, timeout = 0):
+    return _get_device(lambda device: device.id == id, timeout)
 
 def _get_device(predicate, timeout):
     mgr = get_device_manager()
diff --git a/src/frida/core.py b/src/frida/core.py
index b314d80..ebc5872 100644
--- a/src/frida/core.py
+++ b/src/frida/core.py
@@ -20,7 +20,7 @@ class DeviceManager(object):
     def enumerate_devices(self):
         return [Device(device) for device in self._impl.enumerate_devices()]
 
-    def get_device(self, device_id = None):
+    def get_device(self, device_id):
         devices = self._impl.enumerate_devices()
         if device_id is None:
             return Device(devices[0])