From 41f5b5e9c526cf616133f99053f2c4b4d03c77cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 8 Nov 2014 17:57:22 +0100 Subject: [PATCH] ant uploader improved --- .../src/com/jpexs/uploader/Uploader.java | 130 ++++++++++++++---- uploader.jar | Bin 7677 -> 10220 bytes 2 files changed, 102 insertions(+), 28 deletions(-) diff --git a/libsrc/uploader/src/com/jpexs/uploader/Uploader.java b/libsrc/uploader/src/com/jpexs/uploader/Uploader.java index c2d7895f7..b20d84abf 100644 --- a/libsrc/uploader/src/com/jpexs/uploader/Uploader.java +++ b/libsrc/uploader/src/com/jpexs/uploader/Uploader.java @@ -5,6 +5,7 @@ */ package com.jpexs.uploader; +import java.awt.Dimension; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -18,6 +19,12 @@ import java.net.URL; import java.net.URLConnection; import java.util.ArrayList; import java.util.List; +import javax.swing.BoxLayout; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTextArea; +import javax.swing.UIManager; /** * @@ -132,31 +139,31 @@ public class Uploader { * status OK, otherwise an exception is thrown. * @throws IOException */ - public List finish() throws IOException { - List response = new ArrayList<>(); - + public boolean finish(List response) throws IOException { + response.clear(); writer.append(LINE_FEED).flush(); writer.append("--" + boundary + "--").append(LINE_FEED); writer.close(); // checks server's status code first int status = httpConn.getResponseCode(); - if (status == HttpURLConnection.HTTP_OK) { - BufferedReader reader = new BufferedReader(new InputStreamReader( - httpConn.getInputStream())); - String line = null; - while ((line = reader.readLine()) != null) { - response.add(line); - } - reader.close(); - httpConn.disconnect(); - } else { - throw new IOException("Server returned non-OK status: " + status); + BufferedReader reader = new BufferedReader(new InputStreamReader( + httpConn.getInputStream())); + String line = null; + while ((line = reader.readLine()) != null) { + response.add(line); } - - return response; + reader.close(); + httpConn.disconnect(); + + return status == HttpURLConnection.HTTP_OK; } } + + private static List types = new ArrayList<>(); + private static List names = new ArrayList<>(); + private static List values = new ArrayList<>(); + private static List labels = new ArrayList<>(); public static void main(String[] args) { @@ -167,32 +174,99 @@ public class Uploader { String charset = "UTF-8"; String requestURL = args[0]; - - try { + + + for(int i=1;i texts=new ArrayList<>(); + List textLabels = new ArrayList<>(); + List textIndices=new ArrayList<>(); + + for(int i=0;i response = multipart.finish(); + List response = new ArrayList<>(); + boolean ok = multipart.finish(response); for (String line : response) { - System.out.println(line); + if(ok){ + System.out.println(line); + }else{ + System.err.println(line); + } } - System.exit(0); + System.exit(ok?0:1); } catch (IOException ex) { ex.printStackTrace(); System.exit(1); diff --git a/uploader.jar b/uploader.jar index 2713c6011fdf6431a152c8acd266a82a8fbebb3f..d012a93f77cb43b02e3e4cf42ec496b12a175f76 100644 GIT binary patch literal 10220 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 delta 3185 zcmZuz30PFu75?AwX5O2}0}%uY2#lzR$cW+&V!$mfhzKslEh3CM3Ih&<(Z*zIHP)&z z;x&s|jbbs07}Pjui7{$4M$;rUZDZG%q-~6i>Aoc2m(u?}_)xwt@0&UIymQVy=iIZs z`^D^U@*+xRhN%Xi17Ef*X^hB-xZSd3%Kz+JKfey(dgH`mC8x15#_nD|d_+#;%a0GF z)D&{MAC*{TZB2F$Jz|A2FpQF7mohX`?yz4pN}bVwGg@3x3WNVOFd3Vj=!Y#D9ySn$ z%{sQq^@j$w;YSkNF2N2dvs1$(2EwsRf=4y%mc&K_k=P@FkYKNl$8Ijw3o+3>?KP zI$AXxGmwSj5}YvbDo#p3$t;9)v}rhHU<5YH?ICIUw1%H(XqV_~2FBuyfiZYpg0tcM z@CMFF)RH`};ew7g<#8_>D8Mcamrlfo9a6+u_2Y;p4R2|^8|vs$N=-v`z*|@0 z4~RM~KJ3?+BZeiq^xxpOCW6#et*RV89x)Z z@uh+|(c2Lx@|`J*|AN0t(|?oT?nx((y89}_T_yE3^8cmeb9U9J)|p$RL((cyB^|NjQ!1WH#}6`TD`-}w>IpRB zC9j16T}>kn8Ud1F>mW(fP@}=8q1J+R8rD)}-yRY4cSUel?|dtQkyd0jVgPeA1P|R6 zt*mbEvbv*{)g7&R1h}&lP-^IoolYES$B6Paj4Tqa=-l9_%vaGXgwgqZd*kwc6trVZ zc{|3Icaq1oA-4^A#Y(Q~4q<$Gu6hZ*h9sz`k#EC-=8oH>PUsZ9rx_{jDB$KWYFDER zLvZvBVPXi*HcUD@q?M*s78)=SQH0xA65A2%!)%YoPFCWhtf<}ew2`OS!|(})Z7;L; z7&hSvJd7tPwU1IyF}%-O=O4-QtYSnOu#RV3!|u7CiI5e0q$?&mny{YPSE#!J-=mBT z50Gz?V)4A#NL1z~32F!Vb}KgzDjFVQa)8*c5RrISW`Y#8;rsk=valau0at@c`mq4! z!|3t7oRWVdzJxQLb6)I@85Z1VFwKQdhG3G8$%gE5gD>~$n5JR6!D^eKW2TNGiO$kd zY#<)9af;i+tt&!$%1X52PTtxzbUgv|E-C7*T^)PORD;|X-!WafJ;0d?h+Rg zTg5BMd7?h4pSYD=^sOJ*87afmu#CYA#rl+S%aWKK`Pi6Fp4>_*I4*f~Qtg>-P>xyb zG(v-7azd-z)SsBFDLH`$U?5i~(m82mRY1ATRLMDVPRvP72)08j&l=JOz1SV?j5b0D zS4XR{YUb+)P@Ea7=0uwzMC?PHn=k6J976lDoDd?ns5XnuZY4Xpi`|Z>@=lR9^bR4K zQd?A|x#Ji+GbUG+t=dOHu06qi8nFr+D3~bGIE7c0_*}p@7`;#6Rj7?n~b(pjFMN*G20!KNQTKP>mhC&?Y^g6*F zJ<0hSVpp~?U#;w#GuRrW;X^pbF?gP&3pDT+*>B<$F5)#@BKNWt&Qdn$P>zEP45s-* ze9NQ(2YHRWnz`BVTge}aY;sSLJB**UFd1azFk@_7IyI6zvept5fi}we`IijqF`9BWZkx&2t