Skip to content

Commit 81e7884

Browse files
committed
remove stacktrace from srf website url rebuild, limit number of films
1 parent cad68da commit 81e7884

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

src/main/java/de/mediathekview/mserver/base/utils/FilmDBService.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,10 @@ public <T> List<T> filterNewVideos(Sender sender, List<T> videos, Function<T, St
224224
}
225225
LOG.debug("Filtered {} in {} (in {} vs out {})",(videos.size()-result.size()), sender.getName(), videos.size(), result.size());
226226
// CARP films pro Nacht. Die filme werden dann am nächsten tag gefunden. TODO: für die nächste runde.
227-
/* result = new ArrayList<>(result.subList(0, 200000));
228-
*
229-
*/
227+
if(result.size() > 100_000) {
228+
LOG.debug("CARP - reduced number of films to 100000 in one job");
229+
}
230+
result = new ArrayList<>(result.subList(0, 100_000));
230231
return result;
231232
} catch (Exception e) {
232233
LOG.error("{}", e);

src/main/java/de/mediathekview/mserver/crawler/ard/ArdCrawler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ private Queue<CrawlerUrlDTO> createDayUrlsToCrawl() {
5757

5858
@Override
5959
protected RecursiveTask<Set<Film>> createCrawlerTask() {
60-
ConcurrentLinkedQueue<CrawlerUrlDTO> test = new ConcurrentLinkedQueue<>();
6160
try {
6261
final ForkJoinTask<Set<ArdFilmInfoDto>> dayTask =
6362
forkJoinPool.submit(new ArdDayPageTask(this, createDayUrlsToCrawl()));

src/main/java/de/mediathekview/mserver/crawler/srf/parser/SrfFilmJsonDeserializer.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ private static Optional<URL> buildWebsiteUrl(
9797
try {
9898
return Optional.of(URI.create(url).toURL());
9999
} catch (final MalformedURLException ex) {
100-
LOG.error(String.format("The website url \"%s\" isn't valid.", url), ex);
100+
LOG.debug("The website url {} isn't valid", url);
101+
//LOG.error(String.format("The website url \"%s\" isn't valid.", url), ex);
102+
101103
}
102104

103105
return Optional.empty();
@@ -106,7 +108,12 @@ private static Optional<URL> buildWebsiteUrl(
106108
private static String replaceCharForUrl(final String aValue) {
107109
return aValue
108110
.toLowerCase()
111+
.replaceAll("\\p{C}", "") // entfernt ALLE Control Char
109112
.replace(' ', '-')
113+
.replace("ä", "ae")
114+
.replace("ü", "ue")
115+
.replace("ö", "oe")
116+
.replace("ß", "ss")
110117
.replace('.', '-')
111118
.replace(',', '-')
112119
.replace(":", "")
@@ -120,9 +127,10 @@ private static String replaceCharForUrl(final String aValue) {
120127
.replace("«", "")
121128
.replace("»", "")
122129
.replace(" ", "")
130+
.replace("--", "-")
123131
.replace("--", "-");
124132
}
125-
133+
126134
private static String parseShow(final JsonObject aJsonObject) {
127135
if (aJsonObject.has(ELEMENT_SHOW)) {
128136
final JsonElement showElement = aJsonObject.get(ELEMENT_SHOW);

0 commit comments

Comments
 (0)