From 1032c9f94a794ca13fc0e49ba8cb8637bd564808 Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Wed, 24 Oct 2018 13:05:52 +0200
Subject: [PATCH] Fix update service in RemoteRecorder

Models now get their site assigned
---
 src/main/java/ctbrec/recorder/RemoteRecorder.java | 13 ++++++++++++-
 src/main/java/ctbrec/ui/CamrecApplication.java    |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ctbrec/recorder/RemoteRecorder.java b/src/main/java/ctbrec/recorder/RemoteRecorder.java
index 6441cf8d..2cb7b216 100644
--- a/src/main/java/ctbrec/recorder/RemoteRecorder.java
+++ b/src/main/java/ctbrec/recorder/RemoteRecorder.java
@@ -21,6 +21,7 @@ import ctbrec.Recording;
 import ctbrec.io.HttpClient;
 import ctbrec.io.InstantJsonAdapter;
 import ctbrec.io.ModelJsonAdapter;
+import ctbrec.sites.Site;
 import okhttp3.MediaType;
 import okhttp3.Request;
 import okhttp3.Request.Builder;
@@ -41,15 +42,18 @@ public class RemoteRecorder implements Recorder {
     private JsonAdapter<ModelRequest> modelRequestAdapter = moshi.adapter(ModelRequest.class);
 
     private List<Model> models = Collections.emptyList();
+    private List<Site> sites;
 
     private Config config;
     private HttpClient client;
     private Instant lastSync = Instant.EPOCH;
     private SyncThread syncThread;
 
-    public RemoteRecorder(Config config, HttpClient client) {
+
+    public RemoteRecorder(Config config, HttpClient client, List<Site> sites) {
         this.config = config;
         this.client = client;
+        this.sites = sites;
 
         syncThread = new SyncThread();
         syncThread.start();
@@ -144,6 +148,13 @@ public class RemoteRecorder implements Recorder {
                         ModelListResponse resp = modelListResponseAdapter.fromJson(json);
                         if(resp.status.equals("success")) {
                             models = resp.models;
+                            for (Model model : models) {
+                                for (Site site : sites) {
+                                    if(site.isSiteForModel(model)) {
+                                        model.setSite(site);
+                                    }
+                                }
+                            }
                             lastSync = Instant.now();
                         } else {
                             LOG.error("Server returned error: {} - {}", resp.status, resp.msg);
diff --git a/src/main/java/ctbrec/ui/CamrecApplication.java b/src/main/java/ctbrec/ui/CamrecApplication.java
index be4bd30a..80723fe3 100644
--- a/src/main/java/ctbrec/ui/CamrecApplication.java
+++ b/src/main/java/ctbrec/ui/CamrecApplication.java
@@ -168,7 +168,7 @@ public class CamrecApplication extends Application {
         if (config.getSettings().localRecording) {
             recorder = new LocalRecorder(config);
         } else {
-            recorder = new RemoteRecorder(config, httpClient);
+            recorder = new RemoteRecorder(config, httpClient, sites);
         }
     }