Skip to content

Commit 1968c0d

Browse files
committed
replace special chars while reconstructing website
fix Kika subtitel
2 parents 0c47617 + db41149 commit 1968c0d

File tree

4 files changed

+26
-11
lines changed

4 files changed

+26
-11
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ sourceCompatibility = JavaVersion.VERSION_17
2727
targetCompatibility = JavaVersion.VERSION_17
2828
group = 'de.mediathekview'
2929
archivesBaseName = "MServer"
30-
version = '3.1.273'
30+
version = '3.1.274'
3131

3232
def jarName = 'MServer.jar'
3333
def mainClass = 'mServer.Main'

src/main/java/mServer/crawler/sender/ard/ArdCrawler.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,8 @@ public class ArdCrawler extends MediathekCrawler {
4141
"Y3JpZDovL3N3ci5kZS9zZGIvc3RJZC8xNjY3",
4242
// oldhenry
4343
"Y3JpZDovL2Rhc2Vyc3RlLmRlL29sZC1oZW5yeQ",
44-
// don camillo
45-
"Y3JpZDovL2JyLmRlL2Jyb2FkY2FzdFNlcmllcy9GMjAxN1dPMDA5MzU1QTBfc2luZ2xlc2hvdw",
46-
"Y3JpZDovL2JyLmRlL2Jyb2FkY2FzdFNlcmllcy9GMjAxN1dPMDA5Mzk0QTFfc2luZ2xlc2hvdw",
47-
"Y3JpZDovL2JyLmRlL2Jyb2FkY2FzdFNlcmllcy9GMjAxN1dPMDA5Mzk3QTFfc2luZ2xlc2hvdw",
48-
"Y3JpZDovL2JyLmRlL2Jyb2FkY2FzdFNlcmllcy9GMjAxN1dPMDA5MjMwQTBfc2luZ2xlc2hvdw",
49-
"Y3JpZDovL2JyLmRlL2Jyb2FkY2FzdFNlcmllcy9GMjAxN1dPMDA5Mzg3QTFfc2luZ2xlc2hvdw"
44+
// evertyhing (bis 5.1.)
45+
"Y3JpZDovL2Rhc2Vyc3RlLmRlL2V2ZXJ5dGhpbmctZXZlcnl3aGVyZS1hbGwtYXQtb25jZQ"
5046
};
5147

5248
public ArdCrawler(FilmeSuchen ssearch, int startPrio) {

src/main/java/mServer/crawler/sender/kika/tasks/KikaApiFilmTask.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,17 @@ protected void postProcessing(KikaApiVideoInfoDto aResponseObj, KikaApiFilmDto a
108108
aDTO.getWebsite().orElse(""),
109109
aDTO.getTitle().get(),
110110
videoUrls.get(Resolution.NORMAL),
111-
((subs.isEmpty()) ? "" : subs.toArray()[0].toString()),
111+
"",
112112
airedDate.get().format(DateTimeFormatter.ofPattern("dd.MM.yyyy")),
113113
airedDate.get().format(DateTimeFormatter.ofPattern("HH:mm:ss")),
114114
parseDuration(aDTO, aDTO.getDuration()).get().getSeconds(),
115115
aDTO.getDescription().orElse("")
116116
);
117117
//
118+
if (!subs.isEmpty()) {
119+
CrawlerTool.addUrlSubtitle(aFilm, subs.toArray()[0].toString());
120+
}
121+
//
118122
if (videoUrls.containsKey(Resolution.SMALL)) {
119123
CrawlerTool.addUrlKlein(aFilm, videoUrls.get(Resolution.SMALL));
120124
}

src/main/java/mServer/crawler/sender/srf/parser/SrfFilmJsonDeserializer.java

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,24 @@ private static String buildWebsiteUrl(String aId, String aTitle, String aTheme)
5757
replaceCharForUrl(aTheme), replaceCharForUrl(aTitle), aId);
5858
}
5959

60-
private static String replaceCharForUrl(String aValue) {
61-
return aValue.toLowerCase().replace(' ', '-').replace('.', '-').replace(',', '-').replace(":", "").replace("\"", "")
62-
.replace("--", "-");
60+
private static String replaceCharForUrl(final String aValue) {
61+
return aValue
62+
.toLowerCase()
63+
.replace(' ', '-')
64+
.replace('.', '-')
65+
.replace(',', '-')
66+
.replace(":", "")
67+
.replace("\"", "")
68+
.replace("|", "")
69+
.replace("#", "")
70+
.replace("?", "")
71+
.replace("%", "")
72+
.replace("&", "")
73+
.replace("`", "")
74+
.replace("«", "")
75+
.replace("»", "")
76+
.replace(" ", "")
77+
.replace("--", "-");
6378
}
6479

6580
private static String parseShow(JsonObject aJsonObject) {

0 commit comments

Comments
 (0)