moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-11-16 06:15:02 -05:00
Code Issues Releases Wiki Activity

Use more platform-independent code for our video quality comparator (e.g. based on libmediainfo or ffprobe depending on configuration) to make sure --conflict auto works as expected on platforms where libmediainfo doesn't work

Browse Source
This commit is contained in:
Reinhard Pointner 2019-01-15 23:37:26 +07:00
parent b3d9c53ef7
commit 11c899fddd
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/net/filebot/media/VideoQuality.java
View File

@ -4,6 +4,8 @@ import static java.util.Comparator.*;
import static net.filebot.Logging.*; import static net.filebot.Logging.*;
import static net.filebot.MediaTypes.*; import static net.filebot.MediaTypes.*;
import static net.filebot.media.MediaDetection.*; import static net.filebot.media.MediaDetection.*;
import static net.filebot.media.XattrMetaInfo.*;
import static net.filebot.util.FileUtilities.*;
import static net.filebot.util.StringUtilities.*; import static net.filebot.util.StringUtilities.*;
import java.io.File; import java.io.File;
@ -20,7 +22,7 @@ public class VideoQuality implements Comparator<File> {
return DESCENDING_ORDER.compare(f1, f2) < 0; return DESCENDING_ORDER.compare(f1, f2) < 0;
} }
private final Comparator<File> chain = comparing(f -> new MediaBindingBean(f, f), comparingInt(this::getRepack).thenComparingInt(this::getResolution).thenComparingLong(MediaBindingBean::getFileSize)); private final Comparator<File> chain = comparingInt(this::getRepack).thenComparingInt(this::getResolution).thenComparingLong(File::length);
@Override @Override
public int compare(File f1, File f2) { public int compare(File f1, File f2) {
@ -29,19 +31,19 @@ public class VideoQuality implements Comparator<File> {
private final Pattern repack = releaseInfo.getRepackPattern(); private final Pattern repack = releaseInfo.getRepackPattern();
private int getRepack(MediaBindingBean m) { private int getRepack(File f) {
return find(m.getFileName(), repack) || find(m.getOriginalFileName(), repack) ? 1 : 0; return find(f.getName(), repack) || find(xattr.getOriginalName(f), repack) ? 1 : 0;
} }
private int getResolution(MediaBindingBean m) { private int getResolution(File f) {
// use video file for video/subtitle pairs when comparing the subtitle file // use primary video file when checking video resolution of subtitle files or disk folders
File mediaFile = m.getInferredMediaFile(); f = new MediaBindingBean(f, f).getInferredMediaFile();
if (VIDEO_FILES.accept(mediaFile)) { if (VIDEO_FILES.accept(f) && f.length() > ONE_MEGABYTE) {
try { try (MediaCharacteristics mi = MediaCharacteristicsParser.open(f)) {
return m.getDimension().stream().mapToInt(Number::intValue).reduce((a, b) -> a * b).orElse(0); return mi.getWidth() * mi.getHeight();
} catch (Exception e) { } catch (Exception e) {
debug.warning("Failed to read media info: " + e); debug.warning("Failed to read video resolution: " + e.getMessage());
} }
} }