Browse Source

Revert back to older files api.

pull/187/head
weisj 4 years ago
parent
commit
2490bd8b1d
  1. 32
      native-utils/src/main/java/com/github/weisj/darklaf/platform/NativeUtil.java

32
native-utils/src/main/java/com/github/weisj/darklaf/platform/NativeUtil.java

@ -48,7 +48,7 @@ public class NativeUtil {
/** /**
* Temporary directory which will contain the DLLs. * Temporary directory which will contain the DLLs.
*/ */
private static Path temporaryDir; private static File temporaryDir;
private NativeUtil() {} private NativeUtil() {}
@ -85,43 +85,43 @@ public class NativeUtil {
// Prepare temporary file // Prepare temporary file
if (temporaryDir == null) { if (temporaryDir == null) {
temporaryDir = createTempDirectory(NATIVE_FOLDER_PATH_PREFIX); temporaryDir = createTempDirectory(NATIVE_FOLDER_PATH_PREFIX);
temporaryDir.toFile().deleteOnExit(); temporaryDir.deleteOnExit();
} }
Path temp = temporaryDir.resolve(filename); File temp = new File(temporaryDir, filename);
try (InputStream is = NativeUtil.class.getResourceAsStream(path)) { try (InputStream is = NativeUtil.class.getResourceAsStream(path)) {
if (!temporaryDir.toFile().canWrite()) throw new IOException("Can't write to temporary directory."); Files.copy(is, temp.toPath(), StandardCopyOption.REPLACE_EXISTING);
Files.copy(is, temp.toAbsolutePath(), StandardCopyOption.REPLACE_EXISTING);
} catch (IOException e) { } catch (IOException e) {
delete(temp); temp.delete();
throw e; throw e;
} catch (NullPointerException e) { } catch (NullPointerException e) {
delete(temp); temp.delete();
throw new FileNotFoundException("File " + path + " was not found inside JAR."); throw new FileNotFoundException("File " + path + " was not found inside JAR.");
} }
try { try {
System.load(temp.toAbsolutePath().toString()); System.load(temp.getAbsolutePath());
} finally { } finally {
if (isPosixCompliant()) { if (isPosixCompliant()) {
// Assume POSIX compliant file system, can be deleted after loading // Assume POSIX compliant file system, can be deleted after loading
delete(temp); temp.delete();
} else { } else {
// Assume non-POSIX, and don't delete until last file descriptor closed // Assume non-POSIX, and don't delete until last file descriptor closed
temp.toFile().deleteOnExit(); temp.deleteOnExit();
} }
} }
} }
private static void delete(final Path path) { private static File createTempDirectory(final String prefix) throws IOException {
try { String tempDir = System.getProperty("java.io.tmpdir");
Files.deleteIfExists(path); File generatedDir = new File(tempDir, prefix + System.nanoTime());
} catch (IOException ignored) {}
if (!generatedDir.mkdir()) {
throw new IOException("Failed to create temp directory " + generatedDir.getName());
} }
private static Path createTempDirectory(final String prefix) throws IOException { return generatedDir;
return Files.createTempDirectory(prefix + System.nanoTime());
} }
private static boolean isPosixCompliant() { private static boolean isPosixCompliant() {

Loading…
Cancel
Save