DuncteBot
diff --git a/‎src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
+7-2 b/‎src/main/java/com/dunctebot/sourcemanagers/Mp3Track.java
+7-2
diff --git a/‎src/main/java/com/dunctebot/sourcemanagers/MpegTrack.java
+4-7 b/‎src/main/java/com/dunctebot/sourcemanagers/MpegTrack.java
+4-7
diff --git a/‎src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioSourceManager.java
+1-5 b/‎src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioSourceManager.java
+1-5
diff --git a/‎src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioTrack.java
+5 b/‎src/main/java/com/dunctebot/sourcemanagers/getyarn/GetyarnAudioTrack.java
+5
diff --git a/‎src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
+3-2 b/‎src/main/java/com/dunctebot/sourcemanagers/pornhub/PornHubAudioSourceManager.java
+3-2
@@ -21,8 +21,10 @@
 import com.sedmelluq.discord.lavaplayer.source.http.HttpAudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
+import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
 import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack;
+import com.sedmelluq.discord.lavaplayer.track.InternalAudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,11 +53,14 @@ protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface h
         log.debug("Starting {} track from URL: {}", manager.getSourceName(), trackUrl);
         // Setting contentLength (last param) to null makes it default to Long.MAX_VALUE
         try (PersistentHttpStream stream = new PersistentHttpStream(httpInterface, new URI(trackUrl), null)) {
-            // TODO make a method to only return the class that we need
-            processDelegate(new Mp3AudioTrack(trackInfo, stream), localExecutor);
+            processDelegate(createAudioTrack(this.trackInfo, stream), localExecutor);
         }
     }
 
+    protected InternalAudioTrack createAudioTrack(AudioTrackInfo trackInfo, SeekableInputStream stream) {
+        return new Mp3AudioTrack(trackInfo, stream);
+    }
+
     protected String getPlaybackUrl() {
         return this.trackInfo.identifier;
     }
 
@@ -20,7 +20,9 @@
 import com.sedmelluq.discord.lavaplayer.source.AudioSourceManager;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import com.sedmelluq.discord.lavaplayer.tools.io.PersistentHttpStream;
+import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
+import com.sedmelluq.discord.lavaplayer.track.InternalAudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.playback.LocalAudioTrackExecutor;
 
 import java.net.URI;
@@ -31,12 +33,7 @@ public MpegTrack(AudioTrackInfo trackInfo, AudioSourceManager manager) {
     }
 
     @Override
-    protected void loadStream(LocalAudioTrackExecutor localExecutor, HttpInterface httpInterface) throws Exception {
-        final String trackUrl = getPlaybackUrl();
-        log.debug("Starting {} track from URL: {}", getSourceManager().getSourceName(), trackUrl);
-        // Setting contentLength (last param) to null makes it default to Long.MAX_VALUE
-        try (PersistentHttpStream stream = new PersistentHttpStream(httpInterface, new URI(trackUrl), null)) {
-            processDelegate(new MpegAudioTrack(trackInfo, stream), localExecutor);
-        }
+    protected InternalAudioTrack createAudioTrack(AudioTrackInfo trackInfo, SeekableInputStream stream) {
+        return new MpegAudioTrack(trackInfo, stream);
     }
 }
@@ -49,7 +49,7 @@ public AudioItem loadItem(DefaultAudioPlayerManager manager, AudioReference refe
         final String videoId = m.group(m.groupCount());
 
         final IdentifiedAudioReference ref = new IdentifiedAudioReference(
-            getMP4VideoUrl(videoId),
+            videoId,
             reference.identifier,
             videoId
         );
@@ -69,8 +69,4 @@ public void encodeTrack(AudioTrack track, DataOutput output) {
     public AudioTrack decodeTrack(AudioTrackInfo trackInfo, DataInput input) {
         return new GetyarnAudioTrack(trackInfo, this);
     }
-
-    private String getMP4VideoUrl(String videoId) {
-        return "https://y.yarn.co/" + videoId + ".mp4?v=0";
-    }
 }
@@ -30,4 +30,9 @@ public GetyarnAudioTrack(AudioTrackInfo trackInfo, AudioSourceManager manager) {
     public AudioTrack makeClone() {
         return new GetyarnAudioTrack(trackInfo, getSourceManager());
     }
+
+    @Override
+    protected String getPlaybackUrl() {
+        return "https://y.yarn.co/" + this.trackInfo.identifier + ".mp4?v=0";
+    }
 }
@@ -53,8 +53,9 @@
 import java.util.regex.Pattern;
 
 public class PornHubAudioSourceManager implements AudioSourceManager, HttpConfigurable {
-    public static final Pattern DOMAIN_REGEX = Pattern.compile("https?://([a-z]+\\.)?pornhub\\.(com|net)");
-    private static final Pattern VIDEO_REGEX = Pattern.compile("^" + DOMAIN_REGEX + "/view_video\\.php\\?viewkey=([a-zA-Z0-9]+)(?:.*)$");
+    private static final String DOMAIN_PATTERN = "https?://([a-z]+\\.)?pornhub\\.(com|net)";
+    public static final Pattern DOMAIN_REGEX = Pattern.compile(DOMAIN_PATTERN);
+    private static final Pattern VIDEO_REGEX = Pattern.compile("^" + DOMAIN_PATTERN + "/view_video\\.php\\?viewkey=([a-zA-Z0-9]+)(?:.*)$");
     private static final Pattern VIDEO_INFO_REGEX = Pattern.compile("var flashvars_\\d+ = (\\{.+})");
     private static final Pattern MODEL_INFO_REGEX = Pattern.compile("var MODEL_PROFILE = (\\{.+})");
     private final HttpInterfaceManager httpInterfaceManager;