From eb16f3ed8272daf28c4b0936920acf7a790ef751 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Fri, 27 Mar 2015 17:19:57 -0700 Subject: #478 Make duplicate track renaming optional --- src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java | 3 ++- src/github/daneren2005/dsub/util/Constants.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/github') diff --git a/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java b/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java index 9e5b48b4..a786bceb 100644 --- a/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java +++ b/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java @@ -51,6 +51,7 @@ public class MusicDirectoryParser extends MusicDirectoryEntryParser { MusicDirectory dir = new MusicDirectory(); int eventType; boolean isArtist = false; + boolean checkForDuplicates = Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_RENAME_DUPLICATES, true); Map titleMap = new HashMap(); do { eventType = nextParseEvent(); @@ -61,7 +62,7 @@ public class MusicDirectoryParser extends MusicDirectoryEntryParser { entry.setGrandParent(dir.getParent()); // Only check for songs - if(!entry.isDirectory()) { + if(checkForDuplicates && !entry.isDirectory()) { // Check if duplicates Entry duplicate = titleMap.get(entry.getTitle()); if (duplicate != null) { diff --git a/src/github/daneren2005/dsub/util/Constants.java b/src/github/daneren2005/dsub/util/Constants.java index 0102aba1..9622e84c 100644 --- a/src/github/daneren2005/dsub/util/Constants.java +++ b/src/github/daneren2005/dsub/util/Constants.java @@ -154,6 +154,7 @@ public final class Constants { public static final String PREFERENCES_KEY_ALBUMS_PER_FOLDER = "albumsPerFolder"; public static final String PREFERENCES_KEY_CAST_PROXY = "castProxy"; public static final String PREFERENCES_KEY_DISABLE_EXIT_PROMPT = "disableExitPrompt"; + public static final String PREFERENCES_KEY_RENAME_DUPLICATES = "renameDuplicates"; public static final String OFFLINE_SCROBBLE_COUNT = "scrobbleCount"; public static final String OFFLINE_SCROBBLE_ID = "scrobbleID"; -- cgit v1.2.3