Merge branch 'develop'

janniklaskeck · Nov 18, 2016 · 6d1b98b · 6d1b98b
2 parents 193c004 + 97cd214
commit 6d1b98b
Show file tree

Hide file tree

Showing 40 changed files with 641 additions and 442 deletions.
diff --git a/.classpath b/.classpath
@@ -15,7 +15,7 @@
 			<attribute name="FROM_GRADLE_MODEL" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build.gradle b/build.gradle
@@ -27,10 +27,10 @@ ext {
     richtextfxVersion = "0.6.10"
     fontawesomefxVersion = "8.9"
     controlsfxVersion = "8.40.12"
-    gsonVersion = "2.7"
+    gsonVersion = "2.8.0"
     httpclientVersion = "4.5.2"
     slf4jVersion = "1.7.21"
-    log4jVersion = "2.6.2"
+    log4jVersion = "2.7"
     junitVersion = "4.12"
 }
 
@@ -93,8 +93,8 @@ launch4j {
     supportUrl = "https://github.com/westerwave/livestreamer_twitch_gui"
     copyright = "MIT LICENSE"
     language = "ENGLISH_US"
-    initialHeapSize = 128
-    maxHeapSize = 384
+    initialHeapSize = 64
+    maxHeapSize = 512
 }
 
 license {

diff --git a/src/main/java/app/lsgui/gui/chat/ChatController.java b/src/main/java/app/lsgui/gui/chat/ChatController.java
@@ -87,7 +87,7 @@ public void initialize() {
 
     private void sendMessage(final String message) {
         if (!"".equals(message)) {
-            final String twitchUsername = Settings.getInstance().getTwitchUser();
+            final String twitchUsername = Settings.getInstance().twitchUserProperty().get();
             final int start = this.chatTextArea.getText().length();
             final int end = start + twitchUsername.length() + 1;
             this.client.sendMessage(this.client.getChannel(), message);
@@ -100,10 +100,9 @@ private void sendMessage(final String message) {
 
     public void connect(final String channel) {
         final String twitchIrc = "irc.chat.twitch.tv";
-        if (!"".equals(Settings.getInstance().getTwitchUser()) && !"".equals(Settings.getInstance().getTwitchOAuth())) {
-            final String user = Settings.getInstance().getTwitchUser();
-            final String oauth = Settings.getInstance().getTwitchOAuth();
-
+        final String user = Settings.getInstance().twitchUserProperty().get();
+        final String oauth = Settings.getInstance().twitchOAuthProperty().get();
+        if (!"".equals(user) && !"".equals(oauth)) {
             this.client.setUserName(user);
             this.client.setChannel(channel);
             this.clientConnect(twitchIrc, oauth);

diff --git a/src/main/java/app/lsgui/gui/chat/ChatWindow.java b/src/main/java/app/lsgui/gui/chat/ChatWindow.java
@@ -75,8 +75,7 @@ private void setupStage(final Parent root) {
         this.setTitle(this.channel + " - Livestreamer GUI Chat v" + LsGuiUtils.readVersionProperty());
         this.getIcons().add(new Image(getClass().getResourceAsStream("/icon.jpg")));
         final Scene scene = new Scene(root);
-        scene.getStylesheets().add(ChatWindow.class
-                .getResource("/styles/" + Settings.getInstance().getWindowStyle() + ".css").toExternalForm());
+        scene.getStylesheets().add(Settings.getInstance().getCurrentStyleSheet());
         this.setScene(scene);
         this.initModality(Modality.NONE);
         this.show();

diff --git a/src/main/java/app/lsgui/gui/main/LsGuiController.java b/src/main/java/app/lsgui/gui/main/LsGuiController.java
@@ -28,8 +28,13 @@
 
 import app.lsgui.gui.main.infopanel.ChannelInfoPanel;
 import app.lsgui.gui.main.list.ChannelList;
+import app.lsgui.gui.main.toolbar.QualityComboBox;
+import app.lsgui.gui.main.toolbar.ServiceComboBox;
+import app.lsgui.gui.main.toolbar.TopToolBar;
+import app.lsgui.model.IChannel;
 import app.lsgui.model.IService;
 import app.lsgui.utils.Settings;
+import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.layout.BorderPane;
 
@@ -69,33 +74,38 @@ private void setupChannelList() {
         this.channelList.getListView().getSelectionModel().selectedItemProperty()
                 .addListener((observable, oldValue, newValue) -> {
                     if (newValue != null) {
-                        final QualityComboBox qualityComboBox = this.topToolBar.getQualityComboBox();
-                        qualityComboBox.itemsProperty().bind(newValue.getAvailableQualities());
-                        if (qualityComboBox.getItems().size() > 1) {
-                            final String quality = Settings.getInstance().getQuality().get();
-                            if (qualityComboBox.getItems().contains(quality)) {
-                                qualityComboBox.getSelectionModel().select(quality);
-                            } else {
-                                qualityComboBox.getSelectionModel().select("Best");
-                            }
-                        } else {
-                            qualityComboBox.getSelectionModel().select(0);
-                        }
+                        this.bindAndSelect(newValue);
                     }
                 });
         final ServiceComboBox serviceComboBox = this.topToolBar.getServiceComboBox();
         final IService service = serviceComboBox.getSelectionModel().getSelectedItem();
-        this.channelList.getStreams().bind(service.getChannelProperty());
+        this.channelList.channelListProperty().bind(service.getChannelProperty());
         this.channelList.getListView().setUserData(service);
         this.contentBorderPane.setLeft(this.channelList);
     }
 
+    private void bindAndSelect(final IChannel newValue) {
+        final QualityComboBox qualityComboBox = this.topToolBar.getQualityComboBox();
+        qualityComboBox.itemsProperty().bind(newValue.getAvailableQualities());
+        if (qualityComboBox.getItems().size() > 1) {
+            final String quality = Settings.getInstance().qualityProperty().get();
+            if (qualityComboBox.getItems().contains(quality)) {
+                Platform.runLater(
+                        () -> qualityComboBox.getSelectionModel().select(quality));
+            } else {
+                qualityComboBox.getSelectionModel().select(Settings.DEFAULT_QUALITY);
+            }
+        } else {
+            qualityComboBox.getSelectionModel().select(0);
+        }
+    }
+
     private void setupChannelInfoPanel() {
         LOGGER.debug("Initialize ChannelInfoPanel");
         final ServiceComboBox serviceComboBox = this.topToolBar.getServiceComboBox();
         final QualityComboBox qualityComboBox = this.topToolBar.getQualityComboBox();
         final ChannelInfoPanel channelInfoPanel = new ChannelInfoPanel(serviceComboBox, qualityComboBox);
-        channelInfoPanel.getChannelProperty().bind(this.channelList.getSelectedChannelProperty());
+        channelInfoPanel.getChannelProperty().bind(this.channelList.selectedChannelProperty());
         this.contentBorderPane.setCenter(channelInfoPanel);
     }
 

diff --git a/src/main/java/app/lsgui/gui/main/LsGuiWindow.java b/src/main/java/app/lsgui/gui/main/LsGuiWindow.java
@@ -106,7 +106,7 @@ private void setupStage(final Parent root, final Stage primaryStage) {
         primaryStage.setOnCloseRequest(event -> {
             Settings.getInstance().saveSettings();
             Iterator<Map.Entry<IChannel, TwitchChannelUpdateService>> it = ((TwitchService) Settings.getInstance()
-                    .getStreamServices().get(0)).getUpdateServices().entrySet().iterator();
+                    .servicesProperty().get(0)).getUpdateServices().entrySet().iterator();
             while (it.hasNext()) {
                 it.next();
                 it.remove();
@@ -117,15 +117,14 @@ private void setupStage(final Parent root, final Stage primaryStage) {
         primaryStage.setOnHiding(event -> {
             Settings.getInstance().saveSettings();
             Iterator<Map.Entry<IChannel, TwitchChannelUpdateService>> it = ((TwitchService) Settings.getInstance()
-                    .getStreamServices().get(0)).getUpdateServices().entrySet().iterator();
+                    .servicesProperty().get(0)).getUpdateServices().entrySet().iterator();
             while (it.hasNext()) {
                 it.next();
                 it.remove();
             }
             Platform.exit();
         });
-        LsGuiWindow.getRootStage().getScene().getStylesheets().add(LsGuiWindow.class
-                .getResource("/styles/" + Settings.getInstance().getWindowStyle() + ".css").toExternalForm());
+        LsGuiWindow.getRootStage().getScene().getStylesheets().add(Settings.getInstance().getCurrentStyleSheet());
     }
 
     public static final synchronized Stage getRootStage() {

diff --git a/src/main/java/app/lsgui/gui/main/infopanel/ChannelInfoPanel.java b/src/main/java/app/lsgui/gui/main/infopanel/ChannelInfoPanel.java
@@ -175,7 +175,7 @@ private void bindToTwitchChannel(final TwitchChannel selectedChannel) {
     }
 
     private void bindToGenericChannel(final IChannel channel) {
-        this.channelDescription.textProperty().bind(channel.getName());
+        this.channelDescription.textProperty().bind(channel.getDisplayName());
         this.previewImageView.imageProperty().unbind();
         this.channelUptime.textProperty().unbind();
         this.channelUptime.setGraphic(null);

diff --git a/src/main/java/app/lsgui/gui/main/list/ChannelCell.java b/src/main/java/app/lsgui/gui/main/list/ChannelCell.java
@@ -108,7 +108,7 @@ protected final void updateItem(final IChannel channel, final boolean isEmpty) {
             setGraphic(createReminderCheckBox(channel));
             setContentDisplay(ContentDisplay.LEFT);
             setContextMenu(this.createContextMenu(channel));
-            textProperty().bind(channel.getName());
+            textProperty().bind(channel.getDisplayName());
             setOnMouseClicked(mouseEvent -> {
                 final int doubleClickAmount = 2;
                 if (mouseEvent.getButton() == MouseButton.PRIMARY && mouseEvent.getClickCount() == doubleClickAmount) {
@@ -136,7 +136,7 @@ private static CheckBox createReminderCheckBox(final IChannel channel) {
     private ContextMenu createContextMenu(final IChannel channel) {
         final ContextMenu contextMenu = new ContextMenu();
         final MenuItem delete = new MenuItem();
-        delete.textProperty().set("Delete " + channel.getName().get());
+        delete.textProperty().set("Delete " + channel.getDisplayName().get());
         delete.setOnAction(event -> {
             final IService service = (IService) this.getListView().getUserData();
             LsGuiUtils.removeChannelFromService(channel, service);
@@ -182,7 +182,7 @@ private ContextMenu createContextMenu(final IChannel channel) {
     private void startLivestreamerStream(final IChannel channel) {
         final IService service = (IService) this.getListView().getUserData();
         final String url = LsGuiUtils.buildUrl(service.getUrl().get(), channel.getName().get());
-        final String quality = Settings.getInstance().getQuality().get();
+        final String quality = Settings.getInstance().qualityProperty().get();
         LivestreamerUtils.startLivestreamer(url, quality);
         LOGGER.info("Starting Stream for {}", channel.getName().get());
     }

diff --git a/src/main/java/app/lsgui/gui/main/list/ChannelList.java b/src/main/java/app/lsgui/gui/main/list/ChannelList.java
@@ -24,7 +24,6 @@
 package app.lsgui.gui.main.list;
 
 import java.io.IOException;
-import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +33,6 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.ListView;
@@ -75,27 +73,16 @@ private void setupChannelList() {
         this.channelListView.setCellFactory(listView -> new ChannelCell());
     }
 
-    public ListProperty<IChannel> getStreams() {
+    public ListProperty<IChannel> channelListProperty() {
         return this.channelListProperty;
     }
 
-    public void setChannels(final List<IChannel> channels) {
-        this.channelListProperty.set(FXCollections.observableList(channels));
-    }
-
     public ListView<IChannel> getListView() {
         return this.channelListView;
     }
 
-    public void setListView(final ListView<IChannel> channelList) {
-        this.channelListView = channelList;
-    }
-
-    public ObjectProperty<IChannel> getSelectedChannelProperty() {
+    public ObjectProperty<IChannel> selectedChannelProperty() {
         return this.selectedChannelProperty;
     }
 
-    public void setSelectedChannelProperty(final ObjectProperty<IChannel> channelProperty) {
-        this.selectedChannelProperty = channelProperty;
-    }
 }
diff --git a/...a/app/lsgui/gui/main/QualityComboBox.java → ...gui/gui/main/toolbar/QualityComboBox.java b/...a/app/lsgui/gui/main/QualityComboBox.java → ...gui/gui/main/toolbar/QualityComboBox.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package app.lsgui.gui.main;
+package app.lsgui.gui.main.toolbar;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,9 +39,9 @@ public QualityComboBox() {
 
     public void initialize() {
         getSelectionModel().selectedItemProperty().addListener((obs, oldValue, newValue) -> {
-            if (!OFFLINEQUALITY.equals(newValue)) {
+            if (newValue != null && !OFFLINEQUALITY.equals(newValue)) {
                 LOGGER.debug("Set selected Quality to {}", newValue);
-                Settings.getInstance().getQuality().set(newValue);
+                Settings.getInstance().qualityProperty().set(newValue);
             }
         });
     }

diff --git a/.../java/app/lsgui/gui/main/ServiceCell.java → ...p/lsgui/gui/main/toolbar/ServiceCell.java b/.../java/app/lsgui/gui/main/ServiceCell.java → ...p/lsgui/gui/main/toolbar/ServiceCell.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package app.lsgui.gui.main;
+package app.lsgui.gui.main.toolbar;
 
 import app.lsgui.model.IService;
 import javafx.scene.control.ListCell;

diff --git a/...a/app/lsgui/gui/main/ServiceComboBox.java → ...gui/gui/main/toolbar/ServiceComboBox.java b/...a/app/lsgui/gui/main/ServiceComboBox.java → ...gui/gui/main/toolbar/ServiceComboBox.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package app.lsgui.gui.main;
+package app.lsgui.gui.main.toolbar;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,10 +41,10 @@ public ServiceComboBox() {
     }
 
     public void initialize(final ServiceOperator serviceOperator) {
-        if (Settings.getInstance().getStreamServices().isEmpty()) {
-            Settings.getInstance().getStreamServices().add(new TwitchService("Twitch.tv", "http://twitch.tv/"));
+        if (Settings.getInstance().servicesProperty().isEmpty()) {
+            Settings.getInstance().servicesProperty().add(new TwitchService("Twitch.tv", "http://twitch.tv/"));
         }
-        itemsProperty().bind(Settings.getInstance().getStreamServices());
+        itemsProperty().bind(Settings.getInstance().servicesProperty());
         setCellFactory(listView -> new ServiceCell());
         setConverter(new StringConverter<IService>() {
             @Override

diff --git a/...a/app/lsgui/gui/main/ServiceOperator.java → ...gui/gui/main/toolbar/ServiceOperator.java b/...a/app/lsgui/gui/main/ServiceOperator.java → ...gui/gui/main/toolbar/ServiceOperator.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package app.lsgui.gui.main;
+package app.lsgui.gui.main.toolbar;
 
 import app.lsgui.model.IService;
 

diff --git a/...n/java/app/lsgui/gui/main/TopToolBar.java → ...pp/lsgui/gui/main/toolbar/TopToolBar.java b/...n/java/app/lsgui/gui/main/TopToolBar.java → ...pp/lsgui/gui/main/toolbar/TopToolBar.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package app.lsgui.gui.main;
+package app.lsgui.gui.main.toolbar;
 
 import org.controlsfx.control.PopOver;
 import org.slf4j.Logger;
@@ -166,7 +166,7 @@ private void importFollowedChannels() {
 
     private void changeService(final IService newService) {
         LOGGER.debug("Change Service to {}", newService.getName().get());
-        this.channelList.getStreams().bind(newService.getChannelProperty());
+        this.channelList.channelListProperty().bind(newService.getChannelProperty());
         this.channelList.getListView().setUserData(newService);
         if (TwitchUtils.isTwitchService(newService)) {
             this.importButton.setDisable(false);