From 108feea089881e4f9d29cd3e938d03e2e353f289 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Tue, 27 May 2014 21:59:14 -0700 Subject: #351 Don't include folders in rebase --- .../dsub/service/parser/MusicDirectoryParser.java | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java b/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java index d968f82e..e705c54d 100644 --- a/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java +++ b/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java @@ -61,18 +61,21 @@ public class MusicDirectoryParser extends MusicDirectoryEntryParser { Entry entry = parseEntry(artist); entry.setGrandParent(dir.getParent()); - // Check if duplicates - Entry duplicate = titleMap.get(entry.getTitle()); - if(duplicate != null) { - // Check if the first already has been rebased or not - if(duplicate.getTitle().equals(entry.getTitle())) { - duplicate.rebaseTitleOffPath(); + // Only check for songs + if(!entry.isDirectory()) { + // Check if duplicates + Entry duplicate = titleMap.get(entry.getTitle()); + if (duplicate != null) { + // Check if the first already has been rebased or not + if (duplicate.getTitle().equals(entry.getTitle())) { + duplicate.rebaseTitleOffPath(); + } + + // Rebase if this is the second instance of this title found + entry.rebaseTitleOffPath(); + } else { + titleMap.put(entry.getTitle(), entry); } - - // Rebase if this is the second instance of this title found - entry.rebaseTitleOffPath(); - } else { - titleMap.put(entry.getTitle(), entry); } dir.addChild(entry); -- cgit v1.2.3