diff --git a/CHANGELOG.md b/CHANGELOG.md
index 433181b3..857a6a63 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/docs/index.html b/docs/index.html
index bb12ec31..5d631e8a 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -109,19 +109,19 @@
-
+
Download for Linux!
diff --git a/src/main/java/ctbrec/Model.java b/src/main/java/ctbrec/Model.java
index 4663e86b..68d9646b 100644
--- a/src/main/java/ctbrec/Model.java
+++ b/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();
}
\ No newline at end of file
diff --git a/src/main/java/ctbrec/recorder/LocalRecorder.java b/src/main/java/ctbrec/recorder/LocalRecorder.java
index 46262ebd..4f3f983b 100644
--- a/src/main/java/ctbrec/recorder/LocalRecorder.java
+++ b/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;
diff --git a/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java b/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java
index 493486e2..9b573fb2 100644
--- a/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java
+++ b/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;
+ }
}
diff --git a/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java b/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java
index d5dfecd6..36a24da6 100644
--- a/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java
+++ b/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;
+ }
}
diff --git a/src/main/java/ctbrec/ui/JavaFxModel.java b/src/main/java/ctbrec/ui/JavaFxModel.java
index fbb6f2ff..1ede0c64 100644
--- a/src/main/java/ctbrec/ui/JavaFxModel.java
+++ b/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();
+ }
}