moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-08-13 17:03:45 -04:00
Code Issues Releases Wiki Activity

Improved getVolumeRoots

Browse Source
This commit is contained in:
Reinhard Pointner 2016-04-13 11:21:55 +00:00
parent 560cb67e29
commit 627abb1ced
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/net/filebot/media/ReleaseInfo.java
View File

@ -7,6 +7,7 @@ import static java.util.Collections.*;
import static java.util.ResourceBundle.*; import static java.util.ResourceBundle.*;
import static java.util.regex.Pattern.*; import static java.util.regex.Pattern.*;
import static java.util.stream.Collectors.*; import static java.util.stream.Collectors.*;
import static net.filebot.Settings.*;
import static net.filebot.similarity.Normalization.*; import static net.filebot.similarity.Normalization.*;
import static net.filebot.util.FileUtilities.*; import static net.filebot.util.FileUtilities.*;
import static net.filebot.util.RegularExpressions.*; import static net.filebot.util.RegularExpressions.*;
@ -44,6 +45,7 @@ import org.tukaani.xz.XZInputStream;
import net.filebot.Cache; import net.filebot.Cache;
import net.filebot.CacheType; import net.filebot.CacheType;
import net.filebot.Resource; import net.filebot.Resource;
import net.filebot.Settings.ApplicationFolder;
import net.filebot.util.FileUtilities.RegexFileFilter; import net.filebot.util.FileUtilities.RegexFileFilter;
import net.filebot.util.SystemProperty; import net.filebot.util.SystemProperty;
import net.filebot.web.Movie; import net.filebot.web.Movie;
@ -219,28 +221,32 @@ public class ReleaseInfo {
Set<File> volumes = new HashSet<File>(); Set<File> volumes = new HashSet<File>();
// user root folder // user root folder
volumes.add(new File(System.getProperty("user.home"))); volumes.add(ApplicationFolder.UserHome.get());
// Windows / Linux / Mac system roots // Windows / Linux / Mac system roots
volumes.addAll(getFileSystemRoots()); volumes.addAll(getFileSystemRoots());
// Linux / Mac
if (File.separator.equals("/")) { if (File.separator.equals("/")) {
// Linux and Mac system root folders // Linux and Mac system root folders
for (File root : getFileSystemRoots()) { for (File userFolder : volumes.toArray(new File[0])) {
volumes.addAll(getChildren(root, FOLDERS)); volumes.addAll(getChildren(userFolder, FOLDERS));
} }
// user-specific media roots
String username = System.getProperty("user.name", "anonymous");
for (File mediaRoot : getMediaRoots()) { for (File mediaRoot : getMediaRoots()) {
volumes.addAll(getChildren(mediaRoot, FOLDERS)); volumes.addAll(getChildren(mediaRoot, FOLDERS));
volumes.add(mediaRoot); volumes.add(mediaRoot);
}
}
// add additional user roots if user.home is not set properly or listFiles doesn't work // Mac
File userRoot = new File(mediaRoot, username); if (isMacSandbox()) {
volumes.add(userRoot); File realUserHome = ApplicationFolder.UserHome.get();
volumes.add(new File(userRoot, "Movies")); // ignore default Movie folder on Mac File sandboxUserHome = new File(System.getProperty("user.home"));
// e.g. ignore default Movie folder on Mac
for (File userFolder : getChildren(sandboxUserHome, FOLDERS)) {
volumes.add(new File(realUserHome, userFolder.getName()));
} }
} }