github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #68 from overleaf/sk-fix-unicode-file-paths

Browse source 
Encode file path when building url, allows unicode
This commit is contained in:
Shane Kilkelly 2019-06-13 12:10:55 +01:00 committed by GitHub
commit 591617f996
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/data/CandidateSnapshot.java
View file

@ -5,10 +5,13 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import uk.ac.ic.wlgitbridge.data.filestore.RawFile; import uk.ac.ic.wlgitbridge.data.filestore.RawFile;
import uk.ac.ic.wlgitbridge.data.filestore.RawDirectory; import uk.ac.ic.wlgitbridge.data.filestore.RawDirectory;
import uk.ac.ic.wlgitbridge.util.Log;
import uk.ac.ic.wlgitbridge.util.Util; import uk.ac.ic.wlgitbridge.util.Util;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -115,10 +118,17 @@ public class CandidateSnapshot implements AutoCloseable {
JsonObject jsonFile = new JsonObject(); JsonObject jsonFile = new JsonObject();
jsonFile.addProperty("name", file.getPath()); jsonFile.addProperty("name", file.getPath());
if (file.isChanged()) { if (file.isChanged()) {
jsonFile.addProperty( String path = file.getPath();
"url", String encodedPath;
projectURL + "/" + file.getPath() + "?key=" + postbackKey try {
); encodedPath = URLEncoder.encode(path, "UTF-8");
} catch (UnsupportedEncodingException e) {
// This should never happen
Log.error("Error while encoding file path: projectUrl={}, path={}", projectURL, path, e);
encodedPath = path;
}
String url = projectURL + "/" + encodedPath + "?key=" + postbackKey;
jsonFile.addProperty("url", url);
} }
return jsonFile; return jsonFile;
} }