moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-11-16 22:35:04 -05:00
Code Issues Releases Wiki Activity

* yet another try to fix Unicode/Accent MediaInfo.open() issues on Mac ...

Browse Source
This commit is contained in:
Reinhard Pointner 2015-05-25 18:15:22 +00:00
parent 70d9a9efd5
commit a255c6d82a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/net/filebot/mediainfo/MediaInfo.java
View File

@ -4,6 +4,7 @@ import java.io.Closeable;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.RandomAccessFile; import java.io.RandomAccessFile;
import java.nio.charset.StandardCharsets;
import java.text.Normalizer; import java.text.Normalizer;
import java.text.Normalizer.Form; import java.text.Normalizer.Form;
import java.util.ArrayList; import java.util.ArrayList;
@ -45,14 +46,14 @@ public class MediaInfo implements Closeable {
} }
public synchronized boolean open(File file) { public synchronized boolean open(File file) {
if (!file.isFile()) { if (!file.isFile() || file.length() < 64 * 1024) {
return false; return false;
} }
String path = file.getAbsolutePath(); String path = file.getAbsolutePath();
// on Mac files that contain accents cannot be opened via JNA WString file paths due to encoding differences so we use the buffer interface instead for these files // on Mac files that contain accents cannot be opened via JNA WString file paths due to encoding differences so we use the buffer interface instead for these files
if (Platform.isMac() && path.length() != Normalizer.normalize(path, Form.NFD).length()) { if (Platform.isMac() && !StandardCharsets.US_ASCII.newEncoder().canEncode(path)) {
try (RandomAccessFile raf = new RandomAccessFile(file, "r")) { try (RandomAccessFile raf = new RandomAccessFile(file, "r")) {
return openViaBuffer(raf); return openViaBuffer(raf);
} catch (IOException e) { } catch (IOException e) {