Merge pull request #24 from breiler/load-local-config

Allow loading mappings from local file path
libgdx · Oct 30, 2023 · 783336a · 783336a
2 parents bb3661b + 66a8ad4
commit 783336a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/com/studiohartman/jamepad/ControllerManager.java b/src/main/java/com/studiohartman/jamepad/ControllerManager.java
@@ -3,6 +3,8 @@
 import com.badlogic.gdx.utils.SharedLibraryLoader;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -283,6 +285,7 @@ public boolean update() {
     public void addMappingsFromFile(String path) throws IOException, IllegalStateException {
         InputStream source = getClass().getResourceAsStream(path);
         if(source==null) source = ClassLoader.getSystemResourceAsStream(path);
+        if(source==null && new File(path).exists()) source = new FileInputStream(path);
         if(source==null) throw new IOException("Cannot open resource from classpath "+path);
 
         if(configuration.loadDatabaseInMemory) {
@@ -294,6 +297,7 @@ public void addMappingsFromFile(String path) throws IOException, IllegalStateExc
             while((read = source.read(data, 0, data.length)) != -1) {
                 buffer.write(data, 0, read);
             }
+            source.close();
 
             byte[] b = buffer.toByteArray();
             if(!nativeAddMappingsFromBuffer(b, b.length)) {