Skip to content

fix #200 #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yermak merged 1 commit into from
Jan 29, 2021
Merged

fix #200 #224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/main/java/uk/yermak/audiobookconverter/AppProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ public class AppProperties {
final static Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final File APP_DIR = new File(System.getProperty("APP_HOME"));
public static final File PROP_FILE = new File(APP_DIR, Version.getVersionString() + ".properties");
private static final Properties applicationProps = new Properties();

private static Properties getAppProperties() {
//TODO:add default props here
Properties defaultProperties = new Properties();
Properties applicationProps = new Properties(defaultProperties);
static {
loadAppProperties();
}

private static synchronized Properties loadAppProperties() {
if (PROP_FILE.exists()) {
try (FileInputStream in = new FileInputStream(PROP_FILE)) {
applicationProps.load(in);
Expand All @@ -31,13 +33,11 @@ private static Properties getAppProperties() {
}

public static String getProperty(String key) {
Properties applicationProps = getAppProperties();
return applicationProps.getProperty(key);
}

public static Properties getProperties(String group) {
Properties properties = new Properties();
Properties applicationProps = getAppProperties();
Enumeration<Object> keys = applicationProps.keys();
while (keys.hasMoreElements()) {
String propName = (String) keys.nextElement();
Expand All @@ -49,8 +49,7 @@ public static Properties getProperties(String group) {
return properties;
}

public static void setProperty(String key, String value) {
Properties applicationProps = getAppProperties();
public static synchronized void setProperty(String key, String value) {
applicationProps.put(key, value);
File appDir = APP_DIR;
if (appDir.exists() || appDir.mkdir()) {
Expand Down