From 068352505cae282a044ec678a3c46f05126c62a1 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Sun, 15 Jul 2018 19:45:07 +0200 Subject: [PATCH] Do not import M3U if no metadata exists --- .../android/vanilla/PlaylistObserver.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/PlaylistObserver.java b/app/src/main/java/ch/blinkenlights/android/vanilla/PlaylistObserver.java index c693cf1e..61005fe2 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/PlaylistObserver.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/PlaylistObserver.java @@ -402,9 +402,14 @@ public class PlaylistObserver extends SQLiteOpenHelper implements Handler.Callba File[] files = mPlaylists.listFiles(); if (files != null) { for (File f : files) { - if (isM3uFilename(f.getName()) && !knownM3u.contains(f)) { - XT("fullSyncScan(): new M3U discovered, must import "+f); - sendUniqueMessage(MSG_IMPORT_M3U, f); + final String fname = f.getName(); + if (isM3uFilename(fname) && !knownM3u.contains(f)) { + if (Playlist.getPlaylist(mContext, fromM3u(fname)) == -1) { + XT("fullSyncScan(): new M3U discovered, must import "+f); + sendUniqueMessage(MSG_IMPORT_M3U, f); + } else { + XT("fullSyncScan(): native version for "+f+" exists without metadata. Won't touch."); + } } } }