Add: default path, Fix: nullpointer exception

szymonjanas · May 5, 2020 · 9439e5c · 9439e5c
1 parent b197b1f
commit 9439e5c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/com/janas/PiRadio/API/RadioAPI.java b/src/main/java/com/janas/PiRadio/API/RadioAPI.java
@@ -20,7 +20,10 @@ public String validate(){
     @GetMapping("/on/{name}")
     public void turnOnRadio(@PathVariable("name") String name ){
         try {
-            Radio.init(radioStations.getStation(name));
+            String path = radioStations.getStation(name);
+            if (path.length() > 0){
+                Radio.init(path);
+            }
         } catch (Exception e){
             System.out.println("Exception: " + e.toString());
         }

diff --git a/src/main/java/com/janas/PiRadio/Radio/RadioStations.java b/src/main/java/com/janas/PiRadio/Radio/RadioStations.java
@@ -13,14 +13,19 @@ public class RadioStations {
 
     private Map<String, String> stations = new HashMap<>();
 
-    private File file = new File("radio-stations.txt");
+    private File file;
 
     public RadioStations(){
+        String path = "/home/" + System.getProperty("user.name") + "/radio-stations.txt";
+        file = new File(path);
         load();
     }
 
     public String getStation(String name){
-        return stations.get(name);
+        if (stations.containsKey(name)){
+            return stations.get(name);
+        }
+        return "";
     }
 
     public void putStation(String name, String url){