diff --git a/src/main/java/com/yutou/nas/Services/impl/MusicToolsServiceImpl.java b/src/main/java/com/yutou/nas/Services/impl/MusicToolsServiceImpl.java index 9bb7978..3df25ba 100644 --- a/src/main/java/com/yutou/nas/Services/impl/MusicToolsServiceImpl.java +++ b/src/main/java/com/yutou/nas/Services/impl/MusicToolsServiceImpl.java @@ -120,11 +120,7 @@ public class MusicToolsServiceImpl implements IMusicToolsService { tmpPath = AppData.defaultMusicPath; } if (isDir) { - if (filter) { - example.createCriteria().andFileLike(tmpPath.replace(File.separator, replacement) + "%").andTitleNotLike("instrumental"); - } else { - example.createCriteria().andFileLike(tmpPath.replace(File.separator, replacement) + "%"); - } + example.createCriteria().andFileLike(tmpPath.replace(File.separator, replacement) + "%"); main = musicDataDao.selectByExample(example, delPath); }else { tmpPath = tmpPath.replace(File.separator, replacement) @@ -133,7 +129,7 @@ public class MusicToolsServiceImpl implements IMusicToolsService { .replace("(", "\\(") .replace(")", "\\)") .replace("]", "\\]"); - main.addAll(musicDataDao.selectByRegexp(tmpPath + replacement + "([^" + replacement + "]+)$", delPath)); + main = new ArrayList<>(musicDataDao.selectByRegexp(tmpPath + replacement + "([^" + replacement + "]+)$", delPath)); } if (!path.equals(AppData.defaultMusicPath) && !"root".equals(path)) { @@ -159,7 +155,7 @@ public class MusicToolsServiceImpl implements IMusicToolsService { Comparator compare = Collator.getInstance(Locale.CHINA); return compare.compare(o1.getTitle(), o2.getTitle()); }); - if(filter){ + if (filter) { list.removeIf(data -> data.getTitle().contains("instrumental")); } return list;