demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-11 05:41:52 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix "Unable to watch transformation directory" warnings (#1650)

Browse Source 
Fixes #1636

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born 2020-09-18 08:54:23 +02:00 committed by GitHub
parent 81e82e7d44
commit f201b83c09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java
View File

@ -247,10 +247,10 @@ public abstract class AbstractFileTransformationService<T> implements Transforma
}
}
private @Nullable String getFileExtension(String fileName) {
private String getFileExtension(String fileName) {
int extensionPos = fileName.lastIndexOf(EXTENSION_SEPARATOR);
int lastSeparatorPos = Math.max(fileName.lastIndexOf(UNIX_SEPARATOR), fileName.lastIndexOf(WINDOWS_SEPARATOR));
return lastSeparatorPos > extensionPos ? null : fileName.substring(extensionPos + 1);
return lastSeparatorPos > extensionPos ? "" : fileName.substring(extensionPos + 1);
}
/**
@ -262,31 +262,21 @@ public abstract class AbstractFileTransformationService<T> implements Transforma
*/
protected String getLocalizedProposedFilename(String filename, final WatchService watchService) {
final File file = new File(filename);
if (file.getParent() != null) {
watchSubDirectory(file.getParent(), watchService);
}
String extension = getFileExtension(filename);
String prefix = file.getPath();
String result = filename;
if (extension == null) {
extension = "";
}
if (!prefix.isEmpty()) {
watchSubDirectory(prefix, watchService);
}
// the filename may already contain locale information
if (!filename.matches(".*_[a-z]{2}." + extension + "$")) {
String basename = file.getName();
String alternateName = prefix + basename + "_" + getLocale().getLanguage() + "." + extension;
String alternateName = filename + "_" + getLocale().getLanguage() + "." + extension;
String alternatePath = getSourcePath() + alternateName;
File f = new File(alternatePath);
if (f.exists()) {
result = alternateName;
if (new File(alternatePath).exists()) {
return alternatePath;
}
}
result = getSourcePath() + result;
return result;
return getSourcePath() + filename;
}
/**