j62
/
ctbrec
2
2
Fork 2
Code Issues 9 Pull Requests Packages Projects Releases 3 Wiki Activity

Use getName() instead of this.name 

Use getName() whenever this.name is used, so that the wrapper
JavaFxModel works as intended.
This commit is contained in:
0xboobface 2018-10-01 18:39:18 +02:00
parent 88ee4bd157
commit 1dadd6b94b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/ctbrec/Model.java
View File

@ -78,9 +78,9 @@ public class Model {
public boolean isOnline(boolean ignoreCache) throws IOException, ExecutionException, InterruptedException { public boolean isOnline(boolean ignoreCache) throws IOException, ExecutionException, InterruptedException {
StreamInfo info; StreamInfo info;
if(ignoreCache) { if(ignoreCache) {
info = Chaturbate.INSTANCE.loadStreamInfo(name); info = Chaturbate.INSTANCE.loadStreamInfo(getName());
} else { } else {
info = Chaturbate.INSTANCE.getStreamInfo(name); info = Chaturbate.INSTANCE.getStreamInfo(getName());
} }
return Objects.equals("public", info.room_status); return Objects.equals("public", info.room_status);
} }
@ -102,16 +102,16 @@ public class Model {
} }
public int[] getStreamResolution(boolean failFast) throws ExecutionException { public int[] getStreamResolution(boolean failFast) throws ExecutionException {
int[] resolution = Chaturbate.INSTANCE.streamResolutionCache.getIfPresent(name); int[] resolution = Chaturbate.INSTANCE.streamResolutionCache.getIfPresent(getName());
if(resolution != null) { if(resolution != null) {
return Chaturbate.INSTANCE.getResolution(name); return Chaturbate.INSTANCE.getResolution(getName());
} else { } else {
return new int[2]; return new int[2];
} }
} }
public int[] getStreamResolution() throws ExecutionException { public int[] getStreamResolution() throws ExecutionException {
return Chaturbate.INSTANCE.getResolution(name); return Chaturbate.INSTANCE.getResolution(getName());
} }
public String getOnlineState() throws IOException, ExecutionException { public String getOnlineState() throws IOException, ExecutionException {
@ -119,15 +119,15 @@ public class Model {
} }
public String getOnlineState(boolean failFast) throws IOException, ExecutionException { public String getOnlineState(boolean failFast) throws IOException, ExecutionException {
StreamInfo info = Chaturbate.INSTANCE.streamInfoCache.getIfPresent(name); StreamInfo info = Chaturbate.INSTANCE.streamInfoCache.getIfPresent(getName());
return info != null ? info.room_status : "n/a"; return info != null ? info.room_status : "n/a";
} }
public StreamInfo getStreamInfo() throws IOException, ExecutionException { public StreamInfo getStreamInfo() throws IOException, ExecutionException {
return Chaturbate.INSTANCE.getStreamInfo(name); return Chaturbate.INSTANCE.getStreamInfo(getName());
} }
public MasterPlaylist getMasterPlaylist() throws IOException, ParseException, PlaylistException, ExecutionException { public MasterPlaylist getMasterPlaylist() throws IOException, ParseException, PlaylistException, ExecutionException {
return Chaturbate.INSTANCE.getMasterPlaylist(name); return Chaturbate.INSTANCE.getMasterPlaylist(getName());
} }
@Override @Override
@ -163,7 +163,7 @@ public class Model {
@Override @Override
public String toString() { public String toString() {
return name; return getName();
} }
private static class Chaturbate { private static class Chaturbate {