Skip to content

Hotfix/1035 #1037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex1702 merged 2 commits into from
Mar 10, 2025
Merged

Hotfix/1035 #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f93c50f
add log for update film list with old entries
pidoubleyou Mar 6, 2025
a3fcd7d
srf: 720p als normale Url analog ARD/ZDF
pidoubleyou Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/main/java/mServer/crawler/FilmeSuchen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,17 @@ public synchronized void meldenFertig(String sender) {
mrClear();
if (CrawlerConfig.updateFilmliste) {
// alte Filme eintragen wenn angefordert oder nur ein update gesucht wurde
//////toDo
zeile = "" + '\n';
zeile += "-------------------------------------------------------------------------------------" + '\n';
zeile += "Update Filmliste:" + '\n';
zeile += " -> Einträge bisher: " + listeFilmeNeu.size() + '\n';
zeile += " -> Einträge alte: " + listeFilmeAlt.size() + '\n';

listeFilmeNeu.updateListe(listeFilmeAlt, true /* über den Index vergleichen */, false /*ersetzen*/);

zeile += " -> Einträge danach: " + listeFilmeNeu.size() + '\n';
zeile += "-------------------------------------------------------------------------------------" + '\n';
Log.sysLog(zeile);
}
listeFilmeNeu.sort();
// FilmlisteMetaDaten
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/mServer/crawler/sender/base/M3U8Dto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ public Optional<Qualities> getResolution() {
case "480x320":
case "480x360":
case "512x288":
return Optional.of(Qualities.SMALL);
case "636x360":
case "640x360":
case "640x480":
Expand All @@ -77,15 +76,16 @@ public Optional<Qualities> getResolution() {
case "720x544":
case "768x576":
case "852x480":
return Optional.of(Qualities.SMALL);
case "960x540":
case "960x544":
case "1024x576":
case "1064x576":
case "1152x576":
return Optional.of(Qualities.NORMAL);
case "1280x720":
case "1330x720":
case "1440x720":
return Optional.of(Qualities.NORMAL);
case "1920x1080":
case "2560x1440":
case "3840x2160":
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/mServer/crawler/sender/srf/parser/SrfFilmJsonDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,12 @@ private static Optional<Qualities> getResolution(M3U8Dto aDto) {
if (widthMeta.isPresent()) {
int width = Integer.parseInt(widthMeta.get());

if (width <= 700000) {
return Optional.of(Qualities.SMALL);
} else if (width > 3000000) {
if (width > 6000000) {
return Optional.of(Qualities.HD);
} else {
} else if (width > 2000000) {
return Optional.of(Qualities.NORMAL);
} else {
return Optional.of(Qualities.SMALL);
}
}
}
Expand Down