Merge branch 'dev' into camsoda

CHANGELOG.md

@@ -1,6 +1,7 @@
 1.6.0
 ========================
 * Added support for multiple cam sites
+* Sites can be switched on and off in the settings
 * Added MyFreeCams
 * Fixed proxy authentication for HTTP and SOCKS
 

docs/index.html

@@ -109,19 +109,19 @@
     	</script>
         <div class="row text-center">
             <div class="col">
-                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.5.4/ctbrec-1.5.4-win64-jre.zip');">
+                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.6.0/ctbrec-1.6.0-win64-jre.zip');">
                     <i class="fa fa-windows mr-2"></i>
                     Download for Windows!
                 </a>
             </div>
             <div class="col">
-                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.5.4/ctbrec-1.5.4-win64.zip');">
+                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.6.0/ctbrec-1.6.0-win64.zip');">
                     <i class="fa fa-windows mr-2"></i>
                     Download for Windows (no JRE)!
                 </a>
             </div>
             <div class="col">
-                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.5.4/ctbrec-1.5.4-linux.zip');">
+                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.6.0/ctbrec-1.6.0-linux.zip');">
                     <i class="fa fa-linux mr-2"></i>
                     Download for Linux!
                 </a>

src/main/java/ctbrec/Model.java

@@ -34,4 +34,5 @@ public interface Model {
     public boolean follow() throws IOException;
     public boolean unfollow() throws IOException;
     public void setSite(Site site);
+    public Site getSite();
 }

src/main/java/ctbrec/recorder/LocalRecorder.java

@@ -55,7 +55,11 @@ public class LocalRecorder implements Recorder {
     public LocalRecorder(Config config) {
         this.config = config;
         config.getSettings().models.stream().forEach((m) -> {
-            models.add(m);
+            if(m.getSite().isEnabled()) {
+                models.add(m);
+            } else {
+                LOG.info("{} disabled -> ignoring {}", m.getSite().getName(), m.getName());
+            }
         });
 
         recording = true;

src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java

@@ -175,4 +175,9 @@ public class ChaturbateModel extends AbstractModel {
             throw new IllegalArgumentException("Site has to be an instance of Chaturbate");
         }
     }
+
+    @Override
+    public Site getSite() {
+        return site;
+    }
 }

src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java

@@ -303,4 +303,9 @@ public class MyFreeCamsModel extends AbstractModel {
             throw new IllegalArgumentException("Site has to be an instance of MyFreeCams");
         }
     }
+
+    @Override
+    public Site getSite() {
+        return site;
+    }
 }

src/main/java/ctbrec/ui/JavaFxModel.java

@@ -142,4 +142,9 @@ public class JavaFxModel extends AbstractModel {
     public void setSite(Site site) {
         delegate.setSite(site);
     }
+
+    @Override
+    public Site getSite() {
+        return delegate.getSite();
+    }
 }