Merge remote-tracking branch 'origin/main'

This commit is contained in:
2022-12-18 15:50:21 +01:00

View File

@@ -61,9 +61,10 @@ public class TippligaGoogleEventManager {
String description = getDescription(season, league, matchday, deliveryDateNumber); String description = getDescription(season, league, matchday, deliveryDateNumber);
String descriptionHtml = getDescriptionHTML(season, league, matchday, deliveryDateNumber); String descriptionHtml = getDescriptionHTML(season, league, matchday, deliveryDateNumber);
for (Event event : allEvents) { for (Event event : allEvents) {
String eventDescription = event.getDescription();
if ( if (
(event.getDescription().replaceAll("\\s+","").equals(description.replaceAll("\\s+",""))) (eventDescription.replaceAll("\\s+","").equals(description.replaceAll("\\s+","")))
|| event.getDescription().equals(descriptionHtml) || eventDescription.equals(descriptionHtml)
) { ) {
return event; return event;
} }
@@ -176,7 +177,7 @@ public class TippligaGoogleEventManager {
private static String getDescriptionHTML(Integer season, Integer league, Integer matchday, Integer deliverDateNumber) { private static String getDescriptionHTML(Integer season, Integer league, Integer matchday, Integer deliverDateNumber) {
league = league == 2 ? 1 : league; league = league == 2 ? 1 : league;
return "<html-blob>Saison: " + season + "<br>" + "Liga: " + league + "<br>" + "Spieltag: " + matchday + "<br>" + "Abgabeschluss: " + deliverDateNumber + "</html-blob>"; return "Saison: " + season + "<br>" + "Liga: " + league + "<br>" + "Spieltag: " + matchday + "<br>" + "Abgabeschluss: " + deliverDateNumber;
} }
public static void updateAllMatchdays(ArrayList<TLWMatchday> matchdays) { public static void updateAllMatchdays(ArrayList<TLWMatchday> matchdays) {