moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-03-10 06:20:27 -04:00
Code Issues Releases Wiki Activity

* make sure to avoid unicode decomposition issues

Browse Source
This commit is contained in:
Reinhard Pointner 2014-04-27 07:29:23 +00:00
parent 369aa6d406
commit be48eaf9ed
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/net/filebot/MetaAttributeView.java
View File

@ -9,6 +9,8 @@ import java.nio.charset.Charset;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.attribute.UserDefinedFileAttributeView; import java.nio.file.attribute.UserDefinedFileAttributeView;
import java.text.Normalizer;
import java.text.Normalizer.Form;
import java.util.AbstractMap; import java.util.AbstractMap;
import java.util.Arrays; import java.util.Arrays;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
@ -50,18 +52,24 @@ public class MetaAttributeView extends AbstractMap<String, String> {
// try 3rd party Xattrj library // try 3rd party Xattrj library
if (xattr == null) { if (xattr == null) {
if (Platform.isMac()) { if (Platform.isMac()) {
// Xattrj for Mac
try { try {
xattr = getMacXattrSupport(); xattr = getMacXattrSupport();
} catch (Throwable e) { } catch (Throwable e) {
throw new IOException("Unable to load library: xattrj", e); throw new IOException("Unable to load library: xattrj", e);
} }
// MacOS filesystem may require NFD unicode decomposition
this.file = new File(Normalizer.normalize(path.toFile().getAbsolutePath(), Form.NFD));
this.encoding = Charset.forName("UTF-8");
} else { } else {
throw new IOException("UserDefinedFileAttributeView is not supported"); throw new IOException("UserDefinedFileAttributeView is not supported");
} }
} else {
// UserDefinedFileAttributeView
this.file = path.toFile();
this.encoding = Charset.forName("UTF-8");
} }
this.file = path.toFile();
this.encoding = Charset.forName("UTF-8");
} }
@Override @Override