markil3/UniversalMusicPlayer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Has Gradle download and install the browser rather than bundle it.

Browse Source 
This is more flexible, and I couldn't exactly upload the Firefox installation to Git before.
This commit is contained in:
Markil3
2021-08-30 17:15:36 -06:00
parent b35e2eefd8
commit 5e4ae23978
13 changed files with 536 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/build.gradle
View File

@@ -31,6 +31,7 @@ dependencies {
implementation 'uk.co.caprica:vlcj:4.7.1'
implementation project(":libwave")
implementation project(":browserCommands")
implementation project(":browser")
// Declare the dependency for your favourite test framework you want to use in your tests.
// TestNG is also supported by the Gradle Test task. Just change the
@@ -46,5 +47,4 @@ targetCompatibility = JavaVersion.VERSION_16
mainClassName = defaultPackage + '.player.Interface'
//mainClassName = defaultPackage + '.localPlayer.Player'
compileJava.dependsOn rootProject.bundleAddOn
compileJava.dependsOn ':addonInter:installAddon'

262
interface/src/main/java/edu/regis/universeplayer/browser/Browser.java → interface/src/main/java/edu/regis/universeplayer/browser/BrowserPlayer.java
View File

@@ -15,11 +15,9 @@ import edu.regis.universeplayer.data.Song;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.net.*;
import java.net.URL;
import java.util.LinkedList;
import java.util.Scanner;
import java.util.concurrent.*;
/**
@@ -28,172 +26,35 @@ import java.util.concurrent.*;
* @author William Hubbard
* @since 0.1
*/
public class Browser extends MessageRunner implements Player<InternetSong>
public class BrowserPlayer implements Player<InternetSong>, UpdateListener
{
private static final Logger logger = LoggerFactory.getLogger(Browser.class);
private final Process process;
private final ServerSocket server;
private final Socket socket;
private static final Logger logger = LoggerFactory.getLogger(BrowserPlayer.class);
private final LinkedList<PlaybackListener> listeners = new LinkedList<>();
private InternetSong currentSong;
private boolean running = true;
public static Browser createBrowser() throws IOException, InterruptedException
private Browser browserRef = null;
private Browser getBrowser()
{
ServerSocket server = new ServerSocket(BrowserConstants.PORT, 50, InetAddress.getByName(null));
logger.debug("Server started.");
int startExit;
Browser browser;
Process browserProcess = launchBrowser();
/*
* Wait for the browser to fully start.
*/
startExit = browserProcess.waitFor();
if (startExit != 0)
if (browserRef == null)
{
logger.error("Error in browser launch (exit code {})", startExit);
try (Scanner scanner = new Scanner(browserProcess.getErrorStream()))
while (Browser.getInstance() == null)
{
while (scanner.hasNextLine())
try
{
logger.error(scanner.nextLine());
Browser.waitInstance();
}
catch (InterruptedException e)
{
logger.error("Interrupted while waiting for browser to initialize.", e);
}
}
throw new IOException("Error in browser launch (exit code " + startExit + ")");
Browser.getInstance().addUpdateListener(this);
browserRef = Browser.getInstance();
}
logger.debug("Browser started.");
ConnectException connErr = null;
logger.debug("Attempting connection");
Socket socket = server.accept();
if (!socket.isBound())
{
logger.error("Socket not bound");
}
else if (!socket.isConnected())
{
logger.error("Socket not connected");
}
else if (socket.isClosed())
{
logger.error("Socket prematurely closed");
}
else if (socket.isInputShutdown())
{
logger.error("Socket input prematurely closed.");
}
else if (socket.isOutputShutdown())
{
logger.error("Socket input prematurely closed.");
}
else
{
logger.debug("Connection established.");
}
browser = new Browser(socket, server, browserProcess);
return browser;
}
private Browser(Socket socket, ServerSocket server, Process process) throws IOException
{
super("BrowserRunner", socket.getInputStream(), socket.getOutputStream());
this.socket = socket;
this.server = server;
this.process = process;
}
@Override
protected boolean onRun()
{
if (!socket.isConnected() || socket.isClosed() || socket.isInputShutdown() || socket.isOutputShutdown())
{
logger.debug("Socket closed, shutting down");
return true;
}
return !this.running;
}
@Override
protected void onClose()
{
logger.debug("Closing socket");
try
{
this.socket.close();
}
catch (IOException e)
{
logger.error("Could not close socket", e);
}
finally
{
logger.debug("Closing server");
try
{
this.server.close();
}
catch (IOException e)
{
logger.error("Could not close server", e);
}
}
}
/**
* Utility method for launching a browser instance
*
* @throws IOException - Thrown if there is a problem launching the browser.
*/
private static Process launchBrowser() throws IOException
{
Process process = null;
String os = System.getProperty("os.name").toLowerCase();
String arch = System.getProperty("os.arch").toLowerCase();
String args;
File browserDir = new File(System.getProperty("user.dir"), "browser");
if (!browserDir.exists())
{
browserDir = new File(System.getProperty("user.dir"), "../browser");
}
args = " -profile \"" + browserDir.getAbsolutePath() + "/profile\"";
logger.info("Running on {} {}", os, arch);
// System.getProperties().entrySet().stream().forEach(entry -> logger.info("{}: {}", entry.getKey(), entry.getValue()));
if (os.contains("windows"))
{
if (arch.contains("64"))
{
logger.debug("Starting Windows x86_64 browser");
process = Runtime.getRuntime().exec(new File(browserDir, "windows64/firefox.exe").getAbsolutePath() + args);
}
else
{
logger.debug("Starting Windows x86 browser");
process = Runtime.getRuntime().exec(new File(browserDir, "windows32/firefox.exe").getAbsolutePath() + args);
}
}
else if (os.contains("linux"))
{
if (arch.contains("64"))
{
logger.debug("Starting Linux x86_64 browser");
process = Runtime.getRuntime().exec(new File(browserDir, "linux64/firefox").getAbsolutePath() + args);
}
else
{
logger.debug("Starting Linux 86 browser");
process = Runtime.getRuntime().exec(new File(browserDir, "linux32/firefox").getAbsolutePath() + args);
}
}
if (process == null)
{
throw new IOException("Could not find Firefox installation for OS " + os + " " + arch);
}
return process;
return browserRef;
}
@Override
@@ -207,7 +68,7 @@ public class Browser extends MessageRunner implements Player<InternetSong>
{
try
{
return new ForwardedFuture(this.sendObject(new CommandLoadSong(song.location)));
return new ForwardedFuture(getBrowser().sendObject(new CommandLoadSong(song.location)));
}
catch (IOException e)
{
@@ -222,33 +83,18 @@ public class Browser extends MessageRunner implements Player<InternetSong>
@Override
public QueryFuture<Void> close()
{
this.running = false;
try
{
QueryFuture<Void> future = new ForwardedFuture(this.sendObject(new CommandQuit()));
QueryFuture<Void> future = new ForwardedFuture(getBrowser().sendObject(new CommandQuit()));
return future;
}
catch (IOException e)
{
logger.error("Could not deliver quit command", e);
logger.error("Destroying browser processes {}, {}", process, process.descendants().toArray(ProcessHandle[]::new));
try
{
socket.close();
}
catch (IOException ex)
{
logger.error("Could not close socket", ex);
}
finally
{
process.descendants().forEach(ProcessHandle::destroy);
process.destroy();
}
logger.error("Could not send message", e);
return null;
}
return null;
}
/**
* Adds a listener for playback status updates.
*
@@ -259,7 +105,7 @@ public class Browser extends MessageRunner implements Player<InternetSong>
{
this.listeners.add(listener);
}
/**
* Checks to see if a listener has been added.
*
@@ -271,7 +117,7 @@ public class Browser extends MessageRunner implements Player<InternetSong>
{
return this.listeners.contains(listener);
}
/**
* Removes a listener for playback status updates.
*
@@ -283,24 +129,12 @@ public class Browser extends MessageRunner implements Player<InternetSong>
this.listeners.remove(listener);
}
@Override
protected void triggerUpdateListeners(Object ob)
{
PlaybackEvent status;
super.triggerUpdateListeners(ob);
if (ob instanceof PlaybackInfo)
{
status = new PlaybackEvent(this, (PlaybackInfo) ob);
this.listeners.forEach(l -> l.onPlaybackChanged(status));
}
}
@Override
public QueryFuture<Void> play()
{
try
{
return new ForwardedFuture(this.sendObject(new CommandSetPlayback(CommandSetPlayback.Playback.PLAY)));
return new ForwardedFuture(getBrowser().sendObject(new CommandSetPlayback(CommandSetPlayback.Playback.PLAY)));
}
catch (IOException e)
{
@@ -314,7 +148,7 @@ public class Browser extends MessageRunner implements Player<InternetSong>
{
try
{
return new ForwardedFuture(this.sendObject(new CommandSetPlayback(CommandSetPlayback.Playback.PAUSE)));
return new ForwardedFuture(getBrowser().sendObject(new CommandSetPlayback(CommandSetPlayback.Playback.PAUSE)));
}
catch (IOException e)
{
@@ -328,7 +162,7 @@ public class Browser extends MessageRunner implements Player<InternetSong>
{
try
{
return new ForwardedFuture(this.sendObject(new CommandSetPlayback(CommandSetPlayback.Playback.PAUSE)));
return new ForwardedFuture(getBrowser().sendObject(new CommandSetPlayback(CommandSetPlayback.Playback.PAUSE)));
}
catch (IOException e)
{
@@ -336,7 +170,7 @@ public class Browser extends MessageRunner implements Player<InternetSong>
return null;
}
}
/**
* Stops playback of the current song.
*/
@@ -345,7 +179,7 @@ public class Browser extends MessageRunner implements Player<InternetSong>
{
try
{
return new ForwardedFuture(this.sendObject(new CommandLoadSong((URL) null)));
return new ForwardedFuture(getBrowser().sendObject(new CommandLoadSong((URL) null)));
}
catch (IOException e)
{
@@ -353,13 +187,13 @@ public class Browser extends MessageRunner implements Player<InternetSong>
return null;
}
}
@Override
public QueryFuture<Void> seek(float time)
{
try
{
return new ForwardedFuture(this.sendObject(new CommandSeek(time)));
return new ForwardedFuture(getBrowser().sendObject(new CommandSeek(time)));
}
catch (IOException e)
{
@@ -367,7 +201,7 @@ public class Browser extends MessageRunner implements Player<InternetSong>
return null;
}
}
/**
* Obtains the player's current playback status.
*
@@ -378,56 +212,57 @@ public class Browser extends MessageRunner implements Player<InternetSong>
{
try
{
Future future = this.sendObject(new QueryStatus());
return new QueryFuture<>() {
Future future = getBrowser().sendObject(new QueryStatus());
return new QueryFuture<>()
{
private CommandReturn<String> getVal() throws ExecutionException, InterruptedException
{
return ((CommandReturn<String>) future.get());
}
private CommandReturn<String> getVal(long timeout, TimeUnit unit) throws ExecutionException, InterruptedException, TimeoutException
{
return ((CommandReturn<String>) future.get(timeout, unit));
}
@Override
public CommandConfirmation getConfirmation() throws CancellationException, ExecutionException, InterruptedException
{
return this.getVal().getConfirmation();
}
@Override
public CommandConfirmation getConfirmation(long timeout, TimeUnit unit) throws ExecutionException, InterruptedException, TimeoutException
{
return this.getVal(timeout, unit).getConfirmation();
}
@Override
public boolean cancel(boolean mayInterruptIfRunning)
{
return future.cancel(mayInterruptIfRunning);
}
@Override
public boolean isCancelled()
{
return future.isCancelled();
}
@Override
public boolean isDone()
{
return future.isDone();
}
@Override
public PlaybackStatus get() throws InterruptedException, ExecutionException
{
String value = getVal().getReturnValue();
return PlaybackStatus.valueOf(value);
}
@Override
public PlaybackStatus get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
{
@@ -455,6 +290,17 @@ public class Browser extends MessageRunner implements Player<InternetSong>
return null;
}
@Override
public void onUpdate(Object object, MessageRunner runner)
{
PlaybackEvent status;
if (object instanceof PlaybackInfo)
{
status = new PlaybackEvent(this, (PlaybackInfo) object);
this.listeners.forEach(l -> l.onPlaybackChanged(status));
}
}
private class ForwardedFuture<T> implements QueryFuture<T>
{
private final Future<T> future;

15
interface/src/main/java/edu/regis/universeplayer/player/Interface.java
View File

@@ -6,6 +6,7 @@ package edu.regis.universeplayer.player;
import edu.regis.universeplayer.Player;
import edu.regis.universeplayer.browser.Browser;
import edu.regis.universeplayer.browser.BrowserPlayer;
import edu.regis.universeplayer.data.InternetSong;
import edu.regis.universeplayer.data.Queue;
import edu.regis.universeplayer.data.*;
@@ -74,6 +75,7 @@ public class Interface extends JFrame implements SongDisplayListener, ComponentL
Thread browserThread;
Interface inter = null;
Browser browser;
BrowserPlayer browserPlayer;
try
{
/*
@@ -82,6 +84,11 @@ public class Interface extends JFrame implements SongDisplayListener, ComponentL
* otherwise.
*/
logger.info("Starting application");
browser = Browser.createBrowser();
browserThread = new Thread(browser);
browserThread.start();
inter = new Interface();
inter.setSize(700, 500);
SongProvider.INSTANCE.addUpdateListener(inter);
@@ -91,13 +98,11 @@ public class Interface extends JFrame implements SongDisplayListener, ComponentL
try
{
inter.players.add(browser = Browser.createBrowser());
browserThread = new Thread(browser);
browserThread.start();
inter.players.add(browserPlayer = new BrowserPlayer());
logger.debug("Sending ping");
browser.sendObject("ping");
Runtime.getRuntime().addShutdownHook(new Thread(browser::close));
Player.REGISTERED_PLAYERS.put(InternetSong.class, browser);
Runtime.getRuntime().addShutdownHook(new Thread(browserPlayer::close));
Player.REGISTERED_PLAYERS.put(InternetSong.class, browserPlayer);
// LinkedList<Future<Object>> pingRequests = new LinkedList<>();
// for (int i = 0; i < 20; i++)