Fix content extraction from part (#40)

ImagingDataCommons · Oct 30, 2020 · e8c14db · e8c14db
1 parent 78dce0b
commit e8c14db
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/dicomweb_client/api.py b/src/dicomweb_client/api.py
@@ -691,8 +691,9 @@ def _extract_part_content(cls, part: bytes) -> Union[bytes, None]:
         """
         if part in (b'', b'--', b'\r\n') or part.startswith(b'--\r\n'):
             return None
-        if b'\r\n\r\n' in part:
-            return part.split(b'\r\n\r\n')[1]
+        idx = part.index(b'\r\n\r\n')
+        if idx > -1:
+            return part[idx + 4:]
         raise ValueError('Message part does not contain CRLF CRLF')
 
     def _decode_multipart_message(

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -16,6 +16,12 @@
 )
 
 
+def test_content_extraction_from_part():
+    part = b'xyz\r\n\r\n\x00\x01\x00\x02\x0d\x0a\x0d\x0a\x00\x01\x00\x02'
+    content = DICOMwebClient._extract_part_content(part)
+    assert len(content) == 12
+
+
 def _chunk_message(message: bytes, chunk_size: int) -> bytes:
     chunked_message = b''
     for i in range(0, len(message), chunk_size):