From 356071d8249fbbdae7b296b883cc8187b84f2b6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Mon, 7 Dec 2015 16:36:22 +0100 Subject: [PATCH] Support v006 and v007 dictionary formats. --- .../dictionary/engine/CheckDictionariesMain.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java b/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java index 8cbba78..4d0b278 100644 --- a/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java +++ b/src/com/hughes/android/dictionary/engine/CheckDictionariesMain.java @@ -16,7 +16,8 @@ import java.util.List; public class CheckDictionariesMain { static final String BASE_URL = "http://github.com/rdoeffinger/Dictionary/releases/download/v0.2-dictionaries/"; - static final String VERSION_CODE = "v006"; + static final String VERSION_CODE_OLD = "v006"; + static final String VERSION_CODE = "v007"; public static void main(String[] args) throws IOException { final File dictDir = new File(DictionaryBuilderMain.OUTPUTS); @@ -39,11 +40,16 @@ public class CheckDictionariesMain { final DictionaryInfo dictionaryInfo = dict.getDictionaryInfo(); + String version_code = VERSION_CODE; + File zipFile = new File(dictFile.getPath() + "." + version_code + ".zip"); + if (!zipFile.canRead()) { + version_code = VERSION_CODE_OLD; + zipFile = new File(dictFile.getPath() + "." + version_code + ".zip"); + } dictionaryInfo.uncompressedFilename = dictFile.getName(); - dictionaryInfo.downloadUrl = BASE_URL + dictFile.getName() + "." + VERSION_CODE + ".zip"; + dictionaryInfo.downloadUrl = BASE_URL + dictFile.getName() + "." + version_code + ".zip"; // TODO: zip it right here.... dictionaryInfo.uncompressedBytes = dictFile.length(); - final File zipFile = new File(dictFile.getPath() + "." + VERSION_CODE + ".zip"); dictionaryInfo.zipBytes = zipFile.canRead() ? zipFile.length() : -1; // Print it. -- 2.43.0