From 717703bf73cbb5bafdfb3ae3fd8fc3a9fac1d58c Mon Sep 17 00:00:00 2001
From: Florian Trabauer <florian@trabauer.com>
Date: Thu, 28 May 2015 20:28:23 +0200
Subject: [PATCH] cleaned up a lot of old code of the old gui.

---
 .idea/.name                                   |  2 +-
 .idea/artifacts/TwitchToolsCmd.xml            | 11 -----
 ...hTools_jar.xml => TwitchVodLoader_jar.xml} | 18 ++++----
 .idea/compiler.xml                            |  4 +-
 .idea/misc.xml                                |  2 +-
 .idea/modules.xml                             |  5 +--
 README.md                                     | 16 +++----
 TwitchTools.iml => TwitchVodLoader.iml        |  5 +--
 src/META-INF/MANIFEST.MF                      |  2 +-
 ...itchToolsApp.java => TwitchVodLoader.java} |  4 +-
 ...CmdApp.java => TwitchVodLoaderCmdApp.java} |  2 +-
 .../channelsync/ChannelSyncController.java    | 42 +++++++++++-------
 .../vod/channelsync/ChannelSyncMenuBar.java   | 16 ++++---
 .../vod/channelsync/SyncChannelMainPanel.java | 44 -------------------
 .../gui/vod/channelsync/VideoInfoPanel.java   |  6 ++-
 .../worker/FFMpegConverterWorker.java         | 16 ++++---
 16 files changed, 79 insertions(+), 116 deletions(-)
 delete mode 100755 .idea/artifacts/TwitchToolsCmd.xml
 rename .idea/artifacts/{TwitchTools_jar.xml => TwitchVodLoader_jar.xml} (59%)
 mode change 100755 => 100644
 rename TwitchTools.iml => TwitchVodLoader.iml (84%)
 mode change 100755 => 100644 src/META-INF/MANIFEST.MF
 rename src/com/trabauer/twitchtools/{TwitchToolsApp.java => TwitchVodLoader.java} (92%)
 rename src/com/trabauer/twitchtools/{TwitchToolsCmdApp.java => TwitchVodLoaderCmdApp.java} (99%)

diff --git a/.idea/.name b/.idea/.name
index eb4bef2..4fc9587 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-TwitchTools
\ No newline at end of file
+TwitchVodLoader
\ No newline at end of file
diff --git a/.idea/artifacts/TwitchToolsCmd.xml b/.idea/artifacts/TwitchToolsCmd.xml
deleted file mode 100755
index 3900c93..0000000
--- a/.idea/artifacts/TwitchToolsCmd.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="TwitchToolsCmd">
-    <output-path>$PROJECT_DIR$/out/artifacts/TwitchToolsCmd</output-path>
-    <root id="archive" name="TwitchToolsCmd.jar">
-      <element id="module-output" name="TwitchTools" />
-      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/junit-4.11.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/hamcrest-library-1.3.jar" path-in-jar="/" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/.idea/artifacts/TwitchTools_jar.xml b/.idea/artifacts/TwitchVodLoader_jar.xml
old mode 100755
new mode 100644
similarity index 59%
rename from .idea/artifacts/TwitchTools_jar.xml
rename to .idea/artifacts/TwitchVodLoader_jar.xml
index cd85471..f3cd8f0
--- a/.idea/artifacts/TwitchTools_jar.xml
+++ b/.idea/artifacts/TwitchVodLoader_jar.xml
@@ -1,16 +1,16 @@
 <component name="ArtifactManager">
-  <artifact type="jar" name="TwitchTools:jar">
-    <output-path>$PROJECT_DIR$/out/artifacts/TwitchTools_jar</output-path>
-    <root id="archive" name="TwitchTools.jar">
-      <element id="module-output" name="TwitchTools" />
-      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/junit-4.11.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/hamcrest-library-1.3.jar" path-in-jar="/" />
+  <artifact type="jar" name="TwitchVodLoader:jar">
+    <output-path>$PROJECT_DIR$/out/artifacts/TwitchVodLoader_jar</output-path>
+    <root id="archive" name="TwitchVodLoader.jar">
+      <element id="module-output" name="TwitchVodLoader" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.3.1/gson-2.3.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/jgoodies-common-1.2.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/jgoodies-forms.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/jgoodies-looks-2.4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../javaLibs/gson-2.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/../javaLibs/guava-18.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/junit-4.11.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/lib/hamcrest-library-1.3.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/google/guava/guava/18.0/guava-18.0.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 217af47..8e650cc 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -18,6 +18,6 @@
         <processorPath useClasspath="true" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel target="1.8" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 38fce22..ae91914 100755
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -22,7 +22,7 @@
     <option name="OPEN_IN_BROWSER" value="true" />
     <option name="OPTION_INCLUDE_LIBS" value="false" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6381a56..b7376c5 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/TwitchTools.iml" filepath="$PROJECT_DIR$/TwitchTools.iml" />
