From dc9350fcc56c30e4f87ec177400a9a978f3dfc01 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Sun, 19 Mar 2006 21:40:24 +0000
Subject: [PATCH] committed changes for new file format

---
 plugins/BinLogReader/BinLog.cs        |  26 ++++++--
 plugins/BinLogReader/BinLogReader.exe | Bin 45056 -> 45056 bytes
 plugins/BinLogReader/Form1.cs         |  26 +-------
 plugins/BinLogReader/PluginDb.cs      |  90 ++++++++------------------
 4 files changed, 51 insertions(+), 91 deletions(-)

diff --git a/plugins/BinLogReader/BinLog.cs b/plugins/BinLogReader/BinLog.cs
index e97bd83f..cf6cac36 100644
--- a/plugins/BinLogReader/BinLog.cs
+++ b/plugins/BinLogReader/BinLog.cs
@@ -11,9 +11,10 @@ namespace BinLogReader
 	public class BinLog
 	{
 		private static uint BINLOG_MAGIC = 0x414D424C;
-		private static short BINLOG_VERSION = 0x0100;
+		private static short BINLOG_VERSION = 0x0200;
 
 		private ArrayList oplist;
+		private PluginDb plugdb;
 
 		public ArrayList OpList
 		{
@@ -28,7 +29,12 @@ public ArrayList OpList
 			oplist = new ArrayList(init_size);
 		}
 
-		public static BinLog FromFile(string filename, PluginDb db)
+		public PluginDb GetPluginDB()
+		{
+			return plugdb;
+		}
+
+		public static BinLog FromFile(string filename)
 		{
 			if (!File.Exists(filename))
 				return null;
@@ -68,6 +74,12 @@ public static BinLog FromFile(string filename, PluginDb db)
 				else 
 					bl = new BinLog( (int)(fi.Length / 6) );
 
+				bl.plugdb = PluginDb.FromFile(br);
+				PluginDb db = bl.plugdb;
+
+				if (db == null)
+					throw new Exception("Plugin database read failure");
+
 				do
 				{
 					opcode = (BinLogOp)br.ReadByte();
@@ -246,14 +258,18 @@ public static BinLog FromFile(string filename, PluginDb db)
 				} while (opcode != BinLogOp.BinLog_End);
 				opcode =BinLogOp.BinLog_End;
 			} 
-			catch
+			catch (Exception e)
 			{
-				if (bl != null)
+				if (bl != null && bl.plugdb != null)
 				{
 					BinLogSimple bs = new BinLogSimple(BinLogOp.BinLog_Invalid, gametime, realtime, pl);
 					bl.oplist.Add(bs);
+				} 
+				else 
+				{
+					throw new Exception(e.Message);
 				}
-			} 
+			}
 			finally
 			{
 				br.Close();
diff --git a/plugins/BinLogReader/BinLogReader.exe b/plugins/BinLogReader/BinLogReader.exe
index 52a9ce4e30ec44a76d0c4505080a3d9959d00ab6..72069d60bc2d599d1be3a68d5c52b26c664e104e 100644
GIT binary patch
delta 10553
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

delta 11430
zcma)B3wTuZl|T0}cOJ=1a%aL!LI{~a5+)Cl5I|lcgohC1DFMNP5Fmx{y5S}u7|A6q
zzACojrB&Brt?RDR-S$&sTkT_4YqeI<&vxzBt`(&(ZFSq)?$%m$+21+$&SXOAW4<rH
zd*0{#-~W4a<aPDP>*}pHYHyz#ef;JMb@|ETUsxOa<7bIh6Mpv)^@NUBCEO}yliG23
z=wr%2thVJOtB4lkPsQIOJwyu{i4@S&iHwffL>ni&?<n=|%Hk=3@|GY4+>^zp-D74`
zk!Bj!N*E=A;lxaHru(e9$cZ+DgVt!G$j(I6BNDNoRRTexC}<X?)>-9D7iY%cVHPLN
zBCCQ0rWrM3rfCLD-3<07Ichv)p$x-}TVr8SJAJf9WEM0=f>s%OB!)93{0t>Q$1KUF
z80DoHl{8Dd6iG8-CjA76U?ft0f|Q@&Yv=(aSm-AxGt0VrW1OlqnHbYh<BLZpcP7fs
z(fBJh%a4smUwQ84nAEz2GsYYPx7L>$=K8I#Fe`FF(hb$VbZjzFX^zETsabifdN@WJ
zG16w*tZ4mDztTFcw92e9ORWhY{gSKvl0zuj4>^vX4yqmR_eOQltj=~ujn^49NweDP
zj9PP?Io_=GlVHS+!~{R~1V8o{(fg&o0h(zfGQL5^H#i0ZKY5*5CzejIw}?&aebaj1
zbjz@5gW2E*O|WI7Z`tTuPKRaQC{N^3j$;t^CMKE_eMih4BhlnLHu;X{FlB>|%)Laj
zUsj9RY_|ALX?B|AJ5BPPo`X}E4N7{YiLIf2%rf0<_4WV4L9J0d2_^^4$=U9l;>)H6
z&8b=0MI6S#<ekikrkT^cE}xP#Crg)G&5&oM7bVT9o^%qVe$r`PQZr~yvzj2b+Sr4+
z7Ut#y8pdX4u#`L9_nhu|mPTiXOXq&@{<(9d(KF*}LycobSkLgSXL#0U=uA9lRibT%
zh0cj&s@&H`jT-xDo#=V|jYHEh77A|**b3+|$llT2cygSgxKoqqq7*tx)eo2QBXGFP
z-Iko-7^tzaLm!(F;xg6l#;#)_RHRnbtU25akI7fqd-9DIvJqMb54$&~sMkk(F=L1`
zY*L?1RU@gKzm=<=5-l3_qd91nnT+TuFKP-=3y`=Vu4J$rBVLuMh+gXHXBmy-Rr~5(
zIWP~yyfCh2YI5ccqh?-EuG)ulj+&}lQFwA83I$OJ|J44J`@_@(_gkqku2EXt5rBoN
z9mYPY*OQctu9Kf;e>^W%CIUk}gD{3>yZH+2TYfKU_9;=gJ4>q_wpaVH1?$!lkP=)c
ztS|YgdLX7}{N!vTdX3ik`oEI=i}}eB&mU*aekD)QAD7HBxSIV_udK?lI>%3mb<Hyh
z2LjJ1?E2XP_T>tAH$NQP^R5`F)$H*~cA{x&KS%K9kY>-wQ;g`ZD{_ian!P8-z@0N&
z<J=#YHDoKpD&fk~c=&y?C0Ek^VORTp&}u(hdnZH2EAH>8;k*(!6DFa1{pd`y-#b;=
z<SJoe$WODsI-FeXXA5hB`|9YL!iWqs)|zg$yRq`JY(rRrhF}P?4H@p+zc{mA$xD(!
z<1Re7lFT355A!_wIaw?_98s0W$$g}}zQS)8)|*$0O4#s7!@^YitKIj@%QjCCWA4Lx
z&0dku^bRxd8M&6cfFor!k|fchQpoE%!uqOl`^MBr&-e>r7j)R>OwIm!F235&zKu(g
zk%sA*8_XCMPUVONCx4^Bnqs-t07+_nbD@^ERT!ytk$ipY*R=e7joi|T>g?#$A_ztY
zQ<@h5CQo*dy8NO?uE2g=WAyCu|9P%rRLOy|J#K1wD}zI46*W1<47hMMZ`(t=&g)S$
z7nPjXdm?mCSJXRyX@?k5Ut2C4lCiIsOtZW4708`aSUE*~qD7}jZs7EQY*Mi0K~~+9
zV@EqP;izVCk%_38X}q;@wOGjV(;5?MKU*{wcu#908)_LGvk?gsq>FH51$gfD;-HQk
z#!%{NFAm<wVFb;Rt-~ZDWTl8wl%?U!q&u^6v@=6!+y^3u0T54N64ikeDR_`mS&Abz
zE4^r#gi2TYIgSNsMD6D|KFQ7=nelX7vW4i8(pzvMC=tg<s{LI2y+%sy=fdtaEaX8L
zmL@I4^=WY{^W4~r+bLe$%6pAcwI6L9>2B}m;X$V&1e<5WF>MdBj>p7Ts{d!q#-Q}h
zg2cL5#2h*0m%y}r%WynSR_g1RwvUh0Ask|l2*=IKhGQBn!eux$+$0R;a0A%FJ~<qe
zmDvU`ZJ!#};fAK$Uu7OmKzn#JDvPX3atz;VAeW(;n<sUImSM^li<HOM`ZFmHcb;@?
zWnnM2#E3O77uEhb7cxJ`C#?lJI(@53l<rfAdKa>nb7@YMv=-%PbRKH=J8!XwrF5?q
zJUjgoSUS2gnO_2n?Ef7uf%)`}oc79GS}!X!4!X2G7vC<>QTY<#IZ4X8EJr7;r8&CX
zT9%_z*76*k98m~INLnj$TDzR1d;P*XF3PQ_4m#2kUP+#h*AZR?E5%<%$ZI{XLcjGa
zJ+JjFvL_8EV*bLdXHAM5?_gqx+oIvtbCPT;nYO#3<I}S(S(fZwg_^9(r7%{GY_^!+
zK3oCw7p_2jtwr7(6u0|_E8y98UfWn?pBj$L{DmX4rpzB$@%s1Sz&wFR1a{PZmf2^A
zBQt;D$gC;#Ba7ENxya>}QEyVO=AKF4$5Za6?3BxNurT8dp=_42vef<t>;Zaa4QuUG
zfO;}ALG1A$y_tx$0DEsOWY$WjvwzaMLTH}eS(-=Dr;{00`^QfKc|YF9jm&yc@Y$0T
zF-}#r<S@299S>}Lx|%$UZNxj*;ov)Gu5_=dsc?8!S|5?rLT&(QZ3JkgO@>ywsdO^V
zFCI+mD#?TMPp4<l4TxjnI71#oYb?=Hn^JReGUC00Gta0Ik|U=0gAJx+F1o!6eNlOF
z(%J;MQ=6~Z#F}lMW`v@f6$dY%*q;|`gvWIw6<idrawB5gf<93Sl7$VpHqXLj)kE@0
zDT)`X&8Voi6OhnN-P!^o?7cy51zDRD%|#q*q-frsi?B=jR>6>|-y2G;D-0Q}$Nctg
zL&Tuf<)$Z8IRP^u_qfW)mAxP3?7_-dB9u&o8=CNjAC{|MA1(@Ng5S*zGn5G-wi&ct
zG}61%m|=Xz37hz^Ady<X;|-b_w6-Il%)I*YmH;imxZtG5b(hZ=)!G5A6ERXvO1*tM
zqV;w|P!ROg)=u`_1t<(zyYZM<U_Zu23DDPstUY+7ti8Z!*s}28ZcAD{Oa<~|*b@xu
zL20=7N9@U<Gd8G{)ytNKqnbtrdywHxTA4t|G#hqaCN-}dZ+>MoHkZlW&j|Cw!{%~c
z`gfQ<q)1x(fz|<lnv@x<rYa*DI2vl{;n~>m^)oXQL3;=x5+U^2)v#<FWrpM}+UKR@
zL`a474cH|si!%pdR(po9DwSehRdM>TNSWzw%QPw%yT>!fYAS=&Q?K@8a_FhahCOkZ
zEd@K9S^Iu>Ufq|H4G7h$mcSU(M%TO{Z+DIQv3V*SEW@gq^^1+mAg~(T8|%kj!Q}b(
z<qTFH-%2&A<?`^;lC3e^g+0GqN@o3(am+Hbr@Y0WeV8gC_w&WIj`uk%8XmyuqBj-T
z?I_$E8UMQ<hJ9cObdw6~LwPy`!$dFxz35@1Fqtr>e-AbIAF_h}GZZwjG`w%L{)e{&
zR)+W%g!qe=6EVX{GbA6c%!paQYk-d{BT*PK3%&2b(PSdl&~l-WX4LyCmJ7l662pvP
zy~ObSH!|(nWTNP=x;n$@EnHp<{-&HLGK<WDY0sK?*TSka%)o-$bLY;TiPe@A+Mmny
z!TF!N&>=q#p?|3jdprNe<F6hay$pXb(0It_FP6^)vk`xr(HHVdU{tWXQ<&cu`NK&p
z(0eHg!tTmLXm}sl@`g9H9;2_&DBnN5VBWH}BRq&{PIQEajEfmcHy)il`&tv_3=qAE
z=cA}){OUftd+&CvQKEa&M9*N~7{6vU?LY}U-N!Fl(~ikX2f?3q&u*G93i~TzYakRO
z{{UdugKov<70z4gYifj6=s_hyTLe!EepB$*f@*-ZNnniT1nL3?9S>CFm{|~P4H~pj
z@POcP!7m6tDR@TkJ;8X0?HdG_2yS=e@w{;&WY9l_7#|e;H^JuwUk!1x_l2GweoZxK
zeV8Si1a}F3UhwPT2f`6*j&QjPf%nsr2u6W!h*aZ^@oten0{llh4SAgY6mi~)#3@to
zRwP0nFJQMvfpK~ok~lpl_yeFp&4nCdUSUvapdE#nEp#*J2;DAtpWvgw-_ujj{+`|j
zHqZxRSrKK+dckSH810R&h{k9zx?(CGHwbg5;3I<n0W|29Xf;iyccPrEF~%XL3AV@F
zKXqmtodTp_vUJc4%)2<aL5%)pZ~;oO4%}{VCHO)V6Yd(}%3;g88-yE!y9sl*3s*^H
z!rd=i6^#+@tHO<=O5vUnuG+y0VaFc`TZ4^^xi^KYMbnx4qi}W9BwUp;gQCz(B^6~)
zz+adyp*f<P1YLmU`P_8j+G!b?)P{DOv|Ne8?i%dohH*-1rnN_$hm=-49v6IG@MXbY
z34SOTQ`x3Uutjj5;99|*g8jg3&|~V=u>S|a2LvAh>hvwOANZU)0DMUuL@8G}S~DK|
z1V5n-fWA%WJGEbe_9PyCw`d;_?ZbjEXsxh$Nh=1D&T;a613E`26kMlI!5Ht-rvvv3
zI)XRp4vSo2{#Cyi^n*e_rOyTZqTnlnKNWmeUjTV5uozesSPE<ptORZdYy@r%bOHwg
zT}rkmJ_Nn?NXTGJ0Tmi=3;^p5E^e|>?BFrW;1;w=rHcgT8_gK4|2BBc-ZOa2-qnj~
zWg7bpT^|}$N+8)L++gW3g(url;XXsRDP!>+{&Wpn9xuI1sYO@+R=A_EybfHcoRy!U
zAF8+DrsOpG?0f2`F_C`kbGr69Dx_@_IL!4SQ#(aPbkOI<YF`9*%;)N~hrxNjrvn#h
zU&-TUXkQ0+k8inEdlAif#N$xROW<B|gngRWbQGm|_ot_c!=$K1xa&g)wX@(>dYm|>
zaKrK}*{_^l%JZwBpXDsyrV1*l8@3!zCwz`G)X;r(xF4g12>LGA(|M-#bTJ<teld--
zR5-R&lt$X^>o|Q2oyfCnrTaX~&^J(aD}6iX7r|P3JI`+#?dF%MY>F9lZ38Fd6eU=>
zpB2vQnc4KV&vD&zh#JK*^j}&DxDuaxQyZ(yA^u>OjX9U5dpg9tj^@%zU&m$7r)R(+
zzt`Oh>E)bhwX%>x6TL8OdKq0S-1VVR`dMrzxB6VA-mEO6`+Tkry5;n!&rOAHIh_{H
zYs3m_X_B&~m{qixImb`mLF;nL4yA(*3ioa52&@BlpKyb;Gti-|p*Q7jah#3?Y6&l*
zcu6E|+II!Ip{w?}e+G92P4~I41bUS9bj0VL2pmwZqz=5WA^#vf57Q0w4Bi1b%<JH;
zqCX0EeW=|yi?g5*FR;80E*CECa~q6iWiw6jxsO8ENsE2XhOUz~_}l<=Tj;Ysca!lV
zxCcGXL1zpqTj+m0mRvY)r(%4HLqa+UZU;5`-2KKUly2JWa}R^tNhf^no5rV<UG$*O
zJtf>T9v2D*U!-01y2l}(3roTaBWJ*WSMN}EQ;E--!Ml|`v{*RaOzu<m(g%2t;GU@r
zenGLQ1+UuKtp)EM*m?#+j5h*RIxh5qFw=*C8eI!i=!i%@CiGFEUs73ngOevZ0UDw_
ziATRI4jfdIpt>K_3*_0H`8#aRip?)1&aZ(w9SCFo2PCL*fuNoPn`$s+2X0f~0+#0>
zSH<Qpm#9V9277vbH0OfhaQ*t5;rRbiiliLb)%m?rE^)?6$|@kYcw~be934`-*Nt9K
z5A)@JKB6^}{_;XDbUjd^e0sA;7*+B{JztwgJCvVtV~icP05#eP)X4@0=o+9xtW{`G
z@TNRGmPdPXo{S2efP7@M@dihmZycgyO0zNubeff$@K~o{JAvp<!Oshx5`0MTF~KJU
zzbp7X!7#8xsREYKkLd2ukn$sXEcB@I4kV8QzaM%U=LJW8hu#Q13;bQ^1tlz!u%d?_
zcIX`{3ZDXw4nGX64!;O&3V&ZQmA3H9z{|pCkYG*t7jW(hcPQ@()+u|#wNyv9gcqoc
zOVl#uj__HUBsc>JIuw?#h4y#h4Qds|BRkYEu}u~6j!-70JKfk~J5W7uw39?ML$FP-
zQ?OldmEd~8Hf36*LupqwM)s+zlwFal)fv<mDWe%Q5NTG{BmDp*Cn87HPURFNZORjo
zo7FbuOyo9opRy)=hk6J$52$UJe+6HHB3i&3X0o7+20eu`vEa*)Uj#`f%`Z5rwiDBB
z3MW`a8w%C|dx34rEd}3DSJ7ug@_^ts3!YT(M4V?4;U@(@RLkfsM8iF)kg>S%46v;5
zD74PF!gb0+FzrwtQ<fM0N_|ZENMS9lqAi6TNZ=IyR((QY`n!Tpp!PqgRnp04;nl31
zRbDGpv|mCV)K*a<8q?lGf0Sr-=%+Fa5O=tuE{IOn%2c-RRQjT4sZ1S=UaZxrw>Z&H
zDOKvJ=zMLG8jrL?^mKHkHUsoptxaX;cJ(LGjd1>Dbeq;mT5OlL3fg_3i(^-7ijt0<
zrS<B%*kLV%mz0a}&)8CI?jgK%%mt<iM>$o~5@3c_02}eD6T+osJ#Y#+SK%?8wgNAv
z9l*J?2e^Q2;8F>+QUY~Ih;_vFA4nQfIE}8%#fwP+J*73_-I#H!;4Hy%!O4P`34TOy
zzTj$lYMz!>CL_>X!Oen?2UzmDAQ?=j1u6KXI*Z;?R;pXoJ?hWYG1@1!2eilCL2H6@
zuTqc0XrcBbaJlv!;2P~TaJTj<@Z;Lgf!`7QgT|I^I!hJ_K5sDneZiLnUl)ACVBf~z
ztJp;p>_{pu$N^vk_huDM4g+I&sub_WE18NnyCPsM?zIX{5Nt-DsOTTY7F=)@ngmpF
zX-k1_!y;7CyL^G4PvxNJ2`<33RmH$n0+(UA>PL7xBYGwD!d33AJ(ruGQ{Te&>-|`9
z=g{waKA{wE@9NvMqGxG$Zyz;n?X&Emd+g^lqi6U2?c25t?L2U^GHG7>@&)rYEo)oU
zKA${#?ZV4fx35@E>^tAuzqgMTb@i=;OZVP+huXIdjX&6{6mHu>s}J?|b?s?tU*UfG
zP*vf)?!BG%q075Ew{_X>mk-@FwBedxX^wBx(RHw|>GH1a`*(NR3lH|#UA?{C*4|!%
zsOz94y0m+D*YeIiU9_yTZ|e?PWLx`tM6r7R)~zu2B=fD^ySujb!B=!*)l2g`d;0d<
zUFRuTS_N@VPu|xZns4ph+S!NPJ-a)%x~m2z6>v+JAxY=<F85Od-R}DXHExx&W9Uhz
zDd1FXp>EoXH-3w@W5H~oZFtqL!?Ou@w%w4?o=dSIb%XALE=_%~Ow&iji+Rt#6YJ*?
zxNWfQ!`~MC^}?gkw`K3WknO=UP5VLHpte$m)9yvEYrt;9&{KgIa2rBUn2Qi<j{Cc#
z)$ScmJjj_5&Hc^M7o6sH_#Qym-4Jpydq8goy%qEVOs+Ka`yt(e=r&Q!8t}XDXVKNb
ztjz(@_QKDClxjRrKM}0D(Ude|T8LpIUJshczv72BUE!PvJ-+lr@pq>$JNgsNeet@I
zxSpoCsizesgjEv{#o|kcKD=(GqAYc%+%SI(KCr}>#zN^pC>9C@LOS-!7~AcOnfu)n
zH#DTy1!u+g#Sg{tB@|!j<BP+=fEqt?o%`|)bKKE4zM>_A5%*6wRyamli4U5w0J061
z2{S4rOocF2_$H>s@H5i<@KkjHIMskw@F=E$IT(l!hGQ{vaFRJVwJaDGK@@T0gQMbu
z74gBUSp3LfEEO!4nwExx;cy^O5eSFfbvG3!D1A~oLf{gn)5oilYRk!?+irSW9g5w0
ziBj;wRj<h91ka%>j!#pf(=fGKu@kq_G-?^T>$W-PiQG5bS?3uwpZHOMx^niAdCzZ(
Ij<*E=AB=?L^#A|>

diff --git a/plugins/BinLogReader/Form1.cs b/plugins/BinLogReader/Form1.cs
index 91f0dfd3..e4a24e6b 100644
--- a/plugins/BinLogReader/Form1.cs
+++ b/plugins/BinLogReader/Form1.cs
@@ -5,7 +5,6 @@
 using System.Windows.Forms;
 using System.Data;
 using System.Text;
-using System.Text.RegularExpressions;
 
 namespace BinLogReader
 {
@@ -61,7 +60,6 @@ protected override void Dispose( bool disposing )
 			base.Dispose( disposing );
 		}
 
-		private PluginDb plugdb;
 		private BinLog binlog;
 
 		#region Windows Form Designer generated code
@@ -250,7 +248,6 @@ static void Main()
 
 		private void Form1_Load(object sender, System.EventArgs e)
 		{
-			plugdb = null;
 			binlog = null;
 			g_UpdateViews = ViewAreas.Update_All;
 		}
@@ -281,8 +278,9 @@ private void UpdateViews(ViewAreas v, BinLogFlags b)
 
 			if (v == ViewAreas.Update_All || 
 				((v & ViewAreas.Update_Plugins) == ViewAreas.Update_Plugins)
-				&& (plugdb != null))
+				&& (binlog.GetPluginDB() != null))
 			{
+				PluginDb plugdb = binlog.GetPluginDB();
 				PluginList.View = View.Details;
 				PluginList.Columns.Add("Number", 60, HorizontalAlignment.Left);
 				PluginList.Columns.Add("File", 100, HorizontalAlignment.Left);
@@ -333,25 +331,7 @@ private void MenuFileOpen_Click(object sender, System.EventArgs e)
 
 			try
 			{
-				/* try to open the accompanying database file */
-				Regex r = new Regex(@"binlog(\d+)\.blg");
-				Match m = r.Match(ofd.FileName);
-				if (!m.Success)
-				{
-					throw new Exception("Failed to find binary database, filename unrecognized!");
-				}
-				Group g = m.Groups[1];
-				CaptureCollection cc = g.Captures;
-				Capture c = cc[0];
-				string dbfile = r.Replace(ofd.FileName, "bindb" + c.ToString() + ".bdb", 1);
-
-				plugdb = PluginDb.FromFile(dbfile);
-				if (plugdb == null)
-				{
-					throw new Exception("Stream failure in database file");
-				}
-
-				binlog = BinLog.FromFile(ofd.FileName, plugdb);
+				binlog = BinLog.FromFile(ofd.FileName);
 				if (binlog == null)
 				{
 					throw new Exception("Stream failure in log file");
diff --git a/plugins/BinLogReader/PluginDb.cs b/plugins/BinLogReader/PluginDb.cs
index 9c464a26..9621b7fc 100644
--- a/plugins/BinLogReader/PluginDb.cs
+++ b/plugins/BinLogReader/PluginDb.cs
@@ -10,8 +10,6 @@ namespace BinLogReader
 	/// </summary>
 	public class PluginDb
 	{
-		private static uint BINDB_MAGIC = 0x414D4244;
-		private static short BINDB_VERSION = 0x0100;
 		private ArrayList PluginList;
 
 		public int Count
@@ -40,72 +38,38 @@ public Plugin GetPluginById(int id)
 			return (Plugin)PluginList[id];
 		}
 
-		public static PluginDb FromFile(string filename)
+		public static PluginDb FromFile(BinaryReader br)
 		{
-			if (!File.Exists(filename))
-				return null;
-
-			System.IO.FileStream stream = File.Open(filename, System.IO.FileMode.Open);
-			if (stream == null)
-				return null;
-			BinaryReader br = new BinaryReader(stream);
-			if (br == null)
-				return null;
-
-			PluginDb db;
-
-			try
+			//read plugins
+			uint plugins = br.ReadUInt32();
+			PluginDb db = new PluginDb(plugins);
+			for (uint i=0; i<plugins; i++)
 			{
-				//check header
-				uint magic = br.ReadUInt32();
-				if (magic != BINDB_MAGIC)
-					throw new Exception("Invalid magic DB number");
-				//check version
-				ushort vers = br.ReadUInt16();
-				if (vers > BINDB_VERSION)
-					throw new Exception("Unknown DB version");
-				//read plugins
-				uint plugins = br.ReadUInt32();
-				db = new PluginDb(plugins);
-				for (uint i=0; i<plugins; i++)
+				byte status = br.ReadByte();
+				byte length = br.ReadByte();
+				byte [] name = br.ReadBytes(length + 1);
+				uint natives = br.ReadUInt32();
+				uint publics = br.ReadUInt32();
+				int id = db.CreatePlugin(
+					Encoding.ASCII.GetString(name, 0, length), 
+					(int)natives,
+					(int)publics, 
+					status,
+					(int)i);
+				Plugin pl = db.GetPluginById(id);
+				for (uint j=0; j<natives; j++)
 				{
-					byte status = br.ReadByte();
-					byte length = br.ReadByte();
-					byte [] name = br.ReadBytes(length + 1);
-					uint natives = br.ReadUInt32();
-					uint publics = br.ReadUInt32();
-					int id = db.CreatePlugin(
-						Encoding.ASCII.GetString(name, 0, length), 
-						(int)natives,
-						(int)publics, 
-						status,
-						(int)i);
-					Plugin pl = db.GetPluginById(id);
-					for (uint j=0; j<natives; j++)
-					{
-						length = br.ReadByte();
-						name = br.ReadBytes(length + 1);
-						pl.AddNative(Encoding.ASCII.GetString(name, 0, length));
-					}
-					for (uint j=0; j<publics; j++)
-					{
-						length = br.ReadByte();
-						name = br.ReadBytes(length + 1);
-						pl.AddPublic(Encoding.ASCII.GetString(name, 0, length));
-					}
+					length = br.ReadByte();
+					name = br.ReadBytes(length + 1);
+					pl.AddNative(Encoding.ASCII.GetString(name, 0, length));
+				}
+				for (uint j=0; j<publics; j++)
+				{
+					length = br.ReadByte();
+					name = br.ReadBytes(length + 1);
+					pl.AddPublic(Encoding.ASCII.GetString(name, 0, length));
 				}
 			} 
-			catch 
-			{
-				db = null;
-				throw new Exception("DB file is corrupt");
-			} 
-			finally 
-			{
-				br.Close();
-				stream.Close();
-				GC.Collect();
-			}
 
 			return db;
 		}