Skip to content

Hotfix/488 #1129

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 9, 2026
Merged

Hotfix/488 #1129

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
afd7c15
remove obsolete set FILM_URL_HISTORY
pidoubleyou Feb 28, 2026
bb7aaa0
remove obsolete methods
pidoubleyou Feb 28, 2026
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
76 changes: 0 additions & 76 deletions src/main/java/de/mediathekview/mlib/daten/DatenFilm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ public class DatenFilm implements Comparable<DatenFilm> {
"+++Aus rechtlichen Gründen kann dieses Video nur innerhalb von Deutschland abgerufen werden.+++"
};
private static final long MAX_DAUER = 3600 * 99L; /* Werte über 99 Stunden */
public static boolean[] spaltenAnzeigen = new boolean[MAX_ELEM];
public final String[] arr = new String[]{
"", "", "", "", "", "", "", "", "", "",
"", "", "", "", "", "", "", "", "", "", "", "",
Expand Down Expand Up @@ -247,41 +246,6 @@ public String getUrlFuerAufloesung(String aufloesung) {
return arr[DatenFilm.FILM_URL];
}

public String getUrlRtmpFuerAufloesung(String aufloesung) {
if (aufloesung.equals(AUFLOESUNG_KLEIN)) {
return getUrlFlvstreamerKlein();
}
if (aufloesung.equals(AUFLOESUNG_HD)) {
return getUrlFlvstreamerHd();
}
return getUrlFlvstreamer();
}

public String getDateigroesse(String url) {
if (url.equals(arr[DatenFilm.FILM_URL])) {
return arr[DatenFilm.FILM_GROESSE];
} else {
return FileSize.laengeString(url);
}
}

public void setUrlHistory() {
String u = getUrl();
if (u.equals(arr[DatenFilm.FILM_URL])) {
arr[DatenFilm.FILM_URL_HISTORY] = "";
} else {
arr[DatenFilm.FILM_URL_HISTORY] = u;
}
}

public String getUrlHistory() {
if (arr[DatenFilm.FILM_URL_HISTORY].isEmpty()) {
return arr[DatenFilm.FILM_URL];
} else {
return arr[DatenFilm.FILM_URL_HISTORY];
}
}

public String getIndex() {
// liefert einen eindeutigen Index für die Filmliste
String url = getUrl();
Expand Down Expand Up @@ -504,46 +468,6 @@ private String getUrlFlvstreamer() {
return ret;
}

private String getUrlFlvstreamerKlein() {
// liefert die kleine flvstreamer URL
String ret;
if (!arr[DatenFilm.FILM_URL_RTMP_KLEIN].isEmpty()) {
// es gibt eine kleine RTMP
try {
int i = Integer.parseInt(arr[DatenFilm.FILM_URL_RTMP_KLEIN].substring(0, arr[DatenFilm.FILM_URL_RTMP_KLEIN].indexOf('|')));
return arr[DatenFilm.FILM_URL_RTMP].substring(0, i) + arr[DatenFilm.FILM_URL_RTMP_KLEIN].substring(arr[DatenFilm.FILM_URL_RTMP_KLEIN].indexOf('|') + 1);
} catch (Exception ignored) {
}
}
// es gibt keine kleine RTMP
if (!arr[DatenFilm.FILM_URL_RTMP].isEmpty()) {
// dann gibts keine kleine
ret = arr[DatenFilm.FILM_URL_RTMP];
} else {
// dann gibts überhaupt nur die normalen URLs
ret = getUrlNormalKlein();
// und jetzt noch "-r" davorsetzten wenn nötig
if (ret.startsWith(Const.RTMP_PRTOKOLL)) {
ret = Const.RTMP_FLVSTREAMER + ret;
}
}
return ret;
}

private String getUrlFlvstreamerHd() {
// liefert die HD flvstreamer URL
if (!arr[DatenFilm.FILM_URL_RTMP_HD].isEmpty()) {
// es gibt eine HD RTMP
try {
final int i = Integer.parseInt(arr[DatenFilm.FILM_URL_RTMP_HD].substring(0, arr[DatenFilm.FILM_URL_RTMP_HD].indexOf('|')));
return arr[DatenFilm.FILM_URL_RTMP].substring(0, i) + arr[DatenFilm.FILM_URL_RTMP_HD].substring(arr[DatenFilm.FILM_URL_RTMP_HD].indexOf('|') + 1);
} catch (Exception ignored) {
}
}
// es gibt keine HD RTMP
return getUrlFlvstreamer();
}

private void checkDatum(String datum, String fehlermeldung) {
datum = datum.trim();
if (datum.contains(".") && datum.length() == 10) {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/mServer/crawler/sender/MediathekReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ protected void addFilm(DatenFilm film) {
setFileSize(film);
upgradeUrl(film);

film.setUrlHistory();
setGeo(film);
if (mlibFilmeSuchen.listeFilmeNeu.addFilmVomSender(film)) {
// dann ist er neu
Expand Down