1 files changed, 28 insertions, 17 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java b/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java
index 990eae06..332f775c 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java
@@ -182,19 +182,25 @@ public class FileUtil {
 	}
 
     public static File getAlbumArtFile(Context context, MusicDirectory.Entry entry) {
-        File albumDir = getAlbumDirectory(context, entry);
-		File artFile;
-		File albumFile = getAlbumArtFile(albumDir);
-		File hexFile = getHexAlbumArtFile(context, albumDir);
-		if(albumDir.exists()) {
-			if(hexFile.exists()) {
-				hexFile.renameTo(albumFile);
+		if(entry.getId().indexOf("pl-") == -1) {
+			File albumDir = getAlbumDirectory(context, entry);
+			File artFile;
+			File albumFile = getAlbumArtFile(albumDir);
+			File hexFile = getHexAlbumArtFile(context, albumDir);
+			if (albumDir.exists()) {
+				if (hexFile.exists()) {
+					hexFile.renameTo(albumFile);
+				}
+				artFile = albumFile;
+			} else {
+				artFile = hexFile;
 			}
-			artFile = albumFile;
+			return artFile;
 		} else {
-			artFile = hexFile;
+			File playlistDir = getAlbumArtDirectory(context);
+			Log.d(TAG, entry.getTitle() + " => " + Util.md5Hex("pl-" + entry.getTitle()));
+			return  new File(playlistDir, Util.md5Hex("pl-" + entry.getTitle()) + ".jpeg");
 		}
-        return artFile;
     }
 
     public static File getAlbumArtFile(File albumDir) {
@@ -741,23 +747,28 @@ public class FileUtil {
         return index == -1 ? name : name.substring(0, index);
     }
 	
-	public static Pair<Long, Long> getUsedSize(Context context, File file) {
+	public static Long[] getUsedSize(Context context, File file) {
 		long number = 0L;
+		long permanent = 0L;
 		long size = 0L;
 		
 		if(file.isFile()) {
 			if(isMediaFile(file)) {
-				return new Pair<Long, Long>(1L, file.length());
+				if(file.getAbsolutePath().indexOf(".complete") == -1) {
+					permanent++;
+				}
+				return new Long[] {1L, permanent, file.length()};
 			} else {
-				return new Pair<Long, Long>(0L, 0L);
+				return new Long[] {0L, 0L, 0L};
 			}
 		} else {
 			for (File child : FileUtil.listFiles(file)) {
-				Pair<Long, Long> pair = getUsedSize(context, child);
-				number += pair.getFirst();
-				size += pair.getSecond();
+				Long[] pair = getUsedSize(context, child);
+				number += pair[0];
+				permanent += pair[1];
+				size += pair[2];
 			}
-			return new Pair<Long, Long>(number, size);
+			return new Long[] {number, permanent, size};
 		}
 	}