diff --git a/src/main/java/ctbrec/ChaturbateModel.java b/src/main/java/ctbrec/ChaturbateModel.java index acc0a826..e2d26690 100644 --- a/src/main/java/ctbrec/ChaturbateModel.java +++ b/src/main/java/ctbrec/ChaturbateModel.java @@ -26,6 +26,7 @@ import com.iheartradio.m3u8.data.PlaylistData; import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.Moshi; +import ctbrec.io.HttpClient; import ctbrec.recorder.StreamInfo; import ctbrec.recorder.download.StreamSource; import okhttp3.FormBody; diff --git a/src/main/java/ctbrec/Config.java b/src/main/java/ctbrec/Config.java index a1499ed2..9edd5304 100644 --- a/src/main/java/ctbrec/Config.java +++ b/src/main/java/ctbrec/Config.java @@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory; import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.Moshi; +import ctbrec.io.ModelJsonAdapter; import ctbrec.recorder.OS; import okio.Buffer; import okio.BufferedSource; diff --git a/src/main/java/ctbrec/DevNull.java b/src/main/java/ctbrec/io/DevNull.java similarity index 94% rename from src/main/java/ctbrec/DevNull.java rename to src/main/java/ctbrec/io/DevNull.java index 11a79e1f..b40772b9 100644 --- a/src/main/java/ctbrec/DevNull.java +++ b/src/main/java/ctbrec/io/DevNull.java @@ -1,4 +1,4 @@ -package ctbrec; +package ctbrec.io; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/ctbrec/HttpClient.java b/src/main/java/ctbrec/io/HttpClient.java similarity index 99% rename from src/main/java/ctbrec/HttpClient.java rename to src/main/java/ctbrec/io/HttpClient.java index e5e8d4ad..a7e71c79 100644 --- a/src/main/java/ctbrec/HttpClient.java +++ b/src/main/java/ctbrec/io/HttpClient.java @@ -1,4 +1,4 @@ -package ctbrec; +package ctbrec.io; import java.io.IOException; import java.util.NoSuchElementException; @@ -7,6 +7,8 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import ctbrec.Config; +import ctbrec.Settings; import ctbrec.Settings.ProxyType; import ctbrec.ui.CookieJarImpl; import ctbrec.ui.CtbrecApplication; diff --git a/src/main/java/ctbrec/InstantJsonAdapter.java b/src/main/java/ctbrec/io/InstantJsonAdapter.java similarity index 96% rename from src/main/java/ctbrec/InstantJsonAdapter.java rename to src/main/java/ctbrec/io/InstantJsonAdapter.java index ff291844..e3d056c3 100644 --- a/src/main/java/ctbrec/InstantJsonAdapter.java +++ b/src/main/java/ctbrec/io/InstantJsonAdapter.java @@ -1,4 +1,4 @@ -package ctbrec; +package ctbrec.io; import java.io.IOException; import java.time.Instant; diff --git a/src/main/java/ctbrec/ModelJsonAdapter.java b/src/main/java/ctbrec/io/ModelJsonAdapter.java similarity index 96% rename from src/main/java/ctbrec/ModelJsonAdapter.java rename to src/main/java/ctbrec/io/ModelJsonAdapter.java index 2aeaefae..38cae4f5 100644 --- a/src/main/java/ctbrec/ModelJsonAdapter.java +++ b/src/main/java/ctbrec/io/ModelJsonAdapter.java @@ -1,4 +1,4 @@ -package ctbrec; +package ctbrec.io; import java.io.IOException; import java.util.Optional; @@ -6,6 +6,10 @@ import java.util.Optional; import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.JsonReader; import com.squareup.moshi.JsonReader.Token; + +import ctbrec.ChaturbateModel; +import ctbrec.Model; + import com.squareup.moshi.JsonWriter; public class ModelJsonAdapter extends JsonAdapter { diff --git a/src/main/java/ctbrec/recorder/StreamRedirectThread.java b/src/main/java/ctbrec/io/StreamRedirectThread.java similarity index 97% rename from src/main/java/ctbrec/recorder/StreamRedirectThread.java rename to src/main/java/ctbrec/io/StreamRedirectThread.java index 94ee3966..07d88485 100644 --- a/src/main/java/ctbrec/recorder/StreamRedirectThread.java +++ b/src/main/java/ctbrec/io/StreamRedirectThread.java @@ -1,4 +1,4 @@ -package ctbrec.recorder; +package ctbrec.io; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/ctbrec/recorder/LocalRecorder.java b/src/main/java/ctbrec/recorder/LocalRecorder.java index e71d1b63..d5bbc971 100644 --- a/src/main/java/ctbrec/recorder/LocalRecorder.java +++ b/src/main/java/ctbrec/recorder/LocalRecorder.java @@ -29,10 +29,10 @@ import com.iheartradio.m3u8.PlaylistException; import ctbrec.ChaturbateModel; import ctbrec.Config; -import ctbrec.HttpClient; import ctbrec.Model; import ctbrec.ModelParser; import ctbrec.Recording; +import ctbrec.io.HttpClient; import ctbrec.recorder.PlaylistGenerator.InvalidPlaylistException; import ctbrec.recorder.download.Download; import ctbrec.recorder.download.HlsDownload; diff --git a/src/main/java/ctbrec/recorder/RemoteRecorder.java b/src/main/java/ctbrec/recorder/RemoteRecorder.java index 8b8818a3..6441cf8d 100644 --- a/src/main/java/ctbrec/recorder/RemoteRecorder.java +++ b/src/main/java/ctbrec/recorder/RemoteRecorder.java @@ -16,11 +16,11 @@ import com.squareup.moshi.Moshi; import ctbrec.Config; import ctbrec.Hmac; -import ctbrec.HttpClient; -import ctbrec.InstantJsonAdapter; import ctbrec.Model; -import ctbrec.ModelJsonAdapter; import ctbrec.Recording; +import ctbrec.io.HttpClient; +import ctbrec.io.InstantJsonAdapter; +import ctbrec.io.ModelJsonAdapter; import okhttp3.MediaType; import okhttp3.Request; import okhttp3.Request.Builder; diff --git a/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java b/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java index a6bce88e..89a1600b 100644 --- a/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java +++ b/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java @@ -19,7 +19,7 @@ import com.iheartradio.m3u8.data.MediaPlaylist; import com.iheartradio.m3u8.data.Playlist; import com.iheartradio.m3u8.data.TrackData; -import ctbrec.HttpClient; +import ctbrec.io.HttpClient; import okhttp3.Request; import okhttp3.Response; diff --git a/src/main/java/ctbrec/recorder/download/HlsDownload.java b/src/main/java/ctbrec/recorder/download/HlsDownload.java index 8d52217c..c5902dcd 100644 --- a/src/main/java/ctbrec/recorder/download/HlsDownload.java +++ b/src/main/java/ctbrec/recorder/download/HlsDownload.java @@ -23,8 +23,8 @@ import com.iheartradio.m3u8.ParseException; import com.iheartradio.m3u8.PlaylistException; import ctbrec.Config; -import ctbrec.HttpClient; import ctbrec.Model; +import ctbrec.io.HttpClient; import okhttp3.Request; import okhttp3.Response; diff --git a/src/main/java/ctbrec/recorder/download/MergedHlsDownload.java b/src/main/java/ctbrec/recorder/download/MergedHlsDownload.java index c970c015..20d726d1 100644 --- a/src/main/java/ctbrec/recorder/download/MergedHlsDownload.java +++ b/src/main/java/ctbrec/recorder/download/MergedHlsDownload.java @@ -35,9 +35,9 @@ import com.iheartradio.m3u8.ParseException; import com.iheartradio.m3u8.PlaylistException; import ctbrec.Config; -import ctbrec.HttpClient; import ctbrec.Model; import ctbrec.Recording; +import ctbrec.io.HttpClient; import ctbrec.recorder.ProgressListener; import okhttp3.Request; import okhttp3.Response; diff --git a/src/main/java/ctbrec/recorder/server/RecorderServlet.java b/src/main/java/ctbrec/recorder/server/RecorderServlet.java index 78790799..347a9db5 100644 --- a/src/main/java/ctbrec/recorder/server/RecorderServlet.java +++ b/src/main/java/ctbrec/recorder/server/RecorderServlet.java @@ -21,10 +21,10 @@ import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.Moshi; import ctbrec.ChaturbateModel; -import ctbrec.InstantJsonAdapter; import ctbrec.Model; -import ctbrec.ModelJsonAdapter; import ctbrec.Recording; +import ctbrec.io.InstantJsonAdapter; +import ctbrec.io.ModelJsonAdapter; import ctbrec.recorder.Recorder; public class RecorderServlet extends AbstractCtbrecServlet { diff --git a/src/main/java/ctbrec/ui/CtbrecApplication.java b/src/main/java/ctbrec/ui/CtbrecApplication.java index b3655abd..a67ff856 100644 --- a/src/main/java/ctbrec/ui/CtbrecApplication.java +++ b/src/main/java/ctbrec/ui/CtbrecApplication.java @@ -20,8 +20,8 @@ import com.squareup.moshi.Moshi; import com.squareup.moshi.Types; import ctbrec.Config; -import ctbrec.HttpClient; import ctbrec.Version; +import ctbrec.io.HttpClient; import ctbrec.recorder.LocalRecorder; import ctbrec.recorder.Recorder; import ctbrec.recorder.RemoteRecorder; diff --git a/src/main/java/ctbrec/ui/Player.java b/src/main/java/ctbrec/ui/Player.java index 7cd2088d..53b2d0a7 100644 --- a/src/main/java/ctbrec/ui/Player.java +++ b/src/main/java/ctbrec/ui/Player.java @@ -6,10 +6,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ctbrec.Config; -import ctbrec.DevNull; import ctbrec.Recording; +import ctbrec.io.DevNull; +import ctbrec.io.StreamRedirectThread; import ctbrec.recorder.OS; -import ctbrec.recorder.StreamRedirectThread; public class Player { private static final transient Logger LOG = LoggerFactory.getLogger(Player.class); diff --git a/src/main/java/ctbrec/ui/RecordedModelsTab.java b/src/main/java/ctbrec/ui/RecordedModelsTab.java index 3b36a18b..1726bb2c 100644 --- a/src/main/java/ctbrec/ui/RecordedModelsTab.java +++ b/src/main/java/ctbrec/ui/RecordedModelsTab.java @@ -19,8 +19,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ctbrec.ChaturbateModel; -import ctbrec.HttpClient; import ctbrec.Model; +import ctbrec.io.HttpClient; import ctbrec.recorder.Recorder; import javafx.application.Platform; import javafx.collections.FXCollections; diff --git a/src/main/java/ctbrec/ui/RecordingsTab.java b/src/main/java/ctbrec/ui/RecordingsTab.java index f79e0cde..fc13cc56 100644 --- a/src/main/java/ctbrec/ui/RecordingsTab.java +++ b/src/main/java/ctbrec/ui/RecordingsTab.java @@ -29,10 +29,10 @@ import com.iheartradio.m3u8.ParseException; import com.iheartradio.m3u8.PlaylistException; import ctbrec.Config; -import ctbrec.HttpClient; import ctbrec.ChaturbateModel; import ctbrec.Recording; import ctbrec.Recording.STATUS; +import ctbrec.io.HttpClient; import ctbrec.recorder.Recorder; import ctbrec.recorder.download.MergedHlsDownload; import javafx.application.Platform; diff --git a/src/main/java/ctbrec/ui/StreamSourceSelectionDialog.java b/src/main/java/ctbrec/ui/StreamSourceSelectionDialog.java index fbc30e57..c929a2c8 100644 --- a/src/main/java/ctbrec/ui/StreamSourceSelectionDialog.java +++ b/src/main/java/ctbrec/ui/StreamSourceSelectionDialog.java @@ -5,8 +5,8 @@ import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.function.Function; -import ctbrec.HttpClient; import ctbrec.Model; +import ctbrec.io.HttpClient; import ctbrec.recorder.download.StreamSource; import javafx.concurrent.Task; import javafx.scene.control.ChoiceDialog; diff --git a/src/main/java/ctbrec/ui/ThumbCell.java b/src/main/java/ctbrec/ui/ThumbCell.java index 16f5177b..de943107 100644 --- a/src/main/java/ctbrec/ui/ThumbCell.java +++ b/src/main/java/ctbrec/ui/ThumbCell.java @@ -10,8 +10,8 @@ import org.slf4j.LoggerFactory; import ctbrec.ChaturbateModel; import ctbrec.Config; -import ctbrec.HttpClient; import ctbrec.Model; +import ctbrec.io.HttpClient; import ctbrec.recorder.Recorder; import ctbrec.recorder.StreamInfo; import javafx.animation.FadeTransition; diff --git a/src/main/java/ctbrec/ui/ThumbOverviewTab.java b/src/main/java/ctbrec/ui/ThumbOverviewTab.java index b9656e4e..f7723fc5 100644 --- a/src/main/java/ctbrec/ui/ThumbOverviewTab.java +++ b/src/main/java/ctbrec/ui/ThumbOverviewTab.java @@ -28,9 +28,9 @@ import org.slf4j.LoggerFactory; import com.sun.javafx.collections.ObservableListWrapper; import ctbrec.Config; -import ctbrec.HttpClient; import ctbrec.ChaturbateModel; import ctbrec.ModelParser; +import ctbrec.io.HttpClient; import ctbrec.recorder.Recorder; import javafx.collections.ObservableList; import javafx.concurrent.ScheduledService; diff --git a/src/main/java/ctbrec/ui/TipDialog.java b/src/main/java/ctbrec/ui/TipDialog.java index ec728d34..f9533dce 100644 --- a/src/main/java/ctbrec/ui/TipDialog.java +++ b/src/main/java/ctbrec/ui/TipDialog.java @@ -10,8 +10,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ctbrec.Config; -import ctbrec.HttpClient; import ctbrec.Model; +import ctbrec.io.HttpClient; import javafx.application.Platform; import javafx.concurrent.Task; import javafx.scene.control.Alert;