fix新增过滤纯音乐
This commit is contained in:
parent
e58cb29656
commit
eab928a111
@ -120,11 +120,7 @@ public class MusicToolsServiceImpl implements IMusicToolsService {
|
|||||||
tmpPath = AppData.defaultMusicPath;
|
tmpPath = AppData.defaultMusicPath;
|
||||||
}
|
}
|
||||||
if (isDir) {
|
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);
|
main = musicDataDao.selectByExample(example, delPath);
|
||||||
}else {
|
}else {
|
||||||
tmpPath = tmpPath.replace(File.separator, replacement)
|
tmpPath = tmpPath.replace(File.separator, replacement)
|
||||||
@ -133,7 +129,7 @@ public class MusicToolsServiceImpl implements IMusicToolsService {
|
|||||||
.replace("(", "\\(")
|
.replace("(", "\\(")
|
||||||
.replace(")", "\\)")
|
.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)) {
|
if (!path.equals(AppData.defaultMusicPath) && !"root".equals(path)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user