mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a few bugs from last NIO2 commit in resource translation

Browse source
This commit is contained in:
Sean Owen 2014-01-31 13:33:21 +00:00
parent dddc1c4e19
commit 783bba6b48
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
javase/src/main/java/com/google/zxing/HtmlAssetTranslator.java
View file

@ -88,8 +88,9 @@ public final class HtmlAssetTranslator {
DirectoryStream.Filter<Path> fileFilter = new DirectoryStream.Filter<Path>() {
@Override
public boolean accept(Path entry) {
String fileName = entry.getFileName().toString();
return Files.isDirectory(entry) && !Files.isSymbolicLink(entry) &&
entry.getFileName().startsWith("html-") && !"html-en".equals(entry.getFileName().toString());
fileName.startsWith("html-") && !"html-en".equals(fileName);
}
};
try (DirectoryStream<Path> dirs = Files.newDirectoryStream(assetsDir, fileFilter)) {

19
javase/src/main/java/com/google/zxing/StringsResourceTranslator.java
View file

@ -16,9 +16,12 @@
package com.google.zxing;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Writer;
import java.net.URI;
import java.net.URLConnection;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.DirectoryStream;
@ -180,7 +183,7 @@ public final class StringsResourceTranslator {
"https://www.googleapis.com/language/translate/v2?key=" + API_KEY + "&q=" +
URLEncoder.encode(english, "UTF-8") +
"&source=en&target=" + language);
CharSequence translateResult = new String(Files.readAllBytes(Paths.get(translateURI)), StandardCharsets.UTF_8);
CharSequence translateResult = fetch(translateURI);
Matcher m = TRANSLATE_RESPONSE_PATTERN.matcher(translateResult);
if (!m.find()) {
System.err.println("No translate result");
@ -199,6 +202,20 @@ public final class StringsResourceTranslator {
return translation;
}
private static CharSequence fetch(URI translateURI) throws IOException {
URLConnection connection = translateURI.toURL().openConnection();
connection.connect();
StringBuilder translateResult = new StringBuilder(200);
try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
char[] buffer = new char[8192];
int charsRead;
while ((charsRead = in.read(buffer)) > 0) {
translateResult.append(buffer, 0, charsRead);
}
}
return translateResult;
}
private static Map<String,String> readLines(Path file) throws IOException {
if (Files.exists(file)) {
Map<String,String> entries = new TreeMap<>();