+      <module fileurl="file:///mnt/majestix-home/flo/Developer/IDEAprojects/TwitchTools/TwitchVodLoader.iml" filepath="/mnt/majestix-home/flo/Developer/IDEAprojects/TwitchTools/TwitchVodLoader.iml" />
     </modules>
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 4c85813..5bec93d 100755
--- a/README.md
+++ b/README.md
@@ -1,15 +1,16 @@
 It's a small tool to download past broadcasts from Twitch.tv. You can enter a URL to a past broadcast.
 
-## HowTo use it:
+# HowTo use it
 
+## Windows
 
 1. Get the compiled version (jar File)
-2. Get ffmpeg https://www.ffmpeg.org/download.html
-3. place both the jar and ffmpeg in the same directory
-4. Start the tool
-5. open settings if you want to change the quality of VODs or the destination Directory ...
+2. Start the tool
 
-Use it.
+## Linux or Apple OS X
+1. Install ffmpeg
+2. Get the compiled version (jar File)
+3. Start the tool
 
 
 # Features
@@ -17,12 +18,11 @@ Use it.
  * A m3u-playlist is created to make watching the past broadcast easier.
  * Support for the new TwitchVOD System, that stores the VOD in 3 second Chunks.
  * Downloading Multiple Videos (Queue)
- * queue for converting.
+ * queue for converting and downloads
 
 
 # Upcoming Features
 
- * Improved queuing of downloads
  * Filter Results
 
 # Compiled JAR
diff --git a/TwitchTools.iml b/TwitchVodLoader.iml
similarity index 84%
rename from TwitchTools.iml
rename to TwitchVodLoader.iml
index 89d9d8b..e143913 100755
--- a/TwitchTools.iml
+++ b/TwitchVodLoader.iml
@@ -2,8 +2,8 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    <content url="file://$USER_HOME$/Developer/IDEAprojects/TwitchTools">
+      <sourceFolder url="file://$USER_HOME$/Developer/IDEAprojects/TwitchTools/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -19,7 +19,6 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="jgoodies-common-1.2.1" level="project" />
-    <orderEntry type="library" name="guava-18.0" level="project" />
     <orderEntry type="library" name="com.google.code.gson:gson:2.3.1" level="project" />
     <orderEntry type="library" name="com.google.guava:guava:18.0" level="project" />
   </component>
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
index c724ac3..c8196e7
--- a/src/META-INF/MANIFEST.MF
+++ b/src/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: com.trabauer.twitchtools.TwitchToolsApp
+Main-Class: com.trabauer.twitchtools.TwitchVodLoader
 
diff --git a/src/com/trabauer/twitchtools/TwitchToolsApp.java b/src/com/trabauer/twitchtools/TwitchVodLoader.java
similarity index 92%
rename from src/com/trabauer/twitchtools/TwitchToolsApp.java
rename to src/com/trabauer/twitchtools/TwitchVodLoader.java
index 90fc8d0..d339fc2 100755
--- a/src/com/trabauer/twitchtools/TwitchToolsApp.java
+++ b/src/com/trabauer/twitchtools/TwitchVodLoader.java
@@ -9,9 +9,9 @@
 import java.net.URISyntaxException;
 
 /**
- * Created by Flo on 12.11.2014.
+ * Created by Florian Trabauer on 12.11.2014. Main
  */
