diff --git a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4UpdateService.java b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4UpdateService.java index 6916f14a..f0537bb2 100644 --- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4UpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4UpdateService.java @@ -33,7 +33,7 @@ import okhttp3.Response; public class Cam4UpdateService extends PaginatedScheduledService { - private static final transient Logger LOG = LoggerFactory.getLogger(Cam4UpdateService.class); + private static final Logger LOG = LoggerFactory.getLogger(Cam4UpdateService.class); private String url; private Cam4 site; private boolean loginRequired; @@ -86,6 +86,7 @@ public class Cam4UpdateService extends PaginatedScheduledService { String slug = path.substring(1); Cam4Model model = site.createModel(slug); String playlistUrl = profileLink.attr("data-hls-preview-url"); + model.setDisplayName(HtmlParser.getText(boxHtml, "div.profileBoxTitle a").trim()); model.setPlaylistUrl(playlistUrl); model.setPreview("https://snapshots.xcdnpro.com/thumbnails/" + model.getName() + "?s=" + System.currentTimeMillis()); model.setDescription(parseDesription(boxHtml)); diff --git a/common/src/main/java/ctbrec/Config.java b/common/src/main/java/ctbrec/Config.java index a777a69b..793c4cb0 100644 --- a/common/src/main/java/ctbrec/Config.java +++ b/common/src/main/java/ctbrec/Config.java @@ -174,6 +174,13 @@ public class Config { iterator.remove(); } } + // 3.11.0 make Cam4 model names lower case + settings.models.stream() + .filter(m -> m instanceof Cam4Model) + .forEach(m -> m.setName(m.getName().toLowerCase())); + settings.modelsIgnored.stream() + .filter(m -> m instanceof Cam4Model) + .forEach(m -> m.setName(m.getName().toLowerCase())); } private void makeBackup(File source) { diff --git a/common/src/main/java/ctbrec/sites/cam4/Cam4.java b/common/src/main/java/ctbrec/sites/cam4/Cam4.java index 6a8b7562..20a3143c 100644 --- a/common/src/main/java/ctbrec/sites/cam4/Cam4.java +++ b/common/src/main/java/ctbrec/sites/cam4/Cam4.java @@ -47,8 +47,9 @@ public class Cam4 extends AbstractSite { public Cam4Model createModel(String name) { Cam4Model m = new Cam4Model(); m.setSite(this); - m.setName(name); - m.setUrl(getBaseUrl() + '/' + name + '/'); + m.setDisplayName(name); + m.setName(name.toLowerCase()); + m.setUrl(getBaseUrl() + '/' + m.getName() + '/'); return m; }