Skip to content
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

fix arte crawler #1010

Merged
merged 3 commits into from
Sep 26, 2024
Merged

fix arte crawler #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25f9f56
Authorization only for urls with /api/opa/
pidoubleyou Sep 26, 2024
cb52fc8
change video url to fix 403 #1009
pidoubleyou Sep 26, 2024
4c3c53c
Version auf 3.1.239 angehoben
alex1702 Sep 26, 2024
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
group = 'de.mediathekview'
archivesBaseName = "MServer"
version = '3.1.238'
version = '3.1.239'

def jarName = 'MServer.jar'
def mainClass = 'mServer.Main'
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/mServer/crawler/sender/arte/ArteHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class ArteHttpClient {

private static Request createRequest(String aUrl) {
Builder b;
if (aUrl.contains("/opa/")) {
if (aUrl.contains("/api/opa/")) {
b = BUILDER_OPA;
} else {
b = BUILDER;
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/mServer/crawler/sender/arte/ArteProgramIdToDatenFilmCallable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class ArteProgramIdToDatenFilmCallable implements Callable<Set<DatenFilm>

private static final Logger LOG = LogManager.getLogger(ArteProgramIdToDatenFilmCallable.class);

private static final String ARTE_VIDEO_INFORMATION_URL_PATTERN = "https://api.arte.tv/api/opa/v3/videoStreams?programId=%s&limit=100&language=%s&protocol=HTTPS&kind=SHOW";
private static final String ARTE_VIDEO_INFORMATION_URL_PATTERN = "https://www.arte.tv/hbbtvv2/services/web/index.php/OPA/v3/streams/%s/SHOW/%s";
private static final String ARTE_VIDEO_INFORMATION_URL_PATTERN_2 = "https://api.arte.tv/api/opa/v3/programs/%s/%s"; // Für broadcastBeginRounded

private final FastDateFormat broadcastDateFormat = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ssX");//2016-10-29T16:15:00Z
Expand Down Expand Up @@ -93,7 +93,11 @@ public Set<DatenFilm> call() throws Exception {
if (video.getVideoUrlsOriginalWithSubtitle().containsKey(Qualities.NORMAL)) {
films.add(createFilm(details.getTheme(), details.getWebsite(), details.getTitle() + " (Originalversion mit Untertitel)", video.getVideoUrlsOriginalWithSubtitle(), details, durationAsTime, details.getDescription()));
}
} else {
Log.errorLog(8572677, "arte: no program found " + programId);
}
} else {
Log.errorLog(84572678, "arte: no video found " + programId);
}

return films;
Expand Down
Loading