More nits and fixes

Author: MartelliEnrico

src/main/java/com/github/stickerifier/stickerify/exception/TelegramApiException.java

@@ -9,7 +9,7 @@ public TelegramApiException(String requestMethod, String description) {
 	}
 
 	/**
-	 * @return the description of the error received by the api call
+	 * @return the description of the error received by the API call
 	 */
 	public String getDescription() {
 		return description;

src/main/java/com/github/stickerifier/stickerify/logger/HighlightHelper.java

@@ -12,7 +12,7 @@
 public final class HighlightHelper {
 
 	static final String START_GREEN = changeColorTo(BOLD + GREEN_FG);
-	private static final Pattern MIME_TYPE_PATTERN = Pattern.compile(" (\\w+/[-+.\\w]+) ");
+	private static final Pattern MIME_TYPE_PATTERN = Pattern.compile("(^|\\s)(\\w+/[-+.\\w]+)(?=\\s|$)");
 
 	static String changeColorTo(final String color) {
 		return ESC_START + color + ESC_END;
@@ -33,7 +33,7 @@ static String greenHighlight(final String message, String previousColor) {
 	static @Nullable String retrieveMimeType(final String message) {
 		var matcher = MIME_TYPE_PATTERN.matcher(message);
 
-		return matcher.find() ? matcher.group(1) : null;
+		return matcher.find() ? matcher.group(2) : null;
 	}
 
 	static String replaceFirst(String message, String textToReplace, String replacement) {

src/main/java/com/github/stickerifier/stickerify/media/MediaHelper.java

@@ -34,7 +34,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.List;
+import java.util.Set;
 import java.util.zip.GZIPInputStream;
 
 public final class MediaHelper {
@@ -43,7 +43,7 @@ public final class MediaHelper {
 
 	private static final Tika TIKA = new Tika();
 	private static final Gson GSON = new Gson();
-	private static final List<String> SUPPORTED_VIDEOS = List.of("image/gif", "video/quicktime", "video/webm",
+	private static final Set<String> SUPPORTED_VIDEOS = Set.of("image/gif", "video/quicktime", "video/webm",
 			"video/mp4", "video/x-m4v", "application/x-matroska", "video/x-msvideo");
 
 	private static final int IMAGE_KEEP_ASPECT_RATIO = -1;
@@ -118,7 +118,7 @@ private static String detectMimeType(File file) throws MediaException {
 	 * @return {@code true} if the MIME type is supported
 	 */
 	private static boolean isSupportedVideo(String mimeType) {
-		return SUPPORTED_VIDEOS.stream().anyMatch(format -> format.equals(mimeType));
+		return SUPPORTED_VIDEOS.contains(mimeType);
 	}
 
 	/**
@@ -274,12 +274,13 @@ private static File convertToWebp(File file) throws MediaException, InterruptedE
 		var command = new String[] {
 				"ffmpeg",
 				"-y",
+				"-hide_banner",
 				"-v", "error",
 				"-i", file.getAbsolutePath(),
 				"-vf", "scale='if(gt(iw,ih),%1$d,%2$d)':'if(gt(iw,ih),%2$d,%1$d)'".formatted(MAX_SIDE_LENGTH, IMAGE_KEEP_ASPECT_RATIO),
 				"-c:v", "libwebp",
 				"-lossless", "1",
-				"-q:v", "100",
+				"-compression_level", "6",
 				webpImage.getAbsolutePath()
 		};
 
@@ -355,6 +356,7 @@ private static File convertToWebm(File file) throws MediaException, InterruptedE
 		var baseCommand = new String[] {
 				"ffmpeg",
 				"-y",
+				"-hide_banner",
 				"-v", "error",
 				"-i", file.getAbsolutePath(),
 				"-vf", "scale='if(gt(iw,ih),%1$d,%2$d)':'if(gt(iw,ih),%2$d,%1$d)',fps='min(%3$d,source_fps)'".formatted(MAX_SIDE_LENGTH, VIDEO_KEEP_ASPECT_RATIO, MAX_VIDEO_FRAMES),

src/main/java/com/github/stickerifier/stickerify/process/PathLocator.java

@@ -21,6 +21,7 @@ public enum PathLocator implements ProcessLocator {
 	PathLocator() {
 		var logger = LoggerFactory.getLogger(PathLocator.class);
 		var ffmpegLocation = System.getenv("FFMPEG_PATH");
+
 		try {
 			if (ffmpegLocation == null || ffmpegLocation.isBlank()) {
 				ffmpegLocation = ProcessHelper.executeCommand(OsConstants.FIND_EXECUTABLE, "ffmpeg").getFirst();
@@ -32,6 +33,7 @@ public enum PathLocator implements ProcessLocator {
 		} catch (InterruptedException _) {
 			Thread.currentThread().interrupt();
 		}
+
 		this.ffmpegLocation = Objects.requireNonNull(ffmpegLocation);
 	}
 

src/main/java/com/github/stickerifier/stickerify/process/ProcessHelper.java

@@ -3,14 +3,18 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.github.stickerifier.stickerify.exception.ProcessException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 
 public final class ProcessHelper {
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(ProcessHelper.class);
 	private static final Semaphore SEMAPHORE = new Semaphore(getMaxConcurrentProcesses());
 
 	/**
@@ -23,6 +27,7 @@ public final class ProcessHelper {
 	 * @throws ProcessException either if:
 	 * <ul>
 	 *     <li>the command was unsuccessful
+	 *     <li>the waiting time elapsed
 	 *     <li>an unexpected failure happened running the command
 	 *     <li>an unexpected failure happened reading the output
 	 * </ul>
@@ -33,19 +38,28 @@ public static List<String> executeCommand(final String... command) throws Proces
 		try {
 			var process = new ProcessBuilder(command).redirectErrorStream(true).start();
 
-			var output = new LinkedList<String>();
-			try (var reader = process.inputReader(UTF_8)) {
-				reader.lines().forEach(output::add);
+			var output = new ArrayList<String>(64);
+			Thread.ofVirtual().start(() -> {
+				try (var reader = process.inputReader(UTF_8)) {
+					reader.lines().forEach(output::add);
+				} catch (IOException e) {
+					LOGGER.atError().setCause(e).log("Error while closing process output reader");
+				}
+			});
+
+			var finished = process.waitFor(1, TimeUnit.MINUTES);
+			if (!finished) {
+				process.destroyForcibly();
+				throw new ProcessException("The command {} timed out after 1m\n{}", command[0], String.join("\n", output));
 			}
 
-			var exitCode = process.waitFor();
+			var exitCode = process.exitValue();
 			if (exitCode != 0) {
-				process.destroy();
 				var lines = String.join("\n", output);
 				throw new ProcessException("The command {} exited with code {}\n{}", command[0], exitCode, lines);
 			}
 
-			return output;
+			return List.copyOf(output);
 		} catch (IOException e) {
 			throw new ProcessException(e);
 		} finally {
@@ -54,8 +68,12 @@ public static List<String> executeCommand(final String... command) throws Proces
 	}
 
 	private static int getMaxConcurrentProcesses() {
-		var value = System.getenv("CONCURRENT_PROCESSES");
-		return value == null ? 4 : Integer.parseInt(value);
+		var env = System.getenv("CONCURRENT_PROCESSES");
+		var value = env == null ? 4 : Integer.parseInt(env);
+		if (value <= 1) {
+			throw new IllegalArgumentException("CONCURRENT_PROCESSES must be >= 1 (was " + env + ")");
+		}
+		return value;
 	}
 
 	private ProcessHelper() {