davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Code cleanup

This commit is contained in:
0xb00bface 2021-12-24 16:57:09 +01:00
parent 3a6fe58a0c
commit cfe8922b81
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvElectronLoginDialog.java
View File

@ -20,7 +20,7 @@ public class AmateurTvElectronLoginDialog {
private static final Logger LOG = LoggerFactory.getLogger(AmateurTvElectronLoginDialog.class); private static final Logger LOG = LoggerFactory.getLogger(AmateurTvElectronLoginDialog.class);
public static final String DOMAIN = "amateur.tv"; public static final String DOMAIN = "amateur.tv";
public static final String URL = AmateurTv.baseUrl; public static final String URL = AmateurTv.BASE_URL;
private CookieJar cookieJar; private CookieJar cookieJar;
private ExternalBrowser browser; private ExternalBrowser browser;
@ -73,7 +73,7 @@ public class AmateurTvElectronLoginDialog {
b.secure(); b.secure();
} }
Cookie c = b.build(); Cookie c = b.build();
cookieJar.saveFromResponse(HttpUrl.parse(AmateurTv.baseUrl), Collections.singletonList(c)); cookieJar.saveFromResponse(HttpUrl.parse(AmateurTv.BASE_URL), Collections.singletonList(c));
LOG.debug("{}={}", c.name(), c.value()); LOG.debug("{}={}", c.name(), c.value());
if (Objects.equals(c.name(), "userType") && Objects.equals(c.value(), "registered")) { if (Objects.equals(c.name(), "userType") && Objects.equals(c.value(), "registered")) {
loginSuccessful = true; loginSuccessful = true;

12
client/src/main/java/ctbrec/ui/sites/amateurtv/AmateurTvTabProvider.java
View File

@ -24,32 +24,32 @@ public class AmateurTvTabProvider extends AbstractTabProvider {
List<Tab> tabs = new ArrayList<>(); List<Tab> tabs = new ArrayList<>();
// all // all
var url = AmateurTv.baseUrl + "/v3/readmodel/cache/cams/A"; var url = AmateurTv.BASE_URL + "/v3/readmodel/cache/cams/A";
var updateService = new AmateurTvUpdateService((AmateurTv) site, url); var updateService = new AmateurTvUpdateService((AmateurTv) site, url);
tabs.add(createTab("All", updateService)); tabs.add(createTab("All", updateService));
// female // female
url = AmateurTv.baseUrl + "/v3/readmodel/cache/cams/W"; url = AmateurTv.BASE_URL + "/v3/readmodel/cache/cams/W";
updateService = new AmateurTvUpdateService((AmateurTv) site, url); updateService = new AmateurTvUpdateService((AmateurTv) site, url);
tabs.add(createTab("Female", updateService)); tabs.add(createTab("Female", updateService));
// male // male
url = AmateurTv.baseUrl + "/v3/readmodel/cache/cams/M"; url = AmateurTv.BASE_URL + "/v3/readmodel/cache/cams/M";
updateService = new AmateurTvUpdateService((AmateurTv) site, url); updateService = new AmateurTvUpdateService((AmateurTv) site, url);
tabs.add(createTab("Male", updateService)); tabs.add(createTab("Male", updateService));
// couples // couples
url = AmateurTv.baseUrl + "/v3/readmodel/cache/cams/C"; url = AmateurTv.BASE_URL + "/v3/readmodel/cache/cams/C";
updateService = new AmateurTvUpdateService((AmateurTv) site, url); updateService = new AmateurTvUpdateService((AmateurTv) site, url);
tabs.add(createTab("Couples", updateService)); tabs.add(createTab("Couples", updateService));
// trans // trans
url = AmateurTv.baseUrl + "/v3/readmodel/cache/cams/T"; url = AmateurTv.BASE_URL + "/v3/readmodel/cache/cams/T";
updateService = new AmateurTvUpdateService((AmateurTv) site, url); updateService = new AmateurTvUpdateService((AmateurTv) site, url);
tabs.add(createTab("Trans", updateService)); tabs.add(createTab("Trans", updateService));
// followed // followed
url = AmateurTv.baseUrl + "/v3/readmodel/cache/cams/F"; url = AmateurTv.BASE_URL + "/v3/readmodel/cache/cams/F";
updateService = new AmateurTvUpdateService((AmateurTv) site, url); updateService = new AmateurTvUpdateService((AmateurTv) site, url);
updateService.requiresLogin(true); updateService.requiresLogin(true);
followedTab = new AmateurTvFollowedTab("Followed", updateService, site); followedTab = new AmateurTvFollowedTab("Followed", updateService, site);

10
common/src/main/java/ctbrec/sites/amateurtv/AmateurTv.java
View File

@ -12,7 +12,7 @@ import ctbrec.sites.AbstractSite;
public class AmateurTv extends AbstractSite { public class AmateurTv extends AbstractSite {
public static String baseUrl = "https://en.amateur.tv"; public static final String BASE_URL = "https://en.amateur.tv";
private AmateurTvHttpClient httpClient; private AmateurTvHttpClient httpClient;
@ -29,14 +29,14 @@ public class AmateurTv extends AbstractSite {
@Override @Override
public String getBaseUrl() { public String getBaseUrl() {
return baseUrl; return BASE_URL;
} }
@Override @Override
public Model createModel(String name) { public Model createModel(String name) {
AmateurTvModel model = new AmateurTvModel(); AmateurTvModel model = new AmateurTvModel();
model.setName(name); model.setName(name);
model.setUrl(baseUrl + '/' + name); model.setUrl(BASE_URL + '/' + name);
model.setDescription(""); model.setDescription("");
model.setSite(this); model.setSite(this);
return model; return model;
@ -44,7 +44,7 @@ public class AmateurTv extends AbstractSite {
@Override @Override
public Double getTokenBalance() throws IOException { public Double getTokenBalance() throws IOException {
return Double.valueOf(0); return 0d;
} }
@Override @Override
@ -121,6 +121,6 @@ public class AmateurTv extends AbstractSite {
@Override @Override
public String getAffiliateLink() { public String getAffiliateLink() {
return baseUrl; return BASE_URL;
} }
} }

2
common/src/main/java/ctbrec/sites/amateurtv/AmateurTvDownload.java
View File

@ -140,7 +140,7 @@ public class AmateurTvDownload extends AbstractDownload {
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent) .header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.header(ACCEPT, "*/*") .header(ACCEPT, "*/*")
.header(ACCEPT_LANGUAGE, "en") .header(ACCEPT_LANGUAGE, "en")
.header(ORIGIN, AmateurTv.baseUrl) .header(ORIGIN, AmateurTv.BASE_URL)
.build(); .build();
try (Response resp = httpClient.execute(request)) { try (Response resp = httpClient.execute(request)) {
if (resp.isSuccessful()) { if (resp.isSuccessful()) {

4
common/src/main/java/ctbrec/sites/amateurtv/AmateurTvHttpClient.java
View File

@ -30,13 +30,13 @@ public class AmateurTvHttpClient extends HttpClient {
* @throws IOException * @throws IOException
*/ */
public boolean checkLoginSuccess() throws IOException { public boolean checkLoginSuccess() throws IOException {
String url = AmateurTv.baseUrl + "/v3/readmodel/user/me"; String url = AmateurTv.BASE_URL + "/v3/readmodel/user/me";
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url) .url(url)
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent) .header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.header(ACCEPT, MIMETYPE_APPLICATION_JSON) .header(ACCEPT, MIMETYPE_APPLICATION_JSON)
.header(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage()) .header(ACCEPT_LANGUAGE, Locale.ENGLISH.getLanguage())
.header(REFERER, AmateurTv.baseUrl) .header(REFERER, AmateurTv.BASE_URL)
.build(); .build();
try (Response response = execute(request)) { try (Response response = execute(request)) {
if (response.isSuccessful()) { if (response.isSuccessful()) {

2
common/src/main/java/ctbrec/sites/amateurtv/AmateurTvModel.java
View File

@ -160,7 +160,7 @@ public class AmateurTvModel extends AbstractModel {
} }
private JSONObject getModelInfo() throws IOException { private JSONObject getModelInfo() throws IOException {
String url = AmateurTv.baseUrl + "/v3/readmodel/show/" + getName() + "/es"; String url = AmateurTv.BASE_URL + "/v3/readmodel/show/" + getName() + "/es";
Request req = new Request.Builder().url(url) Request req = new Request.Builder().url(url)
.header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent) .header(USER_AGENT, Config.getInstance().getSettings().httpUserAgent)
.header(ACCEPT, MIMETYPE_APPLICATION_JSON) .header(ACCEPT, MIMETYPE_APPLICATION_JSON)