fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 10:45:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve config parsing

Browse Source
This commit is contained in:
Markus Gräb
2018-10-22 23:56:27 +02:00
committed by Fredrik Fornwall
parent 82f977fbf1
commit af445f9618
1 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app/src/main/java/com/termux/app/TermuxPreferences.java
View File

@@ -7,18 +7,19 @@ import android.support.annotation.IntDef;
import android.util.Log; import android.util.Log;
import android.util.TypedValue; import android.util.TypedValue;
import android.widget.Toast; import android.widget.Toast;
import com.termux.terminal.TerminalSession; import com.termux.terminal.TerminalSession;
import org.json.JSONArray;
import org.json.JSONException;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.json.JSONArray;
final class TermuxPreferences { final class TermuxPreferences {
@@ -116,52 +117,59 @@ final class TermuxPreferences {
public String[][] mExtraKeys; public String[][] mExtraKeys;
public void reloadFromProperties(Context context) { public void reloadFromProperties(Context context) {
try { File propsFile = new File(TermuxService.HOME_PATH + "/.termux/termux.properties");
File propsFile = new File(TermuxService.HOME_PATH + "/.termux/termux.properties"); if (!propsFile.exists())
if (!propsFile.exists()) propsFile = new File(TermuxService.HOME_PATH + "/.config/termux/termux.properties");
propsFile = new File(TermuxService.HOME_PATH + "/.config/termux/termux.properties");
Properties props = new Properties(); Properties props = new Properties();
try {
if (propsFile.isFile() && propsFile.canRead()) { if (propsFile.isFile() && propsFile.canRead()) {
String encoding = "utf-8"; // most useful default nowadays String encoding = "utf-8"; // most useful default nowadays
try (FileInputStream in = new FileInputStream(propsFile)) { try (FileInputStream in = new FileInputStream(propsFile)) {
props.load(new InputStreamReader(in, encoding)); props.load(new InputStreamReader(in, encoding));
} }
} }
} catch (IOException e) {
Toast.makeText(context, "Could not open the propertiey file termux.properties.", Toast.LENGTH_LONG).show();
Log.e("termux", "Error loading props", e);
}
switch (props.getProperty("bell-character", "vibrate")) { switch (props.getProperty("bell-character", "vibrate")) {
case "beep": case "beep":
mBellBehaviour = BELL_BEEP; mBellBehaviour = BELL_BEEP;
break; break;
case "ignore": case "ignore":
mBellBehaviour = BELL_IGNORE; mBellBehaviour = BELL_IGNORE;
break; break;
default: // "vibrate". default: // "vibrate".
mBellBehaviour = BELL_VIBRATE; mBellBehaviour = BELL_VIBRATE;
break; break;
} }
try {
JSONArray arr = new JSONArray(props.getProperty("extra-keys", "[['ESC', 'TAB', 'CTRL', 'ALT', '-', 'DOWN', 'UP']]")); JSONArray arr = new JSONArray(props.getProperty("extra-keys", "[['ESC', 'TAB', 'CTRL', 'ALT', '-', 'DOWN', 'UP']]"));
mExtraKeys = new String[arr.length()][]; mExtraKeys = new String[arr.length()][];
for(int i = 0; i < arr.length(); i++) { for (int i = 0; i < arr.length(); i++) {
JSONArray line = arr.getJSONArray(i); JSONArray line = arr.getJSONArray(i);
mExtraKeys[i] = new String[line.length()]; mExtraKeys[i] = new String[line.length()];
for(int j = 0; j < line.length(); j++) { for (int j = 0; j < line.length(); j++) {
mExtraKeys[i][j] = line.getString(j); mExtraKeys[i][j] = line.getString(j);
} }
} }
} catch (JSONException e) {
mBackIsEscape = "escape".equals(props.getProperty("back-key", "back")); Toast.makeText(context, "Could not load the extra-keys property from the config: " + e.toString(), Toast.LENGTH_LONG).show();
shortcuts.clear();
parseAction("shortcut.create-session", SHORTCUT_ACTION_CREATE_SESSION, props);
parseAction("shortcut.next-session", SHORTCUT_ACTION_NEXT_SESSION, props);
parseAction("shortcut.previous-session", SHORTCUT_ACTION_PREVIOUS_SESSION, props);
parseAction("shortcut.rename-session", SHORTCUT_ACTION_RENAME_SESSION, props);
} catch (Exception e) {
Toast.makeText(context, "Error loading properties: " + e.getMessage(), Toast.LENGTH_LONG).show();
Log.e("termux", "Error loading props", e); Log.e("termux", "Error loading props", e);
mExtraKeys = new String[0][];
} }
mBackIsEscape = "escape".equals(props.getProperty("back-key", "back"));
shortcuts.clear();
parseAction("shortcut.create-session", SHORTCUT_ACTION_CREATE_SESSION, props);
parseAction("shortcut.next-session", SHORTCUT_ACTION_NEXT_SESSION, props);
parseAction("shortcut.previous-session", SHORTCUT_ACTION_PREVIOUS_SESSION, props);
parseAction("shortcut.rename-session", SHORTCUT_ACTION_RENAME_SESSION, props);
} }
public static final int SHORTCUT_ACTION_CREATE_SESSION = 1; public static final int SHORTCUT_ACTION_CREATE_SESSION = 1;