From 9b558341bc348212a2b80170cdc76fa9a3b5a334 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Tue, 30 Apr 2019 23:10:01 +0200 Subject: [PATCH] update nikiroo-utils, better rec/send remote server info --- libs/nikiroo-utils-4.7.2-dev-sources.jar | Bin 319591 -> 320004 bytes .../fanfix/library/RemoteLibraryServer.java | 25 +++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/libs/nikiroo-utils-4.7.2-dev-sources.jar b/libs/nikiroo-utils-4.7.2-dev-sources.jar index 1e960e954c8d031ad642643fbb52d1058330cb0a..604c7611fbf7593d2b6a9e9c246fb48e8ca33fd4 100644 GIT binary patch delta 8643 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 delta 8248 zcmZ9R1yoeu7w=&h7(hUB=terFK|<;74(Ub_qy!lnB&4}CNF&|SA>Ae2AqbL6O1$Cm zfBt^IH*3wh>-*XJ>~rqEC+`jH!rN}g!%$T~0^=i~qM{;D0WlcDAS%F5E=UfsRt~gU z4iZQNSSmo0Fum6c0@yx@Fk~H-6KN;M0+oI%_sOhw_PX9|rOdFbtS9r@InnHL+v00? z%WF?G>Nf3Lic&v|n%J`QPj(k8up#X_|k4KW9uY_@xcrg zLj7-~JG#8)usRwoZME^RZOX-=jf0!ByF~u6rZzA#Jg|UL!eMA=jRI7p%$ta%+Pu`t z!Lm!6x=AnMg;-GMSw94uDrSn1=2lcg{yT9Ec(_e*VsL1nM(7R+iuzVIT z&!UB)x}(Be^~njYjRnOuYjy`p%Q8L%W@Y(_aAoCHEy-14v0g4*T_su;mGK`{k-4}r zj1B$?OtRA(adpCGK-YU>j--qXPEBpxc&VScvW@|; z%_qHRmyafSLWZ;r1du`YS0?>GtCrYR?e`(MzKc(=C^l$16O_ky1*1I16Rtbvej1?+ z{GQK=s2e3x~WJ)PuZliS`cldLuJ@I?YY*J?3eCc_72B~FIl6O*;Z-Q z=sYErtI+DTr`}a?KYu%35PIlyfHxX56x zNF76%^$M{%P~8r#Ch>=O&|7399D1stRsDg>&k~*FerF$63!Llv4W$mB&hQ?f1^nt> zcH%`4ttMo$-l3QEN+Pl~RDBfV^_(MB?vCSK9zAC?mMy;W@5&P@Q$?;h9(@b4br^>4 zej0OHB|Wp^q}wDOrckg(&<|c5P)6Y=y7Ywa#)7JrtCO!j#IPmHJ4_+xjB_oKQM^=f zNxnp2s*~>9z{ENE^1SbcDi`Nlo@NgL*58W2lmmaL&z{)KPhc5-`_QC9CG~jl^|71J)VBdm(3>+NKd)hno2sB7TXBH+)C>0 zCoBE=?SvAidCC9O601Q}+B%-CAL)87317^-uIMgW&zc`z4j!WyTl%xg7nV(UF!6NX zg~!Mw!Cm*f-7a}VxI|}MWWe+$q<7egXUW8zJ0*i*n>s3AhidaU81?dEBZ46;df2A1 zW7>-6{l)4Zn;csRSK0=oD|qKCtVw6#tB1?jjVQ!uw00L#wszSqMxDaDdL8HIB8Z9p znF{q=d9L~E=V~v4WR`JNBlFTiZyCGe=dk}ix%o?xolI7RYhY-leVdEUWQSy~i(*_{haaeP*CHrZDkLCRDvV!F%H!t(~X4XJ{|MD{Ix982H3B5g1RRsv@3zh~CDHH^R8iD$+bs!E+01X=n8xX7j5df=0 zV0?h(5fTPWTOo>uA6wM@E-cpBRvJ}1j6Nh7}mT*=K^ZAkb> z*%j0Gs8D1qzn_?;+gSRk_?=V9xY^je(dV|KG<~H3_VT@=$iDMC7mZHL>(-|@HCkLC zCjG@M1sr_IOJqS@S(XHG7RYp0AQn{A_iW^omHpf0Zw{>4#RZ7GDQy0kFuFHs6{`i` z32!}qqrvFRH&1@0^S;95FuRlcNMVvkL#JZtH!oTGB9gaIDjQ)wR8q?F{ae6(g=3Xrph#3SaMZG+o2hU9y?8?O zz?zf0c6fRvU&vTO*Ow3&CJy|rSL<3EpZ zuI6)Y{8Ri&!F4xfZHb6+ga10znOi~TW>#XauLL#|7S3Z~yJnyxQENclGSH%BXe;l( zduOd6OV?eh2E3D)W91U@>Mx+YBRK~KHhUg{5-hnwB9uek$N6R_{H$4V(6?rE^3%42 z9$l>6{5j5JqC5BM#3e9pGWWe@4jInsQ=YbUQi zH~UGTi=e1&m%Jlw1eqQkOc=<|pX{Sj5y7~5G?7bkiAg*clyJ2)M zyX6-1R!xtSj-^;a4g&&Y*LaI?2Ct}iSZ_5$pb61ak@U_M-XTZh#?BFn*dB?eIpB zr=!W^9YlzL{Uq8S|0Vst_ewn{whTuEyMyRTH(SG2$Zh6A!{)acX#u_VjfToE(S8}_ zj~WpB{Z0ohGg^7NjR}wN423#doPUJVW*4u0@y;vaJg|cf4MZ zXgP5@$#P?GfGxc$ujFV$c`p1%&Ej;=yJNZKeoNcL@|Bz4f;zPvk*%`RH7A2Gd!e_E zCk9(G+A7cP3SZaG{m6{`g|qLrAm091`}?kSQFz#gbc;$S zmeH8V-s5?buklZW8``NQjIgjx_k=Cllsa3W|8e!}N}K3T)@oorjOQ#?srZ@r<*5D& za_wQ?{0_0pcMB-~JXP=i+6SBT2P}}Es)kV>P%tQb(N_zZj?|z*nx0=x5BxRpPHOSG zZ0K9s&PE%{+y!P|P<`;BwMK(8#lg?7r%77ggXfXc&dBxGPt&KM7K46Ox`4j+`uu|W zN~l3C#Hhp0lc7a^re^VT`0c!KV{Ku()w;S(?IV?{%c9Z-TOPyT!?PbYVqmjUfi5_e z>Rx`(DEIP+BK#y4n?18H*`fdi#~Y^UD(BBK9DVq4B^W=A_gkC~=i0fxZLIU!@QFgb z(#2icAuCUf*P5~wl-py=OFDC6>yTwUyO+;m$;wVij*>8Od|R|{iq%FqK7elAwG>$D zJI8^Y-q-Dsx-sGiB4pQ$LNKd@*CqLmv9oI%)jx8772xPeDnE@Xu_zr@e#wPZWu&L& zP={@AL-%z;eC#lyg`g>tCV7JD3NL-&JH!u%tyrEw!ZIr-;zs}#QVq`f!cLH{s!*>C zw(wSDF!o9~$|Cfcfmu?7nts3nKFxyTfcIA?YOcWN-l2w^QEY3gMoh3j+Y?@kjCbLm zQoCX$=+2@Lkt7Ns9pFL6l8J_;8DrnHx8;it^^xq)Ejo)z48!XwSDN*H%Q2ZWLrg%H zamd)V?QzsZ2qN*|jlxkMilWKaC3Au}9q%&Xn>Sx$D>mcI7Q6v{^SH0(2%@=F`QgpC zQhnJK=)OZoahPOZ#YoB%0Dh+ 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 diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java index 0893746..62548d6 100644 --- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java @@ -4,7 +4,9 @@ import java.io.IOException; import java.net.URL; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.net.ssl.SSLException; @@ -50,6 +52,9 @@ import be.nikiroo.utils.serial.server.ServerObject; * @author niki */ public class RemoteLibraryServer extends ServerObject { + private Map commands = new HashMap(); + private Map times = new HashMap(); + /** * Create a new remote server (will not be active until * {@link RemoteLibraryServer#start()} is called). @@ -68,8 +73,8 @@ public class RemoteLibraryServer extends ServerObject { } @Override - protected Object onRequest(ConnectActionServerObject action, Object data) - throws Exception { + protected Object onRequest(ConnectActionServerObject action, Object data, + long id) throws Exception { long start = new Date().getTime(); String command = ""; @@ -94,14 +99,22 @@ public class RemoteLibraryServer extends ServerObject { Object rep = doRequest(action, command, args); - String rec = StringUtils.formatNumber(action.getBytesReceived()) + "b"; - String sent = StringUtils.formatNumber(action.getBytesSent()) + "b"; - System.out.println(String.format("[>%s]: (%s sent, %s rec) in %d ms", - command, sent, rec, (new Date().getTime() - start))); + commands.put(id, command); + times.put(id, (new Date().getTime() - start)); return rep; } + @Override + protected void onRequestDone(long id, long bytesReceived, long bytesSent) { + String rec = StringUtils.formatNumber(bytesReceived) + "b"; + String sent = StringUtils.formatNumber(bytesSent) + "b"; + System.out.println(String.format("[>%s]: (%s sent, %s rec) in %d ms", + commands.get(id), sent, rec, times.get(id))); + commands.remove(id); + times.remove(id); + } + private Object doRequest(ConnectActionServerObject action, String command, Object[] args) throws NoSuchFieldException, NoSuchMethodException, ClassNotFoundException, IOException { -- 2.27.0