Merge pull request #522 from kagemomiji/issue460-suppress-warn-cue-pa…

…rser-warning-from-flac #460 suppress warning of cue parser from FLAC
kagemomiji · Jun 25, 2024 · 50aefe4 · 50aefe4
2 parents d63fef4 + 1fc2de4
commit 50aefe4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java b/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
@@ -836,7 +836,7 @@ private List<MediaFile> updateChildren(@Nonnull MediaFile parent) {
                     tracks.add(base);
                     return tracks.stream();
                 } else {
-                    LOG.warn("Cue sheet file {} not found", filePath);
+                    LOG.warn("Could not find base file '{}' for cue sheet {}", filePath, indexPath);
                     return Stream.empty();
                 }
             }).collect(Collectors.toList());
@@ -1190,8 +1190,6 @@ private List<MediaFile> createIndexedTracks(@Nonnull MediaFile base, @Nullable C
             double wholeFileLength = base.getDuration();
 
             String basePath = base.getPath();
-            String file = cueSheet.getFileData().get(0).getFile();
-            LOG.info(file);
             String parentPath = base.getParentPath();
             String performer = cueSheet.getPerformer();
             String albumName = cueSheet.getTitle();
@@ -1337,7 +1335,8 @@ public void setMemoryCacheEnabled(boolean memoryCacheEnabled) {
     private CueSheet getCueSheet(@Nonnull Path cueFile) {
         try {
             CueSheet cueSheet = null;
-            switch (FilenameUtils.getExtension(cueFile.toString()).toLowerCase()) {
+            String ext = FilenameUtils.getExtension(cueFile.toString()).toLowerCase();
+            switch (ext) {
                 case "cue":
                     Charset cs = Charset.forName("UTF-8"); // default to UTF-8
                     // attempt to detect encoding for cueFile, fallback to UTF-8
@@ -1367,7 +1366,10 @@ private CueSheet getCueSheet(@Nonnull Path cueFile) {
             }
             // validation
             if (cueSheet == null || cueSheet.getFileData() == null || cueSheet.getFileData().size() == 0) {
-                LOG.warn("Error parsing cuesheet {}", cueFile);
+                if ("cue".equals(ext)) {
+                    // Warn if no file data found in cue sheet
+                    LOG.warn("Error parsing cuesheet {}", cueFile);
+                }
                 return null;
             }
             return cueSheet;

diff --git a/install/docker/pom.xml b/install/docker/pom.xml
@@ -53,7 +53,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.7.1</version>
                 <groupId>org.apache.maven.plugins</groupId>
                 <configuration>
                     <stripClassifier>true</stripClassifier>

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
         <java.version>17</java.version>
         <cxf.version>4.0.4</cxf.version>
         <snakeyaml.version>2.2</snakeyaml.version>
-        <lucene.version>9.10.0</lucene.version>
+        <lucene.version>9.11.0</lucene.version>
         <docker.container.repo>ghcr.io/kagemomiji/airsonic-advanced</docker.container.repo>
         <docker.java.version>17.0.10_7</docker.java.version>
     </properties>
@@ -263,7 +263,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.22.0</version>
+                    <version>3.23.0</version>
                     <executions>
                         <execution>
                             <id>validate</id>
@@ -304,7 +304,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.2.5</version>
+                    <version>3.3.0</version>
                     <configuration>
                         <!-- #1186 Temporarily skip a test. -->
                         <excludes>
@@ -352,7 +352,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.7.1</version>
                 <executions>
                     <execution>
                        <id>init</id>