Move io related classes to ctbrec.io

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;

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;

src/main/java/ctbrec/io/DevNull.java

@@ -1,4 +1,4 @@
-package ctbrec;
+package ctbrec.io;
 
 import java.io.IOException;
 import java.io.OutputStream;

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;

src/main/java/ctbrec/io/InstantJsonAdapter.java

@@ -1,4 +1,4 @@
-package ctbrec;
+package ctbrec.io;
 
 import java.io.IOException;
 import java.time.Instant;

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<Model> {

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;

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;

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;

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;
 

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;
 

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;

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 {

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;

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);

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;

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;

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;

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;

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;

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;