erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-22 08:17:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Change renameOldKeyboardFiles to migrateOldKeyboardFiles

Browse source
This commit is contained in:
darcywong00 2017-11-29 10:22:06 +07:00
parent b3b3922fb6
commit 7d6aa35486
2 changed files with 73 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMManager.java
View file

@ -136,8 +136,12 @@ public final class KMManager {
protected static final String KMKey_ShouldShowHelpBubble = "ShouldShowHelpBubble";
// Default Asset Paths
// Previous keyboards installed from the cloud went to /languages/ and /fonts/
// Keyboards now get installed into /packages/packageID.
// If a legacy keyboard has an undefined packageID, it will default to "cloud"
public static final String KMDefault_LegacyAssetLanguages = "languages";
public static final String KMDefault_LegacyAssetFonts = "fonts";
public static final String KMDefault_LegacyPackageID = "cloud";
public static final String KMDefault_AssetPackages = "packages";
// Default Keyboard Info
@ -167,7 +171,7 @@ public final class KMManager {
if (!didCopyAssets) {
copyAssets(appContext);
renameOldKeyboardFiles(appContext);
migrateOldKeyboardFiles(appContext);
updateOldKeyboardsList(appContext);
didCopyAssets = true;
}
@ -428,67 +432,77 @@ public final class KMManager {
}
/**
* Renames legacy keyboard files which were installed in /languages directories or
* the keyboard filename is missing the version number.
* Since we don't know the original packageID for the installed keyboards, use
* legacy0, legacy1, ... for the new /packages/legacyX/ directories.
* Legacy default keyboards /languages/european2*.js can also be safely removed
* TODO: how to move legacy /fonts?
* Assumption: No legacy keyboards at /packages/*.js
* Migrates legacy keyboards in the /languages/ directory so that:
* 1) Default eurolatin2 or us.js keyboards are deleted
* 2) Keyboards missing a version number are assigned "-1.0"
* 3) Remaining keyboards are moved to /packages/cloud (default packageID of "cloud")
*
* Fonts used in legacy keyboards are also migrated from /fonts/ to /packages/cloud
*
* Assumption: No legacy keyboards exist in /packages/*.js
* @param context
*/
private static void renameOldKeyboardFiles(Context context) {
String[] originalPaths = {
context.getDir("data", Context.MODE_PRIVATE) + File.separator + KMDefault_LegacyAssetLanguages + File.separator,
//context.getDir("data", Context.MODE_PRIVATE) + File.separator + KMDefault_AssetPackages + File.separator
};
int migratedKeyboards = 0;
for (String originalPath : originalPaths) {
File originalDir = new File(originalPath);
if (!originalDir.exists()) {
continue;
}
String[] files = originalDir.list();
for (String filename : files) {
String migratedPath = context.getDir("data", Context.MODE_PRIVATE) + File.separator + KMDefault_AssetPackages +
File.separator + "legacy" + String.valueOf(migratedKeyboards);
// Handle keyboards missing version number
if (filename.lastIndexOf("-") < 0) {
if (filename.equals("us.js")) {
File kbFile = new File(originalPath, filename);
kbFile.delete();
} else if (filename.endsWith(".js")) {
// Append default version number to keyboard and move
String newFilename = filename.substring(0, filename.lastIndexOf(".js")) + "-1.0.js";
File migratedDir = new File(migratedPath);
if (!migratedDir.exists()) {
migratedDir.mkdir();
}
File kbFile = new File(originalPath, filename);
kbFile.renameTo(new File(migratedDir, newFilename));
migratedKeyboards++;
}
} else {
// Remove legacy default keyboards
if (filename.startsWith(KMDefault_KeyboardID + "-")) {
File legacyKbFile = new File(originalDir, filename);
if (legacyKbFile.exists()) {
legacyKbFile.delete();
continue;
}
}
private static void migrateOldKeyboardFiles(Context context) {
String legacyLanguagesPath = context.getDir("data", Context.MODE_PRIVATE) + File.separator +
KMDefault_LegacyAssetLanguages + File.separator;
String legacyFontsPath = context.getDir("data", Context.MODE_PRIVATE) + File.separator +
KMDefault_LegacyAssetFonts + File.separator;
File legacyLanguagesDir = new File(legacyLanguagesPath);
File legacyFontsDir = new File(legacyFontsPath);
if (!legacyLanguagesDir.exists() && !legacyFontsDir.exists()) {
return;
}
// Migrate /languages/*.js keyboards
File migratedDir = new File(migratedPath);
if (!migratedDir.exists()) {
migratedDir.mkdir();
}
File kbFile = new File(originalPath, filename);
kbFile.renameTo(new File(migratedDir, filename));
migratedKeyboards++;
String migratedPath = context.getDir("data", Context.MODE_PRIVATE) + File.separator +
KMDefault_AssetPackages + File.separator + KMDefault_LegacyPackageID;
File migratedDir = new File(migratedPath);
if (!migratedDir.exists()) {
migratedDir.mkdir();
}
String[] files = legacyLanguagesDir.list();
for (String filename : files) {
// Handle keyboards missing version number
if (filename.lastIndexOf("-") < 0) {
if (filename.equals("us.js")) {
File kbFile = new File(legacyLanguagesPath, filename);
kbFile.delete();
} else if (filename.endsWith(".js")) {
// Append default version number to keyboard and move
String newFilename = filename.substring(0, filename.lastIndexOf(".js")) + "-1.0.js";
File kbFile = new File(legacyLanguagesPath, filename);
kbFile.renameTo(new File(migratedDir, newFilename));
}
// Handle keyboards with version number
} else {
// Remove legacy default keyboards
if (filename.startsWith(KMDefault_KeyboardID + "-")) {
File legacyKbFile = new File(legacyLanguagesDir, filename);
if (legacyKbFile.exists()) {
legacyKbFile.delete();
continue;
}
}
// Migrate /languages/*.js keyboards
File kbFile = new File(legacyLanguagesPath, filename);
kbFile.renameTo(new File(migratedDir, filename));
}
}
files = legacyFontsDir.list();
for (String filename : files) {
File fontFile = new File(legacyFontsPath, filename);
fontFile.renameTo(new File(migratedDir, filename));
}
// Cleanup empty directories
if (legacyLanguagesDir.list().length == 0) {
legacyLanguagesDir.delete();
}
if (legacyFontsDir.list().length == 0) {
legacyFontsDir.delete();
}
}
public static void updateOldKeyboardsList(Context context) {

3
android/KMEA/app/src/main/java/com/tavultesoft/kmea/LanguageListActivity.java
View file

@ -149,6 +149,9 @@ public final class LanguageListActivity extends Activity implements OnKeyboardDo
JSONArray keyboards = language.getJSONArray(KMManager.KMKey_LanguageKeyboards);
String pkgID = keyboards.getJSONObject(keyboardIndex).getString(KMManager.KMKey_PackageID);
if (pkgID == null || pkgID.isEmpty()) {
pkgID = KMManager.KMDefault_LegacyPackageID;
}
String kbID = keyboards.getJSONObject(keyboardIndex).getString(KMManager.KMKey_ID);
String kbName = keyboards.getJSONObject(keyboardIndex).getString(KMManager.KMKey_Name);
String kbVersion = keyboards.getJSONObject(keyboardIndex).optString(KMManager.KMKey_KeyboardVersion, "1.0");