Refactor dicttool with try-with-resource (fec4769e) · Commits · e / os / android_packages_inputmethods_LatinIME

tools/dicttool/src/com/android/inputmethod/latin/dicttool/BinaryDictOffdeviceUtils.java

+55 −54

Original line number	Diff line number	Diff line
		@@ -26,11 +26,13 @@ import org.xml.sax.SAXException;

		import java.io.BufferedInputStream;
		import java.io.BufferedOutputStream;
		import java.io.BufferedReader;
		import java.io.File;
		import java.io.FileInputStream;
		import java.io.FileOutputStream;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.InputStreamReader;
		import java.io.OutputStream;
		import java.util.ArrayList;

		@@ -51,14 +53,17 @@ public final class BinaryDictOffdeviceUtils {
		public final static String ENCRYPTION = "encrypted";

		private final static int MAX_DECODE_DEPTH = 8;
		private final static int COPY_BUFFER_SIZE = 8192;

		public static class DecoderChainSpec {
		ArrayList<String> mDecoderSpec = new ArrayList<>();
		File mFile;

		public DecoderChainSpec addStep(final String stepDescription) {
		mDecoderSpec.add(stepDescription);
		return this;
		}

		public String describeChain() {
		final StringBuilder s = new StringBuilder("raw");
		for (final String step : mDecoderSpec) {
		@@ -70,13 +75,10 @@ public final class BinaryDictOffdeviceUtils {
		}

		public static void copy(final InputStream input, final OutputStream output) throws IOException {
		final byte[] buffer = new byte[1000];
		final BufferedInputStream in = new BufferedInputStream(input);
		final BufferedOutputStream out = new BufferedOutputStream(output);
		for (int readBytes = in.read(buffer); readBytes >= 0; readBytes = in.read(buffer))
		final byte[] buffer = new byte[COPY_BUFFER_SIZE];
		for (int readBytes = input.read(buffer); readBytes >= 0; readBytes = input.read(buffer)) {
		output.write(buffer, 0, readBytes);
		in.close();
		out.close();
		}
		}

		/**
		@@ -131,11 +133,15 @@ public final class BinaryDictOffdeviceUtils {
		try {
		final File dst = File.createTempFile(PREFIX, SUFFIX);
		dst.deleteOnExit();
		final FileOutputStream dstStream = new FileOutputStream(dst);
		copy(Compress.getUncompressedStream(new BufferedInputStream(new FileInputStream(src))),
		new BufferedOutputStream(dstStream)); // #copy() closes the streams
		try (
		final InputStream input = Compress.getUncompressedStream(
		new BufferedInputStream(new FileInputStream(src)));
		final OutputStream output = new BufferedOutputStream(new FileOutputStream(dst))
		) {
		copy(input, output);
		return dst;
		} catch (IOException e) {
		}
		} catch (final IOException e) {
		// Could not uncompress the file: presumably the file is simply not a compressed file
		return null;
		}
		@@ -150,20 +156,20 @@ public final class BinaryDictOffdeviceUtils {
		try {
		final File dst = File.createTempFile(PREFIX, SUFFIX);
		dst.deleteOnExit();
		final FileOutputStream dstStream = new FileOutputStream(dst);
		copy(Crypt.getDecryptedStream(new BufferedInputStream(new FileInputStream(src))),
		dstStream); // #copy() closes the streams
		try (
		final InputStream input = Crypt.getDecryptedStream(
		new BufferedInputStream(new FileInputStream(src)));
		final OutputStream output = new BufferedOutputStream(new FileOutputStream(dst))
		) {
		copy(input, output);
		return dst;
		} catch (IOException e) {
		}
		} catch (final IOException e) {
		// Could not decrypt the file: presumably the file is simply not a crypted file
		return null;
		}
		}

		static void crash(final String filename, final Exception e) {
		throw new RuntimeException("Can't read file " + filename, e);
		}

		static FusionDictionary getDictionary(final String filename, final boolean report) {
		final File file = new File(filename);
		if (report) {
		@@ -172,25 +178,28 @@ public final class BinaryDictOffdeviceUtils {
		}
		try {
		if (XmlDictInputOutput.isXmlUnigramDictionary(filename)) {
		if (report) System.out.println("Format : XML unigram list");
		if (report) {
		System.out.println("Format : XML unigram list");
		}
		return XmlDictInputOutput.readDictionaryXml(
		new BufferedInputStream(new FileInputStream(file)),
		null /* shortcuts /, null / bigrams */);
		} else {
		}
		final DecoderChainSpec decodedSpec = getRawDictionaryOrNull(file);
		if (null == decodedSpec) {
		crash(filename, new RuntimeException(
		filename + " does not seem to be a dictionary file"));
		} else if (CombinedInputOutput.isCombinedDictionary(
		decodedSpec.mFile.getAbsolutePath())){
		throw new RuntimeException("Does not seem to be a dictionary file " + filename);
		}
		if (CombinedInputOutput.isCombinedDictionary(decodedSpec.mFile.getAbsolutePath())) {
		if (report) {
		System.out.println("Format : Combined format");
		System.out.println("Packaging : " + decodedSpec.describeChain());
		System.out.println("Uncompressed size : " + decodedSpec.mFile.length());
		}
		return CombinedInputOutput.readDictionaryCombined(
		new BufferedInputStream(new FileInputStream(decodedSpec.mFile)));
		} else {
		try (final BufferedReader reader = new BufferedReader(
		new InputStreamReader(new FileInputStream(decodedSpec.mFile), "UTF-8"))) {
		return CombinedInputOutput.readDictionaryCombined(reader);
		}
		}
		final DictDecoder dictDecoder = BinaryDictIOUtils.getDictDecoder(
		decodedSpec.mFile, 0, decodedSpec.mFile.length(),
		DictDecoder.USE_BYTEARRAY);
		@@ -200,17 +209,9 @@ public final class BinaryDictOffdeviceUtils {
		System.out.println("Uncompressed size : " + decodedSpec.mFile.length());
		}
		return dictDecoder.readDictionaryBinary(false /* deleteDictIfBroken */);
		} catch (final IOException \| SAXException \| ParserConfigurationException \|
		UnsupportedFormatException e) {
		throw new RuntimeException("Can't read file " + filename, e);
		}
		}
		} catch (IOException e) {
		crash(filename, e);
		} catch (SAXException e) {
		crash(filename, e);
		} catch (ParserConfigurationException e) {
		crash(filename, e);
		} catch (UnsupportedFormatException e) {
		crash(filename, e);
		}
		return null;
		}
		}

