From eab928a111a1be4b65aef24a0c79a86bafca7e08 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Mon, 14 Nov 2022 14:08:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=E6=96=B0=E5=A2=9E=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E7=BA=AF=E9=9F=B3=E4=B9=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yutou/nas/Services/impl/MusicToolsServiceImpl.java | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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<Object> 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;