From ced94242804d987e7a2a1a3ea1ef3e892b66504e Mon Sep 17 00:00:00 2001
From: Samuel Carlsson <samuel.carlsson@gmail.com>
Date: Mon, 22 Jan 2024 13:47:11 +0100
Subject: [PATCH] add windows support

---
 ar/archive.py            |   2 +-
 ar/tests/test_windows.py |  52 +++++++++++++++++++++++++++++++++++++++
 test_data/MiniLib.lib    | Bin 0 -> 6232 bytes
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 ar/tests/test_windows.py
 create mode 100644 test_data/MiniLib.lib

diff --git a/ar/archive.py b/ar/archive.py
index f159cc0..176c651 100644
--- a/ar/archive.py
+++ b/ar/archive.py
@@ -75,7 +75,7 @@ def open(self, path: Union[str, ArPath], mode='r', encoding='utf-8'):
 
 def lookup(data: bytes, offset: int) -> str:
     start = offset
-    end = data.index(b"\n", start)
+    end = data.find(b"\00", start)
     return data[start:end - 1].decode()
 
 
diff --git a/ar/tests/test_windows.py b/ar/tests/test_windows.py
new file mode 100644
index 0000000..c2e1be1
--- /dev/null
+++ b/ar/tests/test_windows.py
@@ -0,0 +1,52 @@
+# pylint: disable=redefined-outer-name
+import subprocess
+from pathlib import Path
+
+import pytest
+
+from ar import Archive, ArchiveError
+
+
+ARCHIVE = Path('test_data/MiniLib.lib')
+
+
+def test_list():
+    with ARCHIVE.open('rb') as f:
+        archive = Archive(f)
+        expected = ['x64\\Release\\pch.ob', 'x64\\Release\\MiniLib.ob']
+        actual = [entry.name for entry in archive]
+        assert actual == expected
+
+
+def test_read_binary():
+    with ARCHIVE.open('rb') as f:
+        archive = Archive(f)
+        file0 = archive.open('x64\\Release\\MiniLib.ob', 'rb')
+        assert file0.read(16) == b'\x00\x00\xff\xff\x01\x00d\x86tF\xaee8\xfe\xb3\x0c'
+
+
+def test_seek_basic():
+    with ARCHIVE.open('rb') as f:
+        archive = Archive(f)
+        file0 = archive.open('x64\\Release\\MiniLib.ob', 'rb')
+        file0.seek(1)
+        assert file0.read(3) == b'\x00\xff\xff'
+
+
+def test_tell():
+    with ARCHIVE.open('rb') as f:
+        archive = Archive(f)
+        file0 = archive.open('x64\\Release\\MiniLib.ob', 'rb')
+        assert file0.tell() == 0
+        file0.read(2)
+        assert file0.tell() == 2
+        file0.read()
+        assert file0.tell() == 1887
+
+
+def test_open_missing_path():
+    with ARCHIVE.open('rb') as f:
+        archive = Archive(f)
+        with pytest.raises(ArchiveError) as exception_info:
+            archive.open('missing')
+        assert str(exception_info.value) == "No such entry: missing"
diff --git a/test_data/MiniLib.lib b/test_data/MiniLib.lib
new file mode 100644
index 0000000000000000000000000000000000000000..112cb0c99dcfde3ef388b123a44e93e66cfdd5db
GIT binary patch
literal 6232
zcmeHLeQXrh5r4aD;}84+Mi82k@Ja}jk~`m>U1Ka%pFi&GqnLAjcjh2R*5|!F-@@MQ
zvAbt%`gK6!DpK0gHkFdnCjEn^jiG@y5+aDIg;G#I)Jlz1k*H~!KakQ-wNWZnO@lkL
zw|ndw+l^^R{^?lWxBK4j&6{~M@6F78Xj@VhG9RmLrcUy1@qBcv&*SyBIr}~4r?=I5
z8>uCPaD=c+2w8Rk|9Rf;=LdyMWHQV9Jsy87of(%hvCN@ddR*BtaY#}!895uv$Z2U}
zJSL6rmou@PnpG8bGA8r|php=$lo^lhpU}ec<N<$cx6k8g5B6?t@A3Bbwvx`YqWJy0
zyW;UZq*FUkNU9=!_V@eukj3j^DL7Kgf+9=cabcOE5MkkuS#Y&Gt!eWtb^e=GT3an^
zjnq!GwI+r{SxjnTA}?gz%IH2~?;DVE(hh0V=x?@+X<2t3>w7((wl>(X78ox<(fTtp
z3`tGt!RN&G8_(B$>!p(er;h*T?79t+OS>BgSy5L_aBQXy-eHH4+$mKQ^l`EDMaTra
zL>cSLY-^Vhw;;*u(_`g<AYgtm3+E@x{044JF5|XW5z+)cX{Rzy%9Xp3RRaCjMrE9c
zQr)Dz^Wn6~n;>|b7nd3><KA2d2gb61&w+rSSZaNhT9gm=-X$p6yd;Zi$GV=5#GtB-
zsmUx2LXVahkOWoHl(bHVC9RN@X+$riBqibV_<V^TC7UheBz-b5+>?kZiVXM&yn0*R
zE$!}>7H^9uF)HN}{fef?!H3Xi1fM%4%j@VW5W%HS=EamG6IYtR$}vq;wL~PDEr>Gh
zNvg7@DY=BE6jVV>sA670aSTs0yimyJi7TaO#I;8vu3e;sxU`f!prl0N3Xj1*jD$yh
z#1-g=w}D>b>WdIpP}0Mr`+|j>V7>Py^(1laREDC_5bzQ@a_YE3T)PpVEKV%@p|B2$
zE10@{Cf3QygT-B<3ilfBgQ|DrRj`>(mIv?o=l5F~ylNO9c<G7_#eIj#n{a<3tsbr~
z&djX-2*GEuk}=xN#`A$vUv;UksGIG$*&a083A3Fv+e2piNwfWw*?!t=KV!5_9J@G`
z)8KI8K}Fr~&JfDI^`j#-M>if-ySGHzpZMVzS9q~Gx@_Cl%Qwc}_{Q46>(`ptMY2az
zAmdBdE@#fXa^wrsp=WA-a((B8XCFH8>)&mA@z@_SzhATWvy*>Wqv<K!x2B3kE?~EN
z*<{AqYofR5*_8X<tC#QkrT)bmfBvd>dCkkOdAqN)Uw`ahQ-8|ssTQl(e|UN+`5Ect
zdy=}4Nsh{56wZ?0-xA|Bes*U!A;lVqL_kZ)KbTIwS65UX4<AezZ0m{-2D;+@J%KL3
zRav-gfa8avh>}u6qFzvQ<`P|j?qTfarCb`KX8_sPS<}`*9F-1<ybi4Sj|0d1j8%V5
zZjq}?Rg-Yv6_;C6r$L>;f#A*sg!(r?K&WV_M^0*5za*-db4>P%nxIN~(8}6@g)u1c
zYHQiMONvHA-4NdlzJ_FWPP0dF{=L@xmkiaS8C5wLf(?P84c5?EhUasNlII0QRSLS4
z6M4hcd08Aw3aI=h3;LG9Wg)TcGWP*vjqi(vdZE{4@i<Ok|FEao>bW-CLma9(e8(I?
z)yfum9j2ERvo^%mf#9;T4GfwXHE?bhV9I-Sl5`IC1){q`JBOltI6S}y;yr=EXeewN
z9UU=Va>N!(hh1nNRX}A8uLAdr8LFGE*Jc6hZ!zTDeo+?BK8&htwK#oeKD%jpGM7rK
za7z@oS>UToXRaX2c^!_FA8ruXr}gWjc$PSbxrX<5Sdu}+%*&!KLI{GaWrrdpXZ!42
z0H5EF;&oXop1<`l!EpJ6Zz>yN&gFbJSuv!NC3iaWoMH&eRE#i0UrJ699xsub8xOJs
zEw$b*AAvb61VGa~wZ*5O3jI;&NED2GK`Z48!kqa+7V-sI8Z|Nx)y!bcJ~t*ugP2Yl
zMry2MY6(|Sf%bZ6<;oxb_S~;dM8wd^_KR<yesp6N`xh6}=8Opt#^3n+YO;phL+&M2
zE9;8%QF?@4p%2s3^z-yf^vm=K`Z#@xK1pAoPt#}Ux9PKVntqp_rx)lC=ta8rKK&?L
zgeecx&%xBk%t?>Kv?pPjeadP2JUt6+tf^P%2gu#b3{c}##j2tQcD-@9XRxQ=W9Ux;
zWUMJ3|K>(p^5*uKV~7|oIdchYKI3M44%`#T+D$VpIRIU@w8VhG<Ns;N%_Md)X^9{6
zbhnh+ceoPlh=rv;Ehcra(lL&K6wl}xS7diK1?46dQ`loKkkEu2<19wdD)!<CXL1ad
zM^3UAMpzGV43<VtGB9RQgeQh$Zedee%Pfd04UCfqei?ksVhD3t^CEQs4Gf$oBou^W
zuoQBVfia7qY8c`eEQ6eca@IEcoMr2L)v;BzdfVH#ypyW66C_(vS7jWG8qj39xwhRX
z*o7u}V76#;RIS?qb7B^*TxHs-)&~LeSG1&!%D7ooYY2D1MrE9>YHa|1+vmgCs@BcG
zCyrLNQJJ4<EF7AG|D$u@-mhwOCCGF8)u@&7-{Fe%f2l?-5%H&+_o5=L0_U?`{ku$`
zec!JB#g<{#exXSz_nQCQ=0}cS-J5>px_;NI=l}M#51yGieDVGh&3yx3xpd&v%MC2+
z_;K$@mEqgPJ_xeMDI5vHjT{>RA8UYoYxeJqQ%ohEtYQejU#IXg4PW(DIDsKnNs7N1
zH9ly?Tljc4DZI8wR?}jb7H^PnOMSX&O*MCa@eD4}kZ9uSLv^Gv%u*6&D#8pG!8SrR
zuxxNgcsYJmc5p0-vYX%;Zt9CNQS#0?Rz(Q#s$_$%3f5#-{Xzvh)uor76<zR3I^Y+M
zFjE6-;7e%@j^Ws~gkkELdUgp1zk!rK7^Z@S`xLTH%;q5Lgwcg_JG9lipW6{mze<0K
zNf%jFYz5mkzL)VE1BH`}SZIcbQvAjs;UojI==hDn!AS-mNBqXX;3Na%h~F3#oMgo2
F{{XXwWA^|6

literal 0
HcmV?d00001