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

Make sure that {model} works even for simple -list calls (useful for testing --filter expressions)

This commit is contained in:
Reinhard Pointner 2016-11-11 03:27:38 +08:00
parent dac3877ba9
commit 5dd26ba347
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/net/filebot/cli/CmdlineOperations.java
View File

@ -1027,32 +1027,30 @@ public class CmdlineOperations implements CmdlineInterface {
@Override @Override
public List<String> fetchEpisodeList(String query, String expression, String db, String sortOrderName, String filterExpression, String languageName) throws Exception { public List<String> fetchEpisodeList(String query, String expression, String db, String sortOrderName, String filterExpression, String languageName) throws Exception {
if (query == null || query.isEmpty()) if (query == null || query.isEmpty()) {
throw new IllegalArgumentException("query is not defined"); throw new IllegalArgumentException("query is not defined");
}
// find series on the web and fetch episode list // find series on the web and fetch episode list
ExpressionFormat format = (expression != null) ? new ExpressionFormat(expression) : null; ExpressionFormat format = expression == null ? null : new ExpressionFormat(expression);
ExpressionFilter filter = (filterExpression != null) ? new ExpressionFilter(filterExpression) : null; ExpressionFilter filter = filterExpression == null ? null : new ExpressionFilter(filterExpression);
EpisodeListProvider service = (db == null) ? TheTVDB : getEpisodeListProvider(db); EpisodeListProvider service = db == null ? TheTVDB : getEpisodeListProvider(db);
SortOrder sortOrder = SortOrder.forName(sortOrderName); SortOrder sortOrder = SortOrder.forName(sortOrderName);
Locale locale = getLanguage(languageName).getLocale(); Locale locale = getLanguage(languageName).getLocale();
// fetch episode data // search and select search result
List<SearchResult> options = selectSearchResult(query, service.search(query, locale), false, false); List<SearchResult> options = selectSearchResult(query, service.search(query, locale), false, false);
if (options.isEmpty()) if (options.isEmpty()) {
throw new CmdlineException(service.getName() + ": no results"); throw new CmdlineException(service.getName() + ": no results");
List<Episode> episodes = service.getEpisodeList(options.get(0), sortOrder, locale);
// apply filter
episodes = applyExpressionFilter(episodes, filter);
List<String> names = new ArrayList<String>();
for (Episode it : episodes) {
String name = (format != null) ? format.format(new MediaBindingBean(it, null, null)) : EpisodeFormat.SeasonEpisode.format(it);
names.add(name);
} }
return names;
// fetch episodes and apply filter
List<Episode> episodes = applyExpressionFilter(service.getEpisodeList(options.get(0), sortOrder, locale), filter);
Map<File, Episode> context = new EntryList<File, Episode>(null, episodes);
return episodes.stream().map(episode -> {
return format != null ? format.format(new MediaBindingBean(episode, null, context)) : EpisodeFormat.SeasonEpisode.format(episode);
}).collect(toList());
} }
@Override @Override