add get_imei()

Author: drebbe-intrepid

include/methods.h

@@ -102,6 +102,7 @@ extern "C"
     PyObject* meth_get_accessory_firmware_version(PyObject* self, PyObject* args);
     PyObject* meth_set_safe_boot_mode(PyObject* self, PyObject* args);
     PyObject* meth_get_device_name(PyObject* self, PyObject* args); // icsneoGetDeviceName
+    PyObject* meth_get_imei(PyObject* self, PyObject* args);        // icsneoGetIMEI
 
 #ifdef _cplusplus
 }
@@ -114,11 +115,11 @@ extern "C"
           flags,                                                                                                       \
           "\n.. note:: Compatibility Function: Identical to PEP8 compliant :func:`" MODULE_NAME "." name               \
           "` method.\n\n" },                                                                                           \
-        { icsname_no_icsneo,                                                                                           \
-          (PyCFunction)meth,                                                                                           \
-          flags,                                                                                                       \
-          "\n.. note:: Compatibility Function: Identical to PEP8 compliant :func:`" MODULE_NAME "." name               \
-          "` method.\n\n" }
+    {                                                                                                                  \
+        icsname_no_icsneo, (PyCFunction)meth, flags,                                                                   \
+            "\n.. note:: Compatibility Function: Identical to PEP8 compliant :func:`" MODULE_NAME "." name             \
+            "` method.\n\n"                                                                                            \
+    }
 
 #define _DOC_FIND_DEVICES                                                                                              \
     MODULE_NAME ".find_devices(device_type=" MODULE_NAME ".NEODEVICE_ALL)\n"                                           \
@@ -1943,6 +1944,21 @@ extern "C"
                 "\tstr\n"                                                                                              \
                 "\n"
 
+#define _DOC_GET_IMEI                                                                                                  \
+    MODULE_NAME ".get_imei(device) -> int\n"                                                                           \
+                "\n"                                                                                                   \
+                "Gets the unique 15 digit IMEI from the device. raises RuntimeError if not supported.\n"               \
+                "\n"                                                                                                   \
+                "Args:\n"                                                                                              \
+                "\tdevice (:class:`" MODULE_NAME ".PyNeoDeviceEx`): :class:`" MODULE_NAME ".PyNeoDeviceEx`\n\n"        \
+                "\n"                                                                                                   \
+                "Raises:\n"                                                                                            \
+                "\t:class:`" MODULE_NAME ".RuntimeError`\n"                                                            \
+                "\n"                                                                                                   \
+                "Returns:\n"                                                                                           \
+                "\tint\n"                                                                                              \
+                "\n"
+
 extern PyMethodDef IcsMethods[];
 
 #endif // _METHODS_H_

src/ics/py_neo_device_ex.py

@@ -493,4 +493,8 @@ def flash_devices(self, *args, **kwargs):
 
     def get_device_name(self, *args, **kwargs):
         "see ics.get_device_name for details on arguments."
-        return ics.get_device_name(self, *args, **kwargs)
+        return ics.get_device_name(self, *args, **kwargs)
+    
+    def get_imei(self, *args, **kwargs):
+        "see ics.get_imei for details on arguments."
+        return ics.get_imei(self, *args, **kwargs)

src/methods.cpp

@@ -608,6 +608,12 @@ PyMethodDef IcsMethods[] = {
                           meth_get_device_name,
                           METH_VARARGS,
                           _DOC_GET_DEVICE_NAME),
+    _EZ_ICS_STRUCT_METHOD("get_imei",
+                          "icsneoGetIMEI",
+                          "GetIMEI",
+                          meth_get_imei,
+                          METH_VARARGS,
+                          _DOC_GET_IMEI),
 
     { "override_library_name", (PyCFunction)meth_override_library_name, METH_VARARGS, _DOC_OVERRIDE_LIBRARY_NAME },
     { "get_library_path", (PyCFunction)meth_get_library_path, METH_NOARGS, "" },
@@ -1952,19 +1958,19 @@ PyObject* meth_get_error_messages(PyObject* self, PyObject* args)
             int description_short_length = 255;
             int description_long_length = 255;
             int severity = 0, restart_needed = 0;
-            auto gil = PyAllowThreads();
+            auto gil2 = PyAllowThreads();
             if (!icsneoGetErrorInfo(errors[i],
                                     description_short,
                                     description_long,
                                     &description_short_length,
                                     &description_long_length,
                                     &severity,
                                     &restart_needed)) {
-                gil.restore();
+                gil2.restore();
                 Py_XDECREF(list);
                 return set_ics_exception(exception_runtime_error(), "icsneoGetErrorInfo() Failed");
             }
-            gil.restore();
+            gil2.restore();
             PyObject* tuple = Py_BuildValue(
                 "i, s, s, i, i", errors[i], description_short, description_long, severity, restart_needed);
 
@@ -5445,3 +5451,36 @@ PyObject* meth_get_device_name(PyObject* self, PyObject* args) // icsneoGetDevic
         return set_ics_exception(exception_runtime_error(), (char*)ex.what());
     }
 }
+
+PyObject* meth_get_imei(PyObject* self, PyObject* args) { // icsneoGetIMEI
+    (void)self;
+    PyObject* obj = NULL;
+    if (!PyArg_ParseTuple(args, arg_parse("O:", __FUNCTION__), &obj)) {
+        return NULL;
+    }
+    if (!PyNeoDeviceEx_CheckExact(obj)) {
+        return set_ics_exception(exception_runtime_error(), "Argument must be of type " MODULE_NAME ".PyNeoDeviceEx");
+    }
+    void* handle = NULL;
+    if (!PyNeoDeviceEx_GetHandle(obj, &handle)) {
+        return NULL;
+    }
+    try {
+        ice::Library* lib = dll_get_library();
+        if (!lib) {
+            char buffer[512];
+            return set_ics_exception(exception_runtime_error(), dll_get_error(buffer));
+        }
+        uint64_t imei = 0;
+        ice::Function<int __stdcall(void*, uint64_t*)> icsneoGetIMEI(lib, "icsneoGetIMEI");
+        auto gil = PyAllowThreads();
+        if (!icsneoGetIMEI(handle, &imei)) {
+            gil.restore();
+            return set_ics_exception(exception_runtime_error(), "icsneoGetIMEI() Failed");
+        }
+        gil.restore();
+        return Py_BuildValue("K", imei);
+    } catch (ice::Exception& ex) {
+        return set_ics_exception(exception_runtime_error(), (char*)ex.what());
+    }
+}