java-projects/ffmpegbot
1
0
Fork 0
mirror of https://github.com/aNNiMON/ffmpegbot synced 2024-09-19 22:54:20 +03:00
Code

Improve parameters resolver logic

Browse Source
This commit is contained in:
aNNiMON 2023-10-18 22:55:07 +03:00
parent aa3b01ea5e
commit 46f40a4617
11 changed files with 169 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/annimon/ffmpegbot/commands/ffmpeg/MediaProcessingBundle.java
View File

@ -4,6 +4,8 @@ import com.annimon.ffmpegbot.file.FileDownloadException;
import com.annimon.ffmpegbot.file.FileDownloader;
import com.annimon.ffmpegbot.parameters.Parameter;
import com.annimon.ffmpegbot.file.FilePath;
import com.annimon.ffmpegbot.parameters.resolvers.GlobalParametersResolver;
import com.annimon.ffmpegbot.parameters.resolvers.ParametersResolver;
import com.annimon.ffmpegbot.session.MediaSession;
import com.annimon.ffmpegbot.session.Resolver;
import com.annimon.ffmpegbot.session.Sessions;
@ -17,6 +19,7 @@ import com.annimon.tgbotsmodule.services.CommonAbsSender;
import org.jetbrains.annotations.NotNull;
import org.telegram.telegrambots.meta.api.objects.Message;
import java.util.ArrayList;
import java.util.concurrent.CompletableFuture;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
@ -30,10 +33,12 @@ public class MediaProcessingBundle implements CommandBundle<For> {
private final Sessions sessions;
private final FileDownloader fileDownloader;
private final ParametersResolver parametersResolver;
public MediaProcessingBundle(Sessions sessions, FileDownloader fileDownloader) {
this.sessions = sessions;
this.fileDownloader = fileDownloader;
this.parametersResolver = new GlobalParametersResolver();
}
@Override
@ -51,7 +56,10 @@ public class MediaProcessingBundle implements CommandBundle<For> {
final var session = new MediaSession();
session.setChatId(message.getChatId());
session.fromFileInfo(fileInfo);
session.setParams(Resolver.resolveParameters(fileInfo.fileType()));
final var params = new ArrayList<Parameter<?>>();
parametersResolver.resolve(params, fileInfo);
session.setParams(params);
final var result = Methods.sendMessage()
.setChatId(message.getChatId())

8
src/main/java/com/annimon/ffmpegbot/parameters/OutputFormat.java
View File

@ -9,14 +9,6 @@ public class OutputFormat extends StringParameter {
public static final String AUDIO = "AUDIO";
public static final String VIDEO_NOTE = "VIDEO NOTE";
public static OutputFormat forVideo() {
return new OutputFormat(List.of(VIDEO, AUDIO), VIDEO);
}
public static OutputFormat forVideoNote() {
return new OutputFormat(List.of(VIDEO_NOTE, VIDEO, AUDIO), VIDEO_NOTE);
}
public OutputFormat(List<String> values, String initialValue) {
super("output", "Output", values, initialValue);
}

56
src/main/java/com/annimon/ffmpegbot/parameters/Parameters.java
View File

@ -1,56 +0,0 @@
package com.annimon.ffmpegbot.parameters;
import java.util.List;
public class Parameters {
public static List<Parameter<?>> forAudio() {
return List.of(
new AudioBitrate(),
new AudioEffect(),
new AudioPitch(),
new AudioVolume(),
new SpeedFactor()
);
}
public static List<Parameter<?>> forAnimation() {
return List.of(
new VideoBitrate(),
new VideoScale(),
new VideoFrameRate(),
new SpeedFactor()
);
}
public static List<Parameter<?>> forVideo() {
return List.of(
new DisableAudio(),
new AudioBitrate(),
new AudioEffect(),
new AudioPitch(),
new AudioVolume(),
new AudioStreamByLanguage(),
new VideoBitrate(),
new VideoScale(),
new VideoFrameRate(),
new SpeedFactor(),
OutputFormat.forVideo()
);
}
public static List<Parameter<?>> forVideoNote() {
return List.of(
new DisableAudio(),
new AudioBitrate(),
new AudioEffect(),
new AudioPitch(),
new AudioVolume(),
new VideoBitrate(),
new VideoScale(),
new VideoFrameRate(),
new SpeedFactor(),
OutputFormat.forVideoNote()
);
}
}

39
src/main/java/com/annimon/ffmpegbot/parameters/resolvers/AudioResolver.java Normal file
View File

@ -0,0 +1,39 @@
package com.annimon.ffmpegbot.parameters.resolvers;
import com.annimon.ffmpegbot.parameters.*;
import com.annimon.ffmpegbot.session.FileInfo;
import com.annimon.ffmpegbot.session.FileType;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class AudioResolver implements ParametersResolver {
@Override
public void resolve(@NotNull List<Parameter<?>> parameters, @NotNull FileInfo fileInfo) {
final boolean hasAudio = switch (fileInfo.fileType()) {
case ANIMATION -> false;
case AUDIO, VOICE -> true;
case VIDEO, VIDEO_NOTE -> true; // TODO: add actual ffprobe check for audio
};
if (hasAudio) {
disableAudioParam(parameters, fileInfo.fileType());
parameters.addAll(List.of(
new AudioBitrate(),
new AudioEffect(),
new AudioPitch(),
new AudioVolume()
));
}
}
private void disableAudioParam(@NotNull List<Parameter<?>> parameters, @NotNull FileType fileType) {
final boolean canAudioBeDisabled = switch (fileType) {
case ANIMATION, AUDIO, VOICE -> false;
case VIDEO, VIDEO_NOTE -> true;
};
if (canAudioBeDisabled) {
parameters.add(new DisableAudio());
}
}
}

27
src/main/java/com/annimon/ffmpegbot/parameters/resolvers/GlobalParametersResolver.java Normal file
View File

@ -0,0 +1,27 @@
package com.annimon.ffmpegbot.parameters.resolvers;
import com.annimon.ffmpegbot.parameters.Parameter;
import com.annimon.ffmpegbot.session.FileInfo;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
public class GlobalParametersResolver implements ParametersResolver {
private final List<ParametersResolver> resolvers;
public GlobalParametersResolver() {
resolvers = new ArrayList<>();
resolvers.add(new AudioResolver());
resolvers.add(new MultiAudioStreamsResolver());
resolvers.add(new VideoResolver());
resolvers.add(new SpeedFactorResolver());
resolvers.add(new OutputFormatResolver());
}
@Override
public void resolve(@NotNull List<Parameter<?>> parameters, @NotNull FileInfo fileInfo) {
for (ParametersResolver resolver : resolvers) {
resolver.resolve(parameters, fileInfo);
}
}
}

16
src/main/java/com/annimon/ffmpegbot/parameters/resolvers/MultiAudioStreamsResolver.java Normal file
View File

@ -0,0 +1,16 @@
package com.annimon.ffmpegbot.parameters.resolvers;
import com.annimon.ffmpegbot.parameters.Parameter;
import com.annimon.ffmpegbot.session.FileInfo;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class MultiAudioStreamsResolver implements ParametersResolver {
@Override
public void resolve(@NotNull List<Parameter<?>> parameters, @NotNull FileInfo fileInfo) {
// TODO: Disabled until files support will be implemented
// Check for mkv file type
// parameters.add(new AudioStreamByLanguage());
}
}

23
src/main/java/com/annimon/ffmpegbot/parameters/resolvers/OutputFormatResolver.java Normal file
View File

@ -0,0 +1,23 @@
package com.annimon.ffmpegbot.parameters.resolvers;
import com.annimon.ffmpegbot.parameters.OutputFormat;
import com.annimon.ffmpegbot.parameters.Parameter;
import com.annimon.ffmpegbot.session.FileInfo;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import static com.annimon.ffmpegbot.parameters.OutputFormat.*;
public class OutputFormatResolver implements ParametersResolver {
@Override
public void resolve(@NotNull List<Parameter<?>> parameters, @NotNull FileInfo fileInfo) {
final var outputFormat = switch (fileInfo.fileType()) {
case VIDEO -> new OutputFormat(List.of(VIDEO, AUDIO), VIDEO);
case VIDEO_NOTE -> new OutputFormat(List.of(VIDEO_NOTE, VIDEO, AUDIO), VIDEO_NOTE);
default -> null;
};
if (outputFormat != null) {
parameters.add(outputFormat);
}
}
}

11
src/main/java/com/annimon/ffmpegbot/parameters/resolvers/ParametersResolver.java Normal file
View File

@ -0,0 +1,11 @@
package com.annimon.ffmpegbot.parameters.resolvers;
import com.annimon.ffmpegbot.parameters.Parameter;
import com.annimon.ffmpegbot.session.FileInfo;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public interface ParametersResolver {
void resolve(@NotNull List<Parameter<?>> parameters, @NotNull FileInfo fileInfo);
}

16
src/main/java/com/annimon/ffmpegbot/parameters/resolvers/SpeedFactorResolver.java Normal file
View File

@ -0,0 +1,16 @@
package com.annimon.ffmpegbot.parameters.resolvers;
import com.annimon.ffmpegbot.parameters.Parameter;
import com.annimon.ffmpegbot.parameters.SpeedFactor;
import com.annimon.ffmpegbot.session.FileInfo;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class SpeedFactorResolver implements ParametersResolver {
@Override
public void resolve(@NotNull List<Parameter<?>> parameters, @NotNull FileInfo fileInfo) {
// For anything except static images
parameters.add(new SpeedFactor());
}
}

25
src/main/java/com/annimon/ffmpegbot/parameters/resolvers/VideoResolver.java Normal file
View File

@ -0,0 +1,25 @@
package com.annimon.ffmpegbot.parameters.resolvers;
import com.annimon.ffmpegbot.parameters.*;
import com.annimon.ffmpegbot.session.FileInfo;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class VideoResolver implements ParametersResolver {
@Override
public void resolve(@NotNull List<Parameter<?>> parameters, @NotNull FileInfo fileInfo) {
final boolean hasVideo = switch (fileInfo.fileType()) {
case ANIMATION, VIDEO, VIDEO_NOTE -> true;
default -> false;
};
if (hasVideo) {
parameters.addAll(List.of(
new VideoBitrate(),
new VideoScale(),
new VideoFrameRate()
));
}
}
}

18
src/main/java/com/annimon/ffmpegbot/session/Resolver.java
View File

@ -1,17 +1,14 @@
package com.annimon.ffmpegbot.session;
import com.annimon.ffmpegbot.parameters.Parameter;
import com.annimon.ffmpegbot.parameters.Parameters;
import com.annimon.tgbotsmodule.api.methods.Methods;
import com.annimon.tgbotsmodule.api.methods.interfaces.MediaMessageMethod;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.telegram.telegrambots.meta.api.methods.ActionType;
import org.telegram.telegrambots.meta.api.objects.Message;
import java.util.List;
public class Resolver {
public static FileInfo resolveFileInfo(@NotNull Message message) {
public static @Nullable FileInfo resolveFileInfo(@NotNull Message message) {
if (message.hasAnimation()) {
final var att = message.getAnimation();
return new FileInfo(FileType.ANIMATION, att.getFileId(), att.getFileName(),
@ -36,15 +33,6 @@ public class Resolver {
}
}
public static List<Parameter<?>> resolveParameters(@NotNull FileType fileType) {
return switch (fileType) {
case ANIMATION -> Parameters.forAnimation();
case VIDEO -> Parameters.forVideo();
case VIDEO_NOTE -> Parameters.forVideoNote();
case AUDIO, VOICE -> Parameters.forAudio();
};
}
public static MediaMessageMethod<? extends MediaMessageMethod<?, ?>, ?> resolveMethod(@NotNull FileType fileType) {
return switch (fileType) {
case ANIMATION -> Methods.sendAnimation();
@ -55,7 +43,7 @@ public class Resolver {
};
}
public static ActionType resolveAction(FileType fileType) {
public static ActionType resolveAction(@NotNull FileType fileType) {
return switch (fileType) {
case VIDEO -> ActionType.UPLOADVIDEO;
case VIDEO_NOTE -> ActionType.UPLOADVIDEONOTE;