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

Fix NPE caused by series name being null

Browse Source
This commit is contained in:
Reinhard Pointner 2019-01-29 02:27:51 +07:00
parent 22a9f01760
commit af498ecd47
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/net/filebot/similarity/EpisodeMatcher.java
View File

@ -13,6 +13,7 @@ import java.util.IdentityHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.function.Function; import java.util.function.Function;
@ -154,7 +155,8 @@ public class EpisodeMatcher extends Matcher<File, Object> {
// check drill-down integrity // check drill-down integrity
return stream(episodes).skip(1).allMatch(e -> { return stream(episodes).skip(1).allMatch(e -> {
return episodes[0].getSeriesName().equals(e.getSeriesName()); // do an equals check but account for null values
return Objects.equals(episodes[0].getSeriesName(), e.getSeriesName());
}); });
} }

5
source/net/filebot/web/TheTVDBClient.java
View File

@ -192,6 +192,11 @@ public class TheTVDBClient extends AbstractEpisodeListProvider implements Artwor
return fetchSeriesData(series, sortOrder, DEFAULT_LOCALE); return fetchSeriesData(series, sortOrder, DEFAULT_LOCALE);
} }
// if series name isn't even available in English then just use whatever value we've got
if (info.getName() == null) {
info.setName(series.getName());
}
// fetch episode data // fetch episode data
List<Episode> episodes = new ArrayList<Episode>(); List<Episode> episodes = new ArrayList<Episode>();
List<Episode> specials = new ArrayList<Episode>(); List<Episode> specials = new ArrayList<Episode>();