From a6d270b7a4fa2541a20887ead0446c1ad236daf0 Mon Sep 17 00:00:00 2001
From: nico202 <anothersms@gmail.com>
Date: Thu, 24 May 2018 18:17:37 +0200
Subject: [PATCH] format path from artist and filename

---
 .../music_cyclon/service/BeetsFetcher.java    | 10 +++++--
 .../java/max/music_cyclon/service/Item.java   | 27 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/max/music_cyclon/service/BeetsFetcher.java b/app/src/main/java/max/music_cyclon/service/BeetsFetcher.java
index 9bead5f..d044427 100644
--- a/app/src/main/java/max/music_cyclon/service/BeetsFetcher.java
+++ b/app/src/main/java/max/music_cyclon/service/BeetsFetcher.java
@@ -145,8 +145,14 @@ public class BeetsFetcher {
                 case "id":
                     item.setID(reader.nextInt());
                     break;
-                case "path":
-                    item.setPath(reader.nextString());
+                case "format":
+                    item.setFormat(reader.nextString());
+                    break;
+                case "title":
+                    item.setTitle(reader.nextString());
+                    break;
+                case "artist":
+                    item.setArtist(reader.nextString());
                     break;
                 default:
                     reader.skipValue();
diff --git a/app/src/main/java/max/music_cyclon/service/Item.java b/app/src/main/java/max/music_cyclon/service/Item.java
index 6d47458..a512a28 100644
--- a/app/src/main/java/max/music_cyclon/service/Item.java
+++ b/app/src/main/java/max/music_cyclon/service/Item.java
@@ -4,6 +4,9 @@ public class Item {
 
     private int id;
     private String path;
+    private String artist;
+    private String title;
+    private String format;
 
     public int getID() {
         return id;
@@ -14,10 +17,32 @@ public class Item {
     }
 
     public String getPath() {
-        return path;
+        if (path != null) {
+            return path;
+        } else {
+            return "/" + artist + "/" + title + "_" + id + "." + format.toLowerCase();
+        }
+    }
+    public String getArtist() {
+        return artist;
+    }
+    public String getTitle() {
+        return title;
+    }
+    public String getFormat() {
+        return format;
     }
 
     public void setPath(String path) {
         this.path = path;
     }
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    public void setFormat(String format) {
+        this.format = format;
+    }
+    public void setArtist(String artist) {
+        this.artist = artist;
+    }
 }