tools/dicttool/src/com/android/inputmethod/latin/dicttool/CombinedInputOutput.java

+8 −26

Original line number	Diff line number	Diff line
		@@ -26,13 +26,9 @@ import com.android.inputmethod.latin.makedict.WordProperty;
		import com.android.inputmethod.latin.utils.CombinedFormatUtils;

		import java.io.BufferedReader;
		import java.io.File;
		import java.io.FileNotFoundException;
		import java.io.BufferedWriter;
		import java.io.FileReader;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.InputStreamReader;
		import java.io.Writer;
		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.TreeSet;
		@@ -57,27 +53,15 @@ public class CombinedInputOutput {
		* @return true if the file is in the combined format, false otherwise
		*/
		public static boolean isCombinedDictionary(final String filename) {
		BufferedReader reader = null;
		try {
		reader = new BufferedReader(new FileReader(new File(filename)));
		try (final BufferedReader reader = new BufferedReader(new FileReader(filename))) {
		String firstLine = reader.readLine();
		while (firstLine.startsWith(COMMENT_LINE_STARTER)) {
		firstLine = reader.readLine();
		}
		return firstLine.matches(
		"^" + CombinedFormatUtils.DICTIONARY_TAG + "=[^:]+(:[^=]+=[^:]+)*");
		} catch (FileNotFoundException e) {
		} catch (final IOException e) {
		return false;
		} catch (IOException e) {
		return false;
		} finally {
		if (reader != null) {
		try {
		reader.close();
		} catch (IOException e) {
		// do nothing
		}
		}
		}
		}

		@@ -87,12 +71,11 @@ public class CombinedInputOutput {
		* This is the public method that will read a combined file and return the corresponding memory
		* representation.
		*
		* @param source the file to read the data from.
		* @param reader the buffered reader to read the data from.
		* @return the in-memory representation of the dictionary.
		*/
		public static FusionDictionary readDictionaryCombined(final InputStream source)
		public static FusionDictionary readDictionaryCombined(final BufferedReader reader)
		throws IOException {
		final BufferedReader reader = new BufferedReader(new InputStreamReader(source, "UTF-8"));
		String headerLine = reader.readLine();
		while (headerLine.startsWith(COMMENT_LINE_STARTER)) {
		headerLine = reader.readLine();
		@@ -218,11 +201,11 @@ public class CombinedInputOutput {
		/**
		* Writes a dictionary to a combined file.
		*
		* @param destination a destination stream to write to.
		* @param destination a destination writer.
		* @param dict the dictionary to write.
		*/
		public static void writeDictionaryCombined(
		final Writer destination, final FusionDictionary dict) throws IOException {
		public static void writeDictionaryCombined(final BufferedWriter destination,
		final FusionDictionary dict) throws IOException {
		final TreeSet<WordProperty> wordPropertiesInDict = new TreeSet<>();
		for (final WordProperty wordProperty : dict) {
		// This for ordering by frequency, then by asciibetic order
		@@ -232,6 +215,5 @@ public class CombinedInputOutput {
		for (final WordProperty wordProperty : wordPropertiesInDict) {
		destination.write(CombinedFormatUtils.formatWordProperty(wordProperty));
		}
		destination.close();
		}
		}

tools/dicttool/src/com/android/inputmethod/latin/dicttool/Compress.java

+15 −19

Original line number	Diff line number	Diff line
		@@ -16,11 +16,6 @@

		package com.android.inputmethod.latin.dicttool;

		import java.io.BufferedInputStream;
		import java.io.BufferedOutputStream;
		import java.io.File;
		import java.io.FileInputStream;
		import java.io.FileOutputStream;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.OutputStream;
		@@ -32,8 +27,7 @@ public class Compress {
		// This container class is not publicly instantiable.
		}

		public static OutputStream getCompressedStream(final OutputStream out)
		throws java.io.IOException {
		public static OutputStream getCompressedStream(final OutputStream out) throws IOException {
		return new GZIPOutputStream(out);
		}

		@@ -43,7 +37,6 @@ public class Compress {

		static public class Compressor extends Dicttool.Command {
		public static final String COMMAND = "compress";
		public static final String STDIN_OR_STDOUT = "-";

		public Compressor() {
		}
		@@ -61,17 +54,18 @@ public class Compress {
		}
		final String inFilename = mArgs.length >= 1 ? mArgs[0] : STDIN_OR_STDOUT;
		final String outFilename = mArgs.length >= 2 ? mArgs[1] : STDIN_OR_STDOUT;
		final InputStream input = inFilename.equals(STDIN_OR_STDOUT) ? System.in
		: new BufferedInputStream(new FileInputStream(new File(inFilename)));
		final OutputStream output = outFilename.equals(STDIN_OR_STDOUT) ? System.out
		: new BufferedOutputStream(new FileOutputStream(new File(outFilename)));
		BinaryDictOffdeviceUtils.copy(input, new GZIPOutputStream(output));
		try (
		final InputStream input = getFileInputStreamOrStdIn(inFilename);
		final OutputStream compressedOutput = getCompressedStream(
		getFileOutputStreamOrStdOut(outFilename))
		) {
		BinaryDictOffdeviceUtils.copy(input, compressedOutput);
		}
		}
		}

		static public class Uncompressor extends Dicttool.Command {
		public static final String COMMAND = "uncompress";
		public static final String STDIN_OR_STDOUT = "-";

		public Uncompressor() {
		}
		@@ -89,11 +83,13 @@ public class Compress {
		}
		final String inFilename = mArgs.length >= 1 ? mArgs[0] : STDIN_OR_STDOUT;
		final String outFilename = mArgs.length >= 2 ? mArgs[1] : STDIN_OR_STDOUT;
		final InputStream input = inFilename.equals(STDIN_OR_STDOUT) ? System.in
		: new BufferedInputStream(new FileInputStream(new File(inFilename)));
		final OutputStream output = outFilename.equals(STDIN_OR_STDOUT) ? System.out
		: new BufferedOutputStream(new FileOutputStream(new File(outFilename)));
		BinaryDictOffdeviceUtils.copy(new GZIPInputStream(input), output);
		try (
		final InputStream uncompressedInput = getUncompressedStream(
		getFileInputStreamOrStdIn(inFilename));
		final OutputStream output = getFileOutputStreamOrStdOut(outFilename)
		) {
		BinaryDictOffdeviceUtils.copy(uncompressedInput, output);
		}
		}
		}
		}

tools/dicttool/src/com/android/inputmethod/latin/dicttool/DictionaryMaker.java

+31 −25

Original line number	Diff line number	Diff line
		@@ -27,19 +27,23 @@ import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
		import com.android.inputmethod.latin.makedict.Ver2DictEncoder;
		import com.android.inputmethod.latin.makedict.Ver4DictEncoder;

		import org.xml.sax.SAXException;

		import java.io.BufferedInputStream;
		import java.io.BufferedReader;
		import java.io.BufferedWriter;
		import java.io.File;
		import java.io.FileInputStream;
		import java.io.FileNotFoundException;
		import java.io.FileWriter;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.InputStreamReader;
		import java.util.Arrays;
		import java.util.LinkedList;

		import javax.xml.parsers.ParserConfigurationException;

		import org.xml.sax.SAXException;

		/**
		* Main class/method for DictionaryMaker.
		*/
		@@ -279,20 +283,19 @@ public class DictionaryMaker {
		*/
		private static FusionDictionary readCombinedFile(final String combinedFilename)
		throws FileNotFoundException, IOException {
		FileInputStream inStream = null;
		try {
		final File file = new File(combinedFilename);
		inStream = new FileInputStream(file);
		return CombinedInputOutput.readDictionaryCombined(inStream);
		} finally {
		if (null != inStream) {
		try {
		inStream.close();
		} catch (IOException e) {
		// do nothing
		try (final BufferedReader reader = new BufferedReader(new InputStreamReader(
		new FileInputStream(combinedFilename), "UTF-8"))
		) {
		return CombinedInputOutput.readDictionaryCombined(reader);
		}
		}

		private static BufferedInputStream getBufferedFileInputStream(final String filename)
		throws FileNotFoundException {
		if (filename == null) {
		return null;
		}
		return new BufferedInputStream(new FileInputStream(filename));
		}

		/**
		@@ -310,13 +313,14 @@ public class DictionaryMaker {
		private static FusionDictionary readXmlFile(final String unigramXmlFilename,
		final String shortcutXmlFilename, final String bigramXmlFilename)
		throws FileNotFoundException, SAXException, IOException, ParserConfigurationException {
		final FileInputStream unigrams = new FileInputStream(new File(unigramXmlFilename));
		final FileInputStream shortcuts = null == shortcutXmlFilename ? null :
		new FileInputStream(new File(shortcutXmlFilename));
		final FileInputStream bigrams = null == bigramXmlFilename ? null :
		new FileInputStream(new File(bigramXmlFilename));
		try (
		final BufferedInputStream unigrams = getBufferedFileInputStream(unigramXmlFilename);
		final BufferedInputStream shortcuts = getBufferedFileInputStream(shortcutXmlFilename);
		final BufferedInputStream bigrams = getBufferedFileInputStream(bigramXmlFilename);
		) {
		return XmlDictInputOutput.readDictionaryXml(unigrams, shortcuts, bigrams);
		}
		}

		/**
		* Invoke the right output method according to args.
		@@ -374,8 +378,9 @@ public class DictionaryMaker {
		*/
		private static void writeXmlDictionary(final String outputFilename,
		final FusionDictionary dict) throws FileNotFoundException, IOException {
		XmlDictInputOutput.writeDictionaryXml(new BufferedWriter(new FileWriter(outputFilename)),
		dict);
		try (final BufferedWriter writer = new BufferedWriter(new FileWriter(outputFilename))) {
		XmlDictInputOutput.writeDictionaryXml(writer, dict);
		}
		}

		/**
		@@ -388,7 +393,8 @@ public class DictionaryMaker {
		*/
		private static void writeCombinedDictionary(final String outputFilename,
		final FusionDictionary dict) throws FileNotFoundException, IOException {
		CombinedInputOutput.writeDictionaryCombined(
		new BufferedWriter(new FileWriter(outputFilename)), dict);
		try (final BufferedWriter writer = new BufferedWriter(new FileWriter(outputFilename))) {
		CombinedInputOutput.writeDictionaryCombined(writer, dict);
		}
		}
		}

tools/dicttool/src/com/android/inputmethod/latin/dicttool/Dicttool.java

+43 −3

Original line number	Diff line number	Diff line
		@@ -16,23 +16,63 @@

		package com.android.inputmethod.latin.dicttool;

		import java.io.BufferedInputStream;
		import java.io.BufferedOutputStream;
		import java.io.File;
		import java.io.FileInputStream;
		import java.io.FileNotFoundException;
		import java.io.FileOutputStream;
		import java.io.InputStream;
		import java.io.OutputStream;
		import java.util.Arrays;
		import java.util.HashMap;

		public class Dicttool {

		public static abstract class Command {
		public static final String STDIN_OR_STDOUT = "-";
		protected String[] mArgs;

		public void setArgs(String[] args) throws IllegalArgumentException {
		mArgs = args;
		}

		protected static InputStream getFileInputStreamOrStdIn(final String inFilename)
		throws FileNotFoundException {
		if (STDIN_OR_STDOUT.equals(inFilename)) {
		return System.in;
		}
		return getFileInputStream(new File(inFilename));
		}

		protected static InputStream getFileInputStream(final File inFile)
		throws FileNotFoundException {
		return new BufferedInputStream(new FileInputStream(inFile));
		}

		protected static OutputStream getFileOutputStreamOrStdOut(final String outFilename)
		throws FileNotFoundException {
		if (STDIN_OR_STDOUT.equals(outFilename)) {
		return System.out;
		}
		return getFileOutputStream(new File(outFilename));
		}

		protected static OutputStream getFileOutputStream(final File outFile)
		throws FileNotFoundException {
		return new BufferedOutputStream(new FileOutputStream(outFile));
		}

		abstract public String getHelp();
		abstract public void run() throws Exception;
		}

		static HashMap<String, Class<? extends Command>> sCommands = new HashMap<>();

		static {
		CommandList.populate();
		}

		public static void addCommand(final String commandName, final Class<? extends Command> cls) {
		sCommands.put(commandName, cls);
		}
		@@ -60,7 +100,7 @@ public class Dicttool {
		return sCommands.containsKey(commandName);
		}

		private Command getCommand(final String[] arguments) {
		private static Command getCommand(final String[] arguments) {
		final String commandName = arguments[0];
		if (!isCommand(commandName)) {
		throw new RuntimeException("Unknown command : " + commandName);
		@@ -76,7 +116,7 @@ public class Dicttool {
		* @param arguments the arguments passed to dicttool.
		* @return 0 for success, an error code otherwise (always 1 at the moment)
		*/
		private int execute(final String[] arguments) {
		private static int execute(final String[] arguments) {
		final Command command = getCommand(arguments);
		try {
		command.run();
		@@ -95,6 +135,6 @@ public class Dicttool {
		return;
		}
		// Exit with the success/error code from #execute() as status.
		System.exit(new Dicttool().execute(arguments));
		System.exit(execute(arguments));
		}
		}