punchboot 2.0.0__tar.gz → 2.2.0__tar.gz

{punchboot-2.0.0 → punchboot-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punchboot
-Version: 2.0.0
+Version: 2.2.0
 Summary: Punchboot tools
 Home-page: https://github.com/jonasblixt/punchboot
 Author: Jonas Blixt

{punchboot-2.0.0 → punchboot-2.2.0}/punchboot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punchboot
-Version: 2.0.0
+Version: 2.2.0
 Summary: Punchboot tools
 Home-page: https://github.com/jonasblixt/punchboot
 Author: Jonas Blixt

{punchboot-2.0.0 → punchboot-2.2.0}/tools/punchboot/punchboot/__init__.py

@@ -4,6 +4,7 @@ from _punchboot import (  # type: ignore # noqa: F401
     ArgumentError,
     AuthenticationError,
     CommandError,
+    Error,
     GenericError,
     IOError,
     KeyRevokedError,
@@ -26,6 +27,7 @@ from .session import Session
 from .slc import SLC
 
 _pb_exceptions = [
+    "Error",
     "GenericError",
     "AuthenticationError",
     "NotAuthenticatedError",

{punchboot-2.0.0 → punchboot-2.2.0}/tools/punchboot/punchboot/helpers.py

@@ -1,6 +1,7 @@
 """Various punchboot helper functions."""
 
 import uuid
+from importlib.metadata import version
 from typing import Iterable
 
 import _punchboot  # type: ignore
@@ -9,7 +10,7 @@ import semver
 
 def library_version() -> semver.Version:
     """Return the version string of the C library."""
-    return semver.VersionInfo.parse(_punchboot.version())
+    return semver.Version.parse(version('punchboot'))
 
 
 def pb_id(cmd: str) -> int:

{punchboot-2.0.0 → punchboot-2.2.0}/tools/punchboot/punchboot/session.py

@@ -7,7 +7,7 @@ import hashlib
 import io
 import pathlib
 import uuid
-from typing import Any, Callable, Iterable, Optional, Tuple, Union
+from typing import IO, Any, Callable, Iterable, Optional, Tuple, Union
 
 import _punchboot  # type: ignore
 import semver
@@ -17,6 +17,18 @@ from .partition import Partition, PartitionFlags
 from .slc import SLC
 
 
+def _has_fileno(file: IO[bytes]) -> bool:
+    if not hasattr(file, "fileno"):
+        return False
+
+    try:
+        file.fileno()
+    except io.UnsupportedOperation:
+        return False
+
+    return True
+
+
 class Session(object):
     """Punchboot session class.
 
@@ -45,6 +57,13 @@ class Session(object):
         )
         self._s = _punchboot.Session(_device_uuid, _socket_path)
 
+    def close(self):
+        """Close the current session.
+
+        This will invalidate the session object.
+        """
+        self._s.close()
+
     def authenticate(self, password: str):
         """Authenticate session using a password.
 
@@ -101,7 +120,7 @@ class Session(object):
         ]
 
     def part_verify(
-        self, file: Union[pathlib.Path, io.BufferedReader, bytes], part: Union[uuid.UUID, str]
+        self, file: Union[pathlib.Path, IO[bytes], bytes], part: Union[uuid.UUID, str]
     ):
         """Verify the contents of a partition.
 
@@ -123,7 +142,7 @@ class Session(object):
         _bpak_header_valid: bool = False
         _hash_ctx = hashlib.sha256()
 
-        def _chunk_reader(fh: io.BufferedReader) -> int:
+        def _chunk_reader(fh: IO[bytes]) -> int:
             _length: int = 0
             nonlocal _bpak_header_valid
             # Check if the first 4k contains a valid BPAK header
@@ -141,18 +160,18 @@ class Session(object):
         if isinstance(file, pathlib.Path):
             with file.open("rb") as f:
                 _data_length = _chunk_reader(f)
-        elif isinstance(file, io.BufferedReader):
-            _data_length = _chunk_reader(file)
         elif isinstance(file, bytes):
             _hash_ctx.update(file)
             _bpak_header_valid = valid_bpak_magic(file)
             _data_length = len(file)
+        elif _has_fileno(file):
+            _data_length = _chunk_reader(file)
         else:
             raise ValueError("Unacceptable input")
 
         self._s.part_verify(_uu.bytes, _hash_ctx.digest(), _data_length, _bpak_header_valid)
 
-    def part_write(self, file: Union[pathlib.Path, io.BufferedReader], part: Union[uuid.UUID, str]):
+    def part_write(self, file: Union[pathlib.Path, IO[bytes]], part: Union[uuid.UUID, str]):
         """Write data to a partition.
 
         Keyword arguments:
@@ -163,12 +182,12 @@ class Session(object):
         if isinstance(file, pathlib.Path):
             with file.open("rb") as f:
                 self._s.part_write(f, _uu.bytes)
-        elif isinstance(file, io.BufferedReader):
+        elif _has_fileno(file):
             self._s.part_write(file, _uu.bytes)
         else:
             raise ValueError("Unacceptable input")
 
-    def part_read(self, file: Union[pathlib.Path, io.BufferedReader], part: Union[uuid.UUID, str]):
+    def part_read(self, file: Union[pathlib.Path, IO[bytes]], part: Union[uuid.UUID, str]):
         """Read data from a partition to a file.
 
         Keyword arguments:
@@ -179,7 +198,7 @@ class Session(object):
         if isinstance(file, pathlib.Path):
             with file.open("wb") as f:
                 self._s.part_read(f, _uu.bytes)
-        elif isinstance(file, io.BufferedReader):
+        elif _has_fileno(file):
             self._s.part_read(file, _uu.bytes)
         else:
             raise ValueError("Unacceptable input")
@@ -330,7 +349,7 @@ class Session(object):
         _ver_str: str = self._s.device_get_punchboot_version()
         if _ver_str.startswith("v"):
             _ver_str = _ver_str[1:]
-        return semver.VersionInfo.parse(_ver_str)
+        return semver.Version.parse(_ver_str)
 
     def device_get_uuid(self) -> uuid.UUID:
         """Read the device UUID."""

{punchboot-2.0.0 → punchboot-2.2.0}/tools/punchboot/python_wrapper.c

@@ -24,17 +24,25 @@
 
 static int log_cb(struct pb_context *ctx, int level, const char *fmt, ...)
 {
-    static PyObject *logging = NULL;
+    static PyObject *logger = NULL;
     static PyObject *log_msg = NULL;
     char msg_buf[1024];
     int rc;
     (void)ctx;
     (void)level;
 
-    if (logging == NULL) {
-        logging = PyImport_ImportModuleNoBlock("logging");
+    if (logger == NULL) {
+        PyObject *logging = PyImport_ImportModuleNoBlock("logging");
         if (logging == NULL) {
             PyErr_SetString(PyExc_ImportError, "Could not import module 'logging'");
+            return -1;
+        }
+
+        logger = PyObject_CallMethod(logging, "getLogger", "s", "pb");
+
+        if (logger == NULL) {
+            PyErr_SetString(PyExc_RuntimeError, "Can't configure logger");
+            return -1;
         }
     }
 
@@ -48,7 +56,7 @@ static int log_cb(struct pb_context *ctx, int level, const char *fmt, ...)
             msg_buf[rc - 1] = 0;
 
         log_msg = Py_BuildValue("s", msg_buf);
-        PyObject_CallMethod(logging, "debug", "O", log_msg);
+        PyObject_CallMethod(logger, "debug", "O", log_msg);
         Py_DECREF(log_msg);
     }
     va_end(args);
@@ -124,14 +132,27 @@ static int PbSession_init(struct pb_session *self, PyObject *args, PyObject *kwd
     return 0;
 }
 
-static void PbSession_dealloc(struct pb_session *self)
+static void close_pb_session(struct pb_session *self)
 {
     if (self->ctx) {
         pb_api_free_context(self->ctx);
     }
+    self->ctx = NULL;
+}
+
+static void PbSession_dealloc(struct pb_session *self)
+{
+    close_pb_session(self);
     Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
+static PyObject *session_close(PyObject *self, PyObject *Py_UNUSED(args))
+{
+    struct pb_session *session = (struct pb_session *)self;
+    close_pb_session(session);
+    Py_RETURN_NONE;
+}
+
 static PyObject *authenticate(PyObject *self, PyObject *args, PyObject *kwds)
 {
     struct pb_session *session = (struct pb_session *)self;
@@ -849,6 +870,10 @@ static PyObject *board_run_command(PyObject *self, PyObject *args, PyObject *kwd
 }
 
 static PyMethodDef PbSession_methods[] = {
+    { "close",
+      session_close,
+      METH_NOARGS,
+      "Close the current session (invalidates the session object)" },
     /* Password API */
     {
         "authenticate",
@@ -1042,13 +1067,12 @@ static PyObject *wait_for_device(PyObject *self, PyObject *args, PyObject *kwds)
 
     while (true) {
         rc = init_transport(NULL, NULL, &ctx);
-        if (rc != PB_RESULT_OK) {
-            PyErr_SetString(PyExc_TimeoutError, "No device found");
-            return NULL;
+
+        if (rc == PB_RESULT_OK) {
+            rc = get_uuid(ctx, uuid);
+            pb_api_free_context(ctx);
         }
 
-        rc = get_uuid(ctx, uuid);
-        pb_api_free_context(ctx);
         if (rc != PB_RESULT_OK) {
             if (timeout > 0) {
                 sleep(1);