From ff0d1b5eae1ad39951a2b80813bdb8b930c2cc61 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Wed, 24 Oct 2018 23:39:46 +0200 Subject: [PATCH] Fix live preview for wowza servers --- src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java b/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java index 78c3087b..d5dfecd6 100644 --- a/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java +++ b/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java @@ -220,7 +220,7 @@ public class MyFreeCamsModel extends AbstractModel { try { previewUrl = getLivePreviewUrl(state); } catch(Exception e) { - LOG.debug("Couldn't get live preview. Falling back to avatar", e); + LOG.error("Couldn't get live preview. Falling back to avatar", e); } } setPreview(previewUrl); @@ -252,15 +252,15 @@ public class MyFreeCamsModel extends AbstractModel { ServerConfig sc = site.getClient().getServerConfig(); if(sc.isOnNgServer(state)) { server = sc.ngVideoServers.get(Integer.toString(camserv)); - camserv = Integer.parseInt(server.replaceAll("video", "")); + camserv = Integer.parseInt(server.replaceAll("[^0-9]+", "")); previewUrl = "https://snap.mfcimg.com/snapimg/" + camserv + "/320x240/mfc_" + state.getU().getPhase()+ '_' + userChannel; } else if(sc.isOnWzObsVideoServer(state)) { - server = sc.wsServers.get(Integer.toString(camserv)); - camserv = Integer.parseInt(server.replaceAll("video", "")); + server = sc.wzobsServers.get(Integer.toString(camserv)); + camserv = Integer.parseInt(server.replaceAll("[^0-9]+", "")); previewUrl = "https://snap.mfcimg.com/snapimg/" + camserv + "/320x240/mfc_" + state.getU().getPhase()+ '_' + userChannel; } else if(sc.isOnHtml5VideoServer(state)) { server = sc.h5Servers.get(Integer.toString(camserv)); - camserv = Integer.parseInt(server.replaceAll("video", "")); + camserv = Integer.parseInt(server.replaceAll("[^0-9]+", "")); previewUrl = "https://snap.mfcimg.com/snapimg/" + camserv + "/320x240/mfc_" + userChannel; } else { if(camserv > 500) camserv -= 500;