mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* improved clean-up of path separators in series name and episode title

This commit is contained in:
Reinhard Pointner 2010-02-04 23:22:28 +00:00
parent 911cc24ba5
commit d9027b06ad
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/net/sourceforge/filebot/ui/panel/rename/EpisodeExpressionFormatter.java
View File

@ -64,7 +64,7 @@ class EpisodeExpressionFormatter implements MatchFormatter {
// if the binding value is a String, remove illegal characters
if (value instanceof CharSequence) {
return removePathSeparators(value.toString()).trim();
return replacePathSeparators(value.toString()).trim();
}
// if the binding value is an Object, just leave it

2
source/net/sourceforge/filebot/ui/panel/rename/MovieFormatter.java
View File

@ -35,6 +35,6 @@ class MovieFormatter implements MatchFormatter {
name.format(" CD%d", video.getPartIndex() + 1);
// remove path separators if the name contains any / or \
return removePathSeparators(name.out().toString());
return replacePathSeparators(name.out().toString());
}
}

2
source/net/sourceforge/filebot/ui/panel/rename/RenameModel.java
View File

@ -53,7 +53,7 @@ public class RenameModel extends MatchModel<Object, File> {
@Override
public String format(Match<?, ?> match) {
// clean up path separators like / or \
return removePathSeparators(String.valueOf(match.getValue()).trim());
return replacePathSeparators(String.valueOf(match.getValue()).trim());
}
};

5
source/net/sourceforge/tuned/FileUtilities.java
View File

@ -183,7 +183,6 @@ public final class FileUtilities {
* Invalid file name characters: \, /, :, *, ?, ", <, >, |, \r and \n
*/
public static final Pattern ILLEGAL_CHARACTERS = Pattern.compile("[\\\\/:*?\"<>|\\r\\n]");
public static final Pattern PATH_SEPARATORS = Pattern.compile("[\\\\/]");
/**
@ -240,8 +239,8 @@ public final class FileUtilities {
}
public static String removePathSeparators(CharSequence path) {
return PATH_SEPARATORS.matcher(path).replaceAll("");
public static String replacePathSeparators(CharSequence path) {
return Pattern.compile("\\s*[\\\\/]+\\s*").matcher(path).replaceAll(" ");
}