Skip to content

Arte: reduce search depth #1043

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 3 commits into from
Apr 28, 2025
Merged

Arte: reduce search depth #1043

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
48e5f1f
reduce loaded subpages
pidoubleyou Apr 27, 2025
99c96f2
stop retry if crawler is stopped
pidoubleyou Apr 27, 2025
1af043a
Version auf 3.1.253 angehoben
alex1702 Apr 28, 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
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.252'
version = '3.1.253'

def jarName = 'MServer.jar'
def mainClass = 'mServer.Main'
Expand Down
6 changes: 4 additions & 2 deletions 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 @@ -2,6 +2,7 @@

import com.google.common.util.concurrent.RateLimiter;
import com.google.gson.Gson;
import de.mediathekview.mlib.Config;
import de.mediathekview.mlib.tool.Log;
import de.mediathekview.mlib.tool.MVHttpClient;
import okhttp3.OkHttpClient;
Expand Down Expand Up @@ -87,7 +88,8 @@ public static <T> T executeRequest(final String sender, Logger logger, Gson gson
} else {
// bei 429 (too many requests) warten und nochmal versuchen
// Wartezeit von 60s aus Header Retry-After
Log.sysLog("429: " + aUrl);
String retryAfter = response.header("Retry-After", "");
Log.sysLog("429: " + aUrl + " - retry after: " + retryAfter);
try {
TimeUnit.MILLISECONDS.sleep(60000);
FilmeSuchen.listeSenderLaufen.inc(sender, RunSender.Count.FEHLVERSUCHE);
Expand All @@ -102,7 +104,7 @@ public static <T> T executeRequest(final String sender, Logger logger, Gson gson
}

}
} while (!stop);
} while (!stop && !Config.getStop());

} catch (IOException ex) {
logger.error("Beim laden der Filme für Arte kam es zu Verbindungsproblemen.", ex);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/mServer/crawler/sender/arte/MediathekArte.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,10 @@ private void loadNextPage(String sender, String langCode, String aCategory, Stri

private boolean shouldLoadNextPage(String sender) {
if (Const.ARTE_DE.equals(sender)) {
return true;
return subPage < 10;
}

return subPage < 5;
return subPage < 2;
}

private void loadCollections(String sender, String langCode, Gson gsonParent, Gson gsonChild, ArteCategoryFilmsDTO dto) {
Expand Down