fix url encoding

Author: robin4002

build.gradle

@@ -28,7 +28,7 @@ repositories {
 
 group = 'net.minecraftforgefrance'
 archivesBaseName = 'installer'
-version = '1.0.8'
+version = '1.0.9'
 targetCompatibility = '1.6'
 sourceCompatibility = '1.6'
 

build.gradle~

@@ -0,0 +1,111 @@
+apply plugin: 'maven'
+apply plugin: 'java'
+apply plugin: 'eclipse'
+apply plugin: 'idea'
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'net.sf.proguard:proguard-gradle:5.2.1'
+    }
+}
+
+repositories {
+    mavenCentral()
+    maven {
+        url "https://libraries.minecraft.net/"
+    }
+	maven {
+		url "http://files.minecraftforgefrance.fr/maven/"
+	}
+    flatDir {
+        name "fileRepo"
+        dirs "repo"
+    }
+}
+
+group = 'net.minecraftforgefrance'
+archivesBaseName = 'installer'
+version = '1.0.8'
+targetCompatibility = '1.6'
+sourceCompatibility = '1.6'
+
+dependencies {
+    compile 'net.sf.jopt-simple:jopt-simple:4.5'
+    compile 'argo:argo:2.25_fixed'
+    compile 'com.google.guava:guava:14.0'
+    compile 'org.tukaani:xz:1.3'
+    compile 'net.minecraft:launchwrapper:1.9'
+	compile 'utybo:minkj:1.0'
+}
+
+task fatJar(type: Jar, dependsOn: jar) {
+    inputs.file jar.archivePath
+    from(configurations.compile.collect { zipTree(it).matching { include '**/*.class' } })
+	manifest { attributes 'Main-Class': 'fr.minecraftforgefrance.installer.Installer' }
+}
+
+fatJar.doFirst {
+    from zipTree(jar.archivePath)
+}
+
+task shrinkJar(type: proguard.gradle.ProGuardTask, dependsOn: jar) {
+    inputs.file fatJar.archivePath
+    ext {
+        outDir = file("${buildDir}/proguard")
+        obfuscatedJar = "${outDir}/${jar.baseName}.jar"
+    }
+    outDir.mkdirs()
+
+    injars jar.archivePath
+    outjars obfuscatedJar
+    libraryjars configurations.compile
+    configuration 'proguard.pro'
+}
+
+task shrinkOutput(type: Jar, dependsOn: shrinkJar) {
+    classifier = 'shrunk'
+    from zipTree(shrinkJar.obfuscatedJar)
+    manifest { attributes 'Main-Class': 'fr.minecraftforgefrance.installer.Installer' }
+}
+
+task updaterJar(type: Jar, dependsOn: "jar"){
+    from project.sourceSets.main.output
+        archiveName = "updater-${project.version}-thin.jar"
+        include "fr/minecraftforgefrance/updater/**"
+        include "fr/minecraftforgefrance/common/**"
+		include "langs/**"
+}
+
+task fullUpdaterJar(type: Jar, dependsOn: "updaterJar"){
+    inputs.file jar.archivePath
+    from(configurations.compile.collect { zipTree(it).matching { 
+	include 'org/tukaani/**/*.class'
+	include 'utybo/minkj/**/*.class'
+	} })
+    archiveName = "updater-${project.version}-full.jar"
+}
+
+fullUpdaterJar.doFirst {
+    from zipTree(updaterJar.archivePath)
+}
+
+artifacts {
+    archives fatJar
+    archives shrinkOutput
+	archives updaterJar
+	archives fullUpdaterJar
+}
+
+jar {
+    classifier = 'thin'
+    exclude 'argo/**'
+	exclude 'fr/minecraftforgefrance/updater/**'
+    manifest { attributes 'Main-Class': 'fr.minecraftforgefrance.installer.Installer' }
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '1.12'
+}

src/main/java/fr/minecraftforgefrance/common/DownloadMod.java

@@ -1,6 +1,7 @@
 package fr.minecraftforgefrance.common;
 
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.List;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -13,10 +14,10 @@
 
 public class DownloadMod
 {
-	private static final DownloadMod instance = new DownloadMod();
-	
-	public int time = 0;
-	
+    private static final DownloadMod instance = new DownloadMod();
+
+    public int time = 0;
+
     public void getRemoteList(List<FileEntry> list, List<String> dir)
     {
         try
@@ -26,27 +27,29 @@ public void getRemoteList(List<FileEntry> list, List<String> dir)
             DocumentBuilder db = dbf.newDocumentBuilder();
             Document doc = db.parse(resourceUrl.openStream());
             NodeList nodeLst = doc.getElementsByTagName("Contents");
- 
+
             long start = System.nanoTime();
             for(int i = 0; i < nodeLst.getLength(); i++)
             {
                 Node node = nodeLst.item(i);
- 
+
                 if(node.getNodeType() == 1)
                 {
                     Element element = (Element)node;
                     String key = element.getElementsByTagName("Key").item(0).getChildNodes().item(0).getNodeValue();
                     long size = Long.parseLong(element.getElementsByTagName("Size").item(0).getChildNodes().item(0).getNodeValue());
                     String md5 = element.getElementsByTagName("MD5").item(0).getChildNodes().item(0).getNodeValue();
-                    
+
                     if(size > 0L)
                     {
-                    	String link = RemoteInfoReader.instance().getSyncUrl() + key;
-                    	list.add(new FileEntry(new URL(link), md5, key, size));
+                        String name = key.substring(key.lastIndexOf("/") + 1);
+                        String path = key.substring(0, key.lastIndexOf("/") +1);
+                        String link = RemoteInfoReader.instance().getSyncUrl() + path + URLEncoder.encode(name, "UTF-8");
+                        list.add(new FileEntry(new URL(link), md5, key, size));
                     }
                     else if(key.split("/").length == 1)
                     {
-                    	dir.add(key.replace("/", ""));
+                        dir.add(key.replace("/", ""));
                     }
                 }
             }
@@ -56,12 +59,12 @@ else if(key.split("/").length == 1)
         }
         catch(Exception ex)
         {
-        	ex.printStackTrace();
+            ex.printStackTrace();
         }
     }
-    
+
     public static DownloadMod instance()
     {
-    	return instance;
+        return instance;
     }
 }

src/main/java/fr/minecraftforgefrance/common/DownloadUtils.java

@@ -45,9 +45,7 @@ public static boolean downloadFile(final URL url, final File dest, final JProgre
 
 		try
 		{
-			URI uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(), url.getRef());
-			URL url2 = uri.toURL();
-			URLConnection connection = url2.openConnection();
+			URLConnection connection = url.openConnection();
 
 			int fileLength = connection.getContentLength();
 			bar.setMaximum(fileLength);