-public class TwitchToolsApp{
+public class TwitchVodLoader {
 
 
     public static void main (String[] args) throws URISyntaxException {
diff --git a/src/com/trabauer/twitchtools/TwitchToolsCmdApp.java b/src/com/trabauer/twitchtools/TwitchVodLoaderCmdApp.java
similarity index 99%
rename from src/com/trabauer/twitchtools/TwitchToolsCmdApp.java
rename to src/com/trabauer/twitchtools/TwitchVodLoaderCmdApp.java
index 3eac5f0..ea602a4 100755
--- a/src/com/trabauer/twitchtools/TwitchToolsCmdApp.java
+++ b/src/com/trabauer/twitchtools/TwitchVodLoaderCmdApp.java
@@ -13,7 +13,7 @@
 /**
  * Created by flo on 03.11.14.
  */
-public class TwitchToolsCmdApp {
+public class TwitchVodLoaderCmdApp {
 
     private static final String destinationDir = "D:\\twitchStreams";
 
diff --git a/src/com/trabauer/twitchtools/controller/channelsync/ChannelSyncController.java b/src/com/trabauer/twitchtools/controller/channelsync/ChannelSyncController.java
index c84781f..5a2146e 100755
--- a/src/com/trabauer/twitchtools/controller/channelsync/ChannelSyncController.java
+++ b/src/com/trabauer/twitchtools/controller/channelsync/ChannelSyncController.java
@@ -1,12 +1,13 @@
 package com.trabauer.twitchtools.controller.channelsync;
 
-import com.trabauer.twitchtools.TwitchToolsApp;
+import com.trabauer.twitchtools.TwitchVodLoader;
 import com.trabauer.twitchtools.gui.images.TwitchToolsImages;
 import com.trabauer.twitchtools.gui.vod.channelsync.ChannelSyncLogFrame;
 import com.trabauer.twitchtools.gui.vod.channelsync.ChannelSyncMenuBar;
 import com.trabauer.twitchtools.gui.vod.channelsync.SyncChannelMainPanel;
 import com.trabauer.twitchtools.model.twitch.*;
 import com.trabauer.twitchtools.utils.OsUtils;
+import com.trabauer.twitchtools.utils.OsValidator;
 import com.trabauer.twitchtools.utils.TwitchToolPreferences;
 import com.trabauer.twitchtools.worker.FFMpegConverterWorker;
 import com.trabauer.twitchtools.worker.HttpFileDownloadWorker;
@@ -51,6 +52,7 @@ public class ChannelSyncController implements ChannelSyncControllerInterface {
     private final ThreadPoolExecutor ffmpegExecutorService;
     private final ThreadPoolExecutor downloadExecutorService;
     private File ffmpegExecutable;
+    private String ffmpegCommand;
     private ArrayList<TwitchVideoPart> videoParts;
 
 
@@ -66,7 +68,7 @@ public ChannelSyncController() {
         mainFrame.setVisible(true);
         mainFrame.setIconImage(TwitchToolsImages.getTwitchDownloadToolImage());
 
-        mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        mainFrame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
         mainMenuBar = new ChannelSyncMenuBar(this, mainFrame);
 
         this.progressFrame = new ChannelSyncLogFrame();
@@ -74,17 +76,26 @@ public ChannelSyncController() {
         this.ffmpegExecutorService = new ThreadPoolExecutor(1, 1, 5000L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
         this.downloadExecutorService = new ThreadPoolExecutor(15, 15, 5000L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
 
-        twitchVideoInfoWorkerQueue = new LinkedBlockingQueue<TwitchVideoInfo>();
+        twitchVideoInfoWorkerQueue = new LinkedBlockingQueue<>();
 
         try { // look for ffmpeg
-            ffmpegExecutable = new File(new File(getJarURI().getPath()).getParent().concat("/ffmpeg.exe"));
-            if(! ffmpegExecutable.exists()) {
-                int choice = JOptionPane.showConfirmDialog(mainFrame, "FFMPEG not found! Do you wnat to download it? FFMPEG is required to convert videos", "FFMPEG not found! Download it?", JOptionPane.YES_NO_OPTION);
-                if(choice == 0) { //YES
-                    downloadFFMPEG();
-                } else if(choice == 0) { //NO
+            if(OsValidator.isWindows()) {
+                ffmpegExecutable = new File(new File(getJarURI().getPath()).getParent().concat("/ffmpeg.exe"));
+                if (!ffmpegExecutable.exists()) {
+                    int choice = JOptionPane.showConfirmDialog(mainFrame, "FFMPEG not found! Do you wnat to download it? FFMPEG is required to convert videos", "FFMPEG not found! Download it?", JOptionPane.YES_NO_OPTION);
+                    if (choice == 0) { //YES
+                        downloadFFMPEG();
+                    } //else if(choice == 0) { //NO
                     // Nothing right now
+                    //}
                 }
+                ffmpegCommand = ffmpegExecutable.getAbsolutePath();
+            } else if(OsValidator.isUnix() || OsValidator.isMac()) {
+                System.out.println("Running on a Unix System");
+                ffmpegCommand = "ffmpeg";
+            } else {
+                System.out.println("unknown OS asuming ffmpeg is installed and can be accessed via path-variable");
+                ffmpegCommand = "ffmpeg";
             }
         } catch (URISyntaxException e) {
             JOptionPane.showMessageDialog(mainPanel, e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
@@ -99,7 +110,7 @@ public JPanel getMainPanel() {
     @Override
     public void searchFldText(String text) throws IOException {
 
-        ArrayList<TwitchVideoInfo> cachedTVIs = new ArrayList<TwitchVideoInfo>();
+        ArrayList<TwitchVideoInfo> cachedTVIs = new ArrayList<>();
 
 
         //Getting all Quued and Processed VideoInfoObjects
@@ -110,6 +121,7 @@ public void searchFldText(String text) throws IOException {
         for(TwitchVideoInfo queued: twitchVideoInfoWorkerQueue.toArray(new TwitchVideoInfo[0])) {
             cachedTVIs.add(queued);
         }
+
         for(Runnable runnable:ffmpegExecutorService.getQueue()) {
             if(runnable instanceof FFMpegConverterWorker) {
                 FFMpegConverterWorker ffMpegConverterWorker = (FFMpegConverterWorker) runnable;
@@ -128,7 +140,7 @@ public void searchFldText(String text) throws IOException {
      * Updates the State of a new TwitchVideoInfoObjects based on the Stored Videos
      *
      *
-     * @param tvi
+     * @param tvi the Twitch Video Info Object that should be modified
      */
     private void searchLocalFiles(TwitchVideoInfo tvi) {
         if (tvi.getState().equals(TwitchVideoInfo.State.INITIAL)) {
@@ -247,14 +259,13 @@ public void convert2mp4(TwitchVideoInfo relatedTwitchVideoInfoObject) {
         }
 
 
-        FFMpegConverterWorker ffMpegConverterWorker = new FFMpegConverterWorker(destinationVideoFile, ffmpegFileListFile, ffmpegExecutable, ffmpegOptions);
+        FFMpegConverterWorker ffMpegConverterWorker = new FFMpegConverterWorker(destinationVideoFile, ffmpegFileListFile, ffmpegCommand, ffmpegOptions);
         ffMpegConverterWorker.setVideoLength(relatedTwitchVideoInfoObject.getLength());
         ffMpegConverterWorker.setRelatedTwitchVideoInfo(relatedTwitchVideoInfoObject);
         ffMpegConverterWorker.addPropertyChangeListener(this);
         ffMpegConverterWorker.addPropertyChangeListener(mainPanel.getConvertProgressPanel());
         LinkedBlockingQueue queue = (LinkedBlockingQueue)ffmpegExecutorService.getQueue();
         mainPanel.getConvertProgressPanel().setQueue(queue);
-        //relatedTwitchVideoInfoObject.setMainRelatedFileOnDisk(destinationVideoFile); //TODO is now done by the converter worker after converting. Testing required! This makes it possible to watch while converting
         relatedTwitchVideoInfoObject.setState(TwitchVideoInfo.State.QUEUED_FOR_CONVERT);
         ffmpegExecutorService.execute(ffMpegConverterWorker);
     }
@@ -268,7 +279,6 @@ public void delete(TwitchVideoInfo relatedTwitchVideoInfoObject) {
     /**
      * Prepares the Download and creates needed files in the destination folder
      *
-     * @throws IOException
      */
     private void initializeDownload()  {
 
@@ -301,7 +311,7 @@ private void initializeDownload()  {
         String dateTimeStr = sdf.format(currentTwitchVideoInfo.getRecordedAt().getTime());
         String destinationDir = TwitchToolPreferences.getInstance().get(TwitchToolPreferences.DESTINATION_DIR_PREFKEY, OsUtils.getUserHome());
         File destinationFilenameTemplate = new File(destinationDir + "/" + OsUtils.getValidFilename(currentTwitchVideoInfo.getChannelName()) + "/" + OsUtils.getValidFilename(currentTwitchVideoInfo.getTitle()) + "_" + dateTimeStr);
-        ArrayList<File> destinationFiles = new ArrayList<File>();
+        ArrayList<File> destinationFiles = new ArrayList<>();
 
         for(TwitchVideoPart videoPart: videoParts) {
             videoPart.getFileExtension();
@@ -414,7 +424,7 @@ private URI getJarURI()
         final URL url;
         final URI              uri;
 
-        domain = TwitchToolsApp.class.getProtectionDomain();
+        domain = TwitchVodLoader.class.getProtectionDomain();
         source = domain.getCodeSource();
         url    = source.getLocation();
         uri    = url.toURI();
diff --git a/src/com/trabauer/twitchtools/gui/vod/channelsync/ChannelSyncMenuBar.java b/src/com/trabauer/twitchtools/gui/vod/channelsync/ChannelSyncMenuBar.java
index b65a611..2a93b64 100755
--- a/src/com/trabauer/twitchtools/gui/vod/channelsync/ChannelSyncMenuBar.java
+++ b/src/com/trabauer/twitchtools/gui/vod/channelsync/ChannelSyncMenuBar.java
@@ -50,6 +50,11 @@ public void actionPerformed(ActionEvent e) {
                 }
             });
 
+            JLabel helpTextLbl = new JLabel("<html>You are able to move the qualities up and down. " +
+                    "TwitchTools trys to download the video qualities in that order. " +
+                    "If the quality at the top isn't available, it will try to download the " +
+                    "second, third ... and so on.</html>");
+
 
             JButton okBtn = new JButton("OK");
             okBtn.addActionListener(new ActionListener() {
@@ -147,12 +152,13 @@ public void actionPerformed(ActionEvent e) {
             formPanel.add(upDownPanel, c);
 
             c.gridy++;
-            formPanel.add(new JLabel("<html>You are able to move the qualities up and down. " +
-                    "TwitchTools trys to download the video qualities in that order. " +
-                    "If the quality at the top isn't available, it will try to download the " +
-                    "second, third ... and so on.</html>"), c);
 
-            setSize(400, 310);
+
+            helpTextLbl.setPreferredSize(new Dimension(400,100));
+            formPanel.add(helpTextLbl, c);
+
+            //setSize(400, 500);
+            pack();
 
 
 
diff --git a/src/com/trabauer/twitchtools/gui/vod/channelsync/SyncChannelMainPanel.java b/src/com/trabauer/twitchtools/gui/vod/channelsync/SyncChannelMainPanel.java
index df64887..7bab6aa 100755
--- a/src/com/trabauer/twitchtools/gui/vod/channelsync/SyncChannelMainPanel.java
+++ b/src/com/trabauer/twitchtools/gui/vod/channelsync/SyncChannelMainPanel.java
@@ -49,50 +49,6 @@ public class SyncChannelMainPanel extends JPanel implements PropertyChangeListen
 
 
 
-    public static void main(String[] args) {
-        // Set look & feel
-        try {
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (InstantiationException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (UnsupportedLookAndFeelException e) {
-            e.printStackTrace();
-        }
-
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-//              DownloadController downloadController = new DownloadController();
-//                MainController mainController = MainController.getInstance();
-
-                final JFrame mainFrame = new JFrame("SyncChannelTest");
-                TwitchVideoInfoList twitchVideoInfoList = new TwitchVideoInfoList(); //model
-                ChannelSyncController controller = new ChannelSyncController(); //Controller
-
-                mainFrame.setContentPane(controller.getMainPanel()); //get the view from controller
-
-                mainFrame.pack();
-                mainFrame.setSize(1080, 700);
-//                mainFrame.addComponentListener(new ComponentAdapter() {
-//                    @Override
-//                    public void componentResized(ComponentEvent e) {
-//                        System.out.println("MainFrameSiz=" + mainFrame.getSize());
-//
-//                    }
-//                });
-                mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-                mainFrame.setVisible(true);
-            }
-        });
-
-
-    }
-
-
     public SyncChannelMainPanel(ChannelSyncController controller, TwitchVideoInfoList twitchVideoInfoList) {
         setName("SyncChannel");
         this.controller = controller;
diff --git a/src/com/trabauer/twitchtools/gui/vod/channelsync/VideoInfoPanel.java b/src/com/trabauer/twitchtools/gui/vod/channelsync/VideoInfoPanel.java
index 5b1524e..602ad63 100755
--- a/src/com/trabauer/twitchtools/gui/vod/channelsync/VideoInfoPanel.java
+++ b/src/com/trabauer/twitchtools/gui/vod/channelsync/VideoInfoPanel.java
@@ -202,8 +202,10 @@ public void mouseClicked(MouseEvent e) {
     private void layoutComponents() {
 
         imageLbl.setBounds(0,0 ,320,180);
-        viewcountLbl.setBounds(5,0,100,25);
-        durationLbl.setBounds(255,0,100,25);
+        viewcountLbl.setBounds(5,0,310,25);
+        viewcountLbl.setHorizontalAlignment(SwingConstants.LEFT);
+        durationLbl.setBounds(5,0,310,25);
+        durationLbl.setHorizontalAlignment(SwingConstants.RIGHT);
         //Adding a dark bar to the previewImage to increase the readability of the viewcount and duration
         JLabel darkBarkLbl = new JLabel();
         darkBarkLbl.setBounds(0,0,320,25);
diff --git a/src/com/trabauer/twitchtools/worker/FFMpegConverterWorker.java b/src/com/trabauer/twitchtools/worker/FFMpegConverterWorker.java
index 84c1c15..99af8ba 100755
--- a/src/com/trabauer/twitchtools/worker/FFMpegConverterWorker.java
+++ b/src/com/trabauer/twitchtools/worker/FFMpegConverterWorker.java
@@ -13,7 +13,8 @@
  * Created by Flo on 15.01.2015.
  */
 public class FFMpegConverterWorker extends SwingWorker<Void, Void> {
-    private File destinationVideoFile, fileListForFfmpeg, ffmpegExecutable;
+    private File destinationVideoFile, fileListForFfmpeg;
+    private String ffmpegCommand;
     private LinkedList ffmpegOptions;
     private String outputLine;
     private int videoLength;
@@ -21,10 +22,10 @@ public class FFMpegConverterWorker extends SwingWorker<Void, Void> {
     private TwitchVideoInfo relatedTvi;
 
 
-    public FFMpegConverterWorker(File destinationVideoFile, File fileListForFfmpeg, File ffmpegExecutable) {
+    public FFMpegConverterWorker(File destinationVideoFile, File fileListForFfmpeg, String ffmpegCommand) {
         this.destinationVideoFile = destinationVideoFile;
         this.fileListForFfmpeg = fileListForFfmpeg;
-        this.ffmpegExecutable = ffmpegExecutable;
+        this.ffmpegCommand = ffmpegCommand;
         this.ffmpegOptions = new LinkedList();
         ffmpegOptions.add("-c:v");
         ffmpegOptions.add("libx264");
@@ -36,10 +37,10 @@ public FFMpegConverterWorker(File destinationVideoFile, File fileListForFfmpeg,
 
     }
 
-    public FFMpegConverterWorker(File destinationVideoFile, File fileListForFfmpeg, File ffmpegExecutable, LinkedList ffmpegOptions) {
+    public FFMpegConverterWorker(File destinationVideoFile, File fileListForFfmpeg, String ffmpegCommand, LinkedList ffmpegOptions) {
         this.destinationVideoFile = destinationVideoFile;
         this.fileListForFfmpeg = fileListForFfmpeg;
-        this.ffmpegExecutable = ffmpegExecutable;
+        this.ffmpegCommand = ffmpegCommand;
         this.ffmpegOptions = ffmpegOptions;
     }
 
@@ -69,7 +70,7 @@ protected Void doInBackground() throws Exception {
             System.out.println(outputLine);
             destinationVideoFile.delete();
         }
-        command.add(ffmpegExecutable.getAbsolutePath());
+        command.add(ffmpegCommand);
         command.add("-f");
         command.add("concat");
         command.add("-i");
@@ -109,6 +110,7 @@ protected Void doInBackground() throws Exception {
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
+                    printToPropertyChangeListeners(e.getMessage());
                 }
             }
 
@@ -121,7 +123,7 @@ protected Void doInBackground() throws Exception {
             line = line.replace("file '", "").replace("'", "");
             File partFile = new File(line);
             System.out.println("deleting " + partFile.getPath());
-            printToPropertyChangeListeners("deleting " + partFile.getPath());
+            printToPropertyChangeListeners("deleting " + partFile.getPath() + "\n");
             partFile.delete();
         }
         fileListSc.close();