Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#460 suppress warning of cue parser from FLAC #522

Merged
merged 9 commits into from
Jun 25, 2024
Merged

#460 suppress warning of cue parser from FLAC #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
32f6d25
Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.0
dependabot[bot] Jun 25, 2024
98d7d93
Bump lucene.version from 9.10.0 to 9.11.0
dependabot[bot] Jun 25, 2024
d64d3f9
Bump org.apache.maven.plugins:maven-pmd-plugin from 3.22.0 to 3.23.0
dependabot[bot] Jun 25, 2024
a9c7d96
Bump org.apache.maven.plugins:maven-dependency-plugin
dependabot[bot] Jun 25, 2024
f2ce8ff
kagemomiji/airsonic-advanced#460 Update logging message for cue sheet…
kagemomiji Jun 25, 2024
1d58730
Merge commit '32f6d250c83af1ba3794bda4eba4097d5da6cd63' into issue460…
kagemomiji Jun 25, 2024
908405e
Merge commit '98d7d93136a1ec7c3d17a9cb7e47e670cf5a9001' into issue460…
kagemomiji Jun 25, 2024
97ff490
Merge commit 'd64d3f9223ef5237851444b2f297e0cc7defb3be' into issue460…
kagemomiji Jun 25, 2024
1fc2de4
Merge commit 'a9c7d9669b013f99d00a1efb3d68318724be0ddb' into issue460…
kagemomiji Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion install/docker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down