From 14d1020292738677ce97ce6ded013301149a567f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 28 Apr 2015 13:59:48 +0200
Subject: [PATCH] Fix uploader

---
 .../src/com/jpexs/uploader/Uploader.java      | 139 +++++++++---------
 uploader.jar                                  | Bin 10307 -> 10289 bytes
 2 files changed, 68 insertions(+), 71 deletions(-)

diff --git a/libsrc/uploader/src/com/jpexs/uploader/Uploader.java b/libsrc/uploader/src/com/jpexs/uploader/Uploader.java
index 0fb28492e..23ce2cafb 100644
--- a/libsrc/uploader/src/com/jpexs/uploader/Uploader.java
+++ b/libsrc/uploader/src/com/jpexs/uploader/Uploader.java
@@ -33,6 +33,7 @@ import javax.swing.UIManager;
 public class Uploader {
 
     private static class MultipartUtility {
+
         private final String boundary;
         private static final String LINE_FEED = "\r\n";
         private HttpURLConnection httpConn;
@@ -53,7 +54,7 @@ public class Uploader {
             this.charset = charset;
 
             // creates a unique boundary based on time stamp
-            boundary = "===" + System.currentTimeMillis() + "===";
+            boundary = Long.toHexString(System.currentTimeMillis());
 
             URL url = new URL(requestURL);
             httpConn = (HttpURLConnection) url.openConnection();
@@ -155,125 +156,121 @@ public class Uploader {
             }
             reader.close();
             httpConn.disconnect();
-            
+
             return status == HttpURLConnection.HTTP_OK;
         }
     }
-    
+
     private static List<String> types = new ArrayList<>();
     private static List<String> names = new ArrayList<>();
     private static List<String> values = new ArrayList<>();
     private static List<String> labels = new ArrayList<>();
 
     public static void main(String[] args) {
-        
-        if(args.length<1){
+
+        if (args.length < 1) {
             System.err.println("1");
             System.exit(1);
         }
-        
+
         String charset = "UTF-8";
         String requestURL = args[0];
-        
-        
-        for(int i=1;i<args.length;i++){
-                if(args[i].equals("-field")){
-                    types.add("field");
-                    names.add(args[i+1]);
-                    values.add(args[i+2]);
-                    labels.add("");
-                    i+=2;
-                }    
-                if(args[i].equals("-emptyfield")){
-                    types.add("field");
-                    names.add(args[i+1]);
-                    values.add("");
-                    labels.add("");
-                    i+=2;
-                }  
-                if(args[i].equals("-textarea")){
-                    types.add("textarea");
-                    names.add(args[i+1]);                    
-                    labels.add(args[i+2]);
-                    values.add("");
-                    i+=2;
-                }        
-                if(args[i].equals("-file")){
-                    types.add("file");
-                    names.add(args[i+1]);
-                    values.add(args[i+2]);
-                    labels.add("");                    
-                    i+=2;
-                }
+
+        for (int i = 1; i < args.length; i++) {
+            if (args[i].equals("-field")) {
+                types.add("field");
+                names.add(args[i + 1]);
+                values.add(args[i + 2]);
+                labels.add("");
+                i += 2;
             }
-        
-        List<JTextArea> texts=new ArrayList<>();
+            if (args[i].equals("-emptyfield")) {
+                types.add("field");
+                names.add(args[i + 1]);
+                values.add("");
+                labels.add("");
+                i += 2;
+            }
+            if (args[i].equals("-textarea")) {
+                types.add("textarea");
+                names.add(args[i + 1]);
+                labels.add(args[i + 2]);
+                values.add("");
+                i += 2;
+            }
+            if (args[i].equals("-file")) {
+                types.add("file");
+                names.add(args[i + 1]);
+                values.add(args[i + 2]);
+                labels.add("");
+                i += 2;
+            }
+        }
+
+        List<JTextArea> texts = new ArrayList<>();
         List<JLabel> textLabels = new ArrayList<>();
-        List<Integer> textIndices=new ArrayList<>();
-        
-        for(int i=0;i<types.size();i++){
-            if(types.get(i).equals("textarea")){
+        List<Integer> textIndices = new ArrayList<>();
+
+        for (int i = 0; i < types.size(); i++) {
+            if (types.get(i).equals("textarea")) {
                 JTextArea t = new JTextArea();
-                t.setPreferredSize(new Dimension(400,100));
+                t.setPreferredSize(new Dimension(400, 100));
                 texts.add(t);
                 textLabels.add(new JLabel(labels.get(i)));
                 textIndices.add(i);
             }
         }
-        if(!texts.isEmpty()){
-            JPanel pan=new JPanel();
+        if (!texts.isEmpty()) {
+            JPanel pan = new JPanel();
             pan.setLayout(new BoxLayout(pan, BoxLayout.Y_AXIS));
-            for(int i=0;i<texts.size();i++){
+            for (int i = 0; i < texts.size(); i++) {
                 textLabels.get(i).setAlignmentX(0f);
-                pan.add(textLabels.get(i));                
+                pan.add(textLabels.get(i));
                 texts.get(i).setAlignmentX(0f);
                 pan.add(texts.get(i));
             }
-            
+
             try {
                 UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
             } catch (Exception e) {
-               
+
             }
-            
-            if(JOptionPane.showConfirmDialog(null, pan,"Enter values",JOptionPane.OK_CANCEL_OPTION,JOptionPane.PLAIN_MESSAGE)!=JOptionPane.OK_OPTION){
+
+            if (JOptionPane.showConfirmDialog(null, pan, "Enter values", JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE) != JOptionPane.OK_OPTION) {
                 System.exit(1);
             }
-            for(int i=0;i<texts.size();i++){
-                int index=textIndices.get(i);
+            for (int i = 0; i < texts.size(); i++) {
+                int index = textIndices.get(i);
                 types.set(index, "field");
                 values.set(index, texts.get(i).getText());
             }
         }
-        
-         try {
+
+        try {
             MultipartUtility multipart = new MultipartUtility(requestURL, charset);
-             
-            multipart.addHeaderField("User-Agent", "JPEXS Uploader");             
-        
-            for(int i=0;i<types.size();i++){
-                if(types.get(i).equals("field")){
+
+            multipart.addHeaderField("User-Agent", "JPEXS Uploader");
+
+            for (int i = 0; i < types.size(); i++) {
+                if (types.get(i).equals("field")) {
                     multipart.addFormField(names.get(i), values.get(i));
-                }        
-                if(types.get(i).equals("file")){                    
+                }
+                if (types.get(i).equals("file")) {
                     multipart.addFilePart(names.get(i), new File(values.get(i)));
                 }
             }
-             
-            
- 
+
             List<String> response = new ArrayList<>();
             boolean ok = multipart.finish(response);
-             
-             
+
             for (String line : response) {
-                if(ok){
+                if (ok) {
                     System.out.println(line);
-                }else{
+                } else {
                     System.err.println(line);
                 }
             }
-            System.exit(ok?0:1);
+            System.exit(ok ? 0 : 1);
         } catch (IOException ex) {
             ex.printStackTrace();
             System.exit(1);
diff --git a/uploader.jar b/uploader.jar
index 388bbe807f0942e32bf927749b1600f7d89c35f8..0793f1ace0c7a8e33de6823d1aaa9972c553d861 100644
GIT binary patch
delta 2711
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
Ya0Bw`-y^Uhg@Kt?c22r$be0_X4}uUgasU7T

delta 2670
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
J_v~CX>sxxRC{F+Y