From 039f2b6a0b18ac9c10ca3a8d7c21cecd3d865850 Mon Sep 17 00:00:00 2001 From: JW Date: Fri, 19 Jan 2024 19:14:32 +0100 Subject: [PATCH] MINOR Fixed poms files --- Examples/pom.xml | 10 ++++- .../jwdeveloper/tiktok/CollectorExample.java | 3 +- extension-collector/pom.xml | 2 +- extension-recorder/pom.xml | 8 +--- .../recorder/impl/RecorderListener.java | 38 ------------------- 5 files changed, 12 insertions(+), 49 deletions(-) diff --git a/Examples/pom.xml b/Examples/pom.xml index 7b41c54..8605c97 100644 --- a/Examples/pom.xml +++ b/Examples/pom.xml @@ -63,13 +63,19 @@ io.github.jwdeveloper.tiktok extension-collector - 1.0.14-Release + ${project.version} compile io.github.jwdeveloper.tiktok extension-recorder - 1.0.14-Release + ${project.version} + compile + + + io.github.jwdeveloper.tiktok + extension-collector + 1.0.17-Release compile diff --git a/Examples/src/main/java/io/github/jwdeveloper/tiktok/CollectorExample.java b/Examples/src/main/java/io/github/jwdeveloper/tiktok/CollectorExample.java index e00f6cd..39e8520 100644 --- a/Examples/src/main/java/io/github/jwdeveloper/tiktok/CollectorExample.java +++ b/Examples/src/main/java/io/github/jwdeveloper/tiktok/CollectorExample.java @@ -22,9 +22,10 @@ */ package io.github.jwdeveloper.tiktok; -import io.github.jwdeveloper.tiktok.extension.collector.TikTokLiveCollector; +import io.github.jwdeveloper.tiktok.extension.collector.TikTokLiveCollector; + import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/extension-collector/pom.xml b/extension-collector/pom.xml index c5031d5..46e3a07 100644 --- a/extension-collector/pom.xml +++ b/extension-collector/pom.xml @@ -6,7 +6,7 @@ io.github.jwdeveloper.tiktok TikTokLiveJava - 1.0.14-Release + 1.0.17-Release diff --git a/extension-recorder/pom.xml b/extension-recorder/pom.xml index 6a9dd46..cd16512 100644 --- a/extension-recorder/pom.xml +++ b/extension-recorder/pom.xml @@ -5,7 +5,7 @@ TikTokLiveJava io.github.jwdeveloper.tiktok - 1.0.14-Release + 1.0.17-Release 4.0.0 extension-recorder @@ -16,12 +16,6 @@ 1.0.14-Release compile - - net.bramp.ffmpeg - ffmpeg - 0.8.0 - compile - io.github.jwdeveloper.tiktok API diff --git a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java index d283c48..6ff5d17 100644 --- a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java +++ b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java @@ -37,10 +37,6 @@ import io.github.jwdeveloper.tiktok.extension.recorder.impl.enums.LiveQuality; import io.github.jwdeveloper.tiktok.extension.recorder.impl.event.TikTokLiveRecorderStartedEvent; import io.github.jwdeveloper.tiktok.http.HttpClientFactory; import io.github.jwdeveloper.tiktok.live.LiveClient; -import net.bramp.ffmpeg.FFmpeg; -import net.bramp.ffmpeg.FFmpegExecutor; -import net.bramp.ffmpeg.RunProcessFunction; -import net.bramp.ffmpeg.builder.FFmpegBuilder; import javax.net.ssl.HttpsURLConnection; import java.io.*; @@ -95,39 +91,6 @@ public class RecorderListener implements LiveRecorder { @TikTokEventObserver private void onConnected(LiveClient liveClient, TikTokConnectedEvent event) { - /* liveDownloadThread = new Thread(() -> - { - try { - var ffmpeg = new FFmpeg(settings.getFfmpegPath(), new RunProcessFunction() { - @Override - public Process run(final List args) throws IOException { - var process = super.run(args); - Runtime.getRuntime().addShutdownHook(new Thread(() -> { - terminateFfmpeg(process); - }, "FFmpeg process destroyer")); - return process; - } - }); - - var builder = new FFmpegBuilder() - .setInput(downloadData.getFullUrl()) - .addOutput(settings.getOutputPath() + File.separator + settings.getOutputFileName()) // Set the output file path - .setFormat("mp4") - .done(); - - var executor = new FFmpegExecutor(ffmpeg); - var ffmpegProcess = executor.createJob(builder, (progress)-> { - liveClient.getLogger().info("Downloading stream: " +progress.total_size); - }); - ffmpegProcess.run(); - liveClient.publishEvent(new TikTokLiveRecorderStartedEvent(downloadData)); - - } catch (Exception e) { - throw new TikTokLiveException("Unable to run ffmpeg drivers",e); - } - }); -*/ - liveDownloadThread = new Thread(() -> { try { @@ -139,7 +102,6 @@ public class RecorderListener implements LiveRecorder { socksConnection.setRequestProperty(entry.getKey(), entry.getValue()); } - System.out.println(socksConnection.getResponseCode()); try (var in = new BufferedInputStream(socksConnection.getInputStream())) { var path = settings.getOutputPath() + File.separator + settings.getOutputFileName(); var file = new File(path);