MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Media file scan will now heed configured music/video file types

Browse Source 
It will also now heed the Media Folders -> Exclude Pattern.  Fixes #1227.

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
This commit is contained in:
Evan Harris
2019-10-05 21:14:31 -06:00
committed by Andrew DeMaria
parent 1b28d2c2fe
commit 41967e76df
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtService.java
+1 -1
View File
@@ -154,7 +154,7 @@ public class CoverArtService {
} }
private boolean isMediaFile(File file) { private boolean isMediaFile(File file) {
return !mediaFileService.filterMediaFiles(new File[]{file}).isEmpty(); return mediaFileService.includeMediaFile(file);
} }
private void backup(File newCoverFile, File backup) { private void backup(File newCoverFile, File backup) {
airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
+15 -4
View File
@@ -193,10 +193,10 @@ public class MediaFileService {
List<MediaFile> result = new ArrayList<MediaFile>(); List<MediaFile> result = new ArrayList<MediaFile>();
for (MediaFile child : mediaFileDao.getChildrenOf(parent.getPath())) { for (MediaFile child : mediaFileDao.getChildrenOf(parent.getPath())) {
child = checkLastModified(child, useFastCache); child = checkLastModified(child, useFastCache);
if (child.isDirectory() && includeDirectories) { if (child.isDirectory() && includeDirectories && includeMediaFile(child)) {
result.add(child); result.add(child);
} }
if (child.isFile() && includeFiles) { if (child.isFile() && includeFiles && includeMediaFile(child)) {
result.add(child); result.add(child);
} }
} }
@@ -406,11 +406,22 @@ public class MediaFileService {
mediaFileDao.createOrUpdateMediaFile(parent); mediaFileDao.createOrUpdateMediaFile(parent);
} }
public boolean includeMediaFile(MediaFile candidate) {
return includeMediaFile(candidate.getFile());
}
public boolean includeMediaFile(File candidate) {
String suffix = FilenameUtils.getExtension(candidate.getName()).toLowerCase();
if (!isExcluded(candidate) && (FileUtil.isDirectory(candidate) || isAudioFile(suffix) || isVideoFile(suffix))) {
return true;
}
return false;
}
public List<File> filterMediaFiles(File[] candidates) { public List<File> filterMediaFiles(File[] candidates) {
List<File> result = new ArrayList<File>(); List<File> result = new ArrayList<File>();
for (File candidate : candidates) { for (File candidate : candidates) {
String suffix = FilenameUtils.getExtension(candidate.getName()).toLowerCase(); if (includeMediaFile(candidate)) {
if (!isExcluded(candidate) && (FileUtil.isDirectory(candidate) || isAudioFile(suffix) || isVideoFile(suffix))) {
result.add(candidate); result.add(candidate);
} }
} }