Skip to content

JsonParser: enable INCLUDE_SOURCE_IN_LOCATION #1173

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 1 commit into from
Sep 16, 2026
Merged

JsonParser: enable INCLUDE_SOURCE_IN_LOCATION #1173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 13 additions & 10 deletions src/main/java/de/mediathekview/mlib/filmlisten/FilmlisteLesen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.ResponseBody;
import org.apache.commons.lang3.time.FastDateFormat;
import org.tukaani.xz.XZInputStream;

import javax.swing.event.EventListenerList;
Expand All @@ -45,12 +44,16 @@
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Date;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.concurrent.TimeUnit;
import java.util.zip.ZipInputStream;

public class FilmlisteLesen {
private static final int PROGRESS_MAX = 100;
private static final ZoneId ZONE = ZoneId.of(ZoneId.SHORT_IDS.get("ECT"));
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yyyy, HH:mm");
private static WorkMode workMode = WorkMode.NORMAL; // die Klasse wird an verschiedenen Stellen benutzt, klappt sonst nicht immer, zB. FilmListe zu alt und neu laden
private final EventListenerList listeners = new EventListenerList();
private int max = 0;
Expand All @@ -71,7 +74,7 @@
listeners.add(ListenerFilmeLaden.class, listener);
}

private InputStream selectDecompressor(String source, InputStream in) throws Exception {
private InputStream selectDecompressor(String source, InputStream in) throws IOException {
if (source.endsWith(Const.FORMAT_XZ)) {
in = new XZInputStream(in);
} else if (source.endsWith(Const.FORMAT_ZIP)) {
Expand All @@ -84,7 +87,8 @@

private void readData(JsonParser jp, ListeFilme listeFilme) throws IOException {
JsonToken jsonToken;
String sender = "", thema = "";
String sender = "";
String thema = "";

if (jp.nextToken() != JsonToken.START_OBJECT) {
throw new IllegalStateException("Expected data to start with an Object");
Expand Down Expand Up @@ -130,8 +134,6 @@
}
if (DatenFilm.JSON_NAMES[i] == DatenFilm.FILM_NEU) {
final String value = jp.nextTextValue();
//This value is unused...
//datenFilm.arr[DatenFilm.FILM_NEU_NR] = value;
datenFilm.setNew(Boolean.parseBoolean(value));
} else {
datenFilm.arr[DatenFilm.JSON_NAMES[i]] = jp.nextTextValue();
Expand Down Expand Up @@ -174,13 +176,14 @@
private void processFromFile(String source, ListeFilme listeFilme) {
notifyProgress(source, PROGRESS_MAX);
try (InputStream in = selectDecompressor(source, new FileInputStream(source));
JsonParser jp = new JsonFactory().createParser(in)) {
JsonParser jp = new JsonFactory().createParser(in)
.configure(JsonParser.Feature.INCLUDE_SOURCE_IN_LOCATION, true)) {
readData(jp, listeFilme);
} catch (FileNotFoundException ex) {
} catch (FileNotFoundException _) {
Log.errorLog(894512369, "FilmListe existiert nicht: " + source);
listeFilme.clear();
} catch (Exception ex) {
Log.errorLog(945123641, ex, "FilmListe: " + source);

Check failure on line 186 in src/main/java/de/mediathekview/mlib/filmlisten/FilmlisteLesen.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Define a constant instead of duplicating this literal "FilmListe: " 3 times. 


See more on https://sonarcloud.io/project/issues?id=mediathekview_MServer&issues=AaCrj6fx02RK8yp-cX9k&open=AaCrj6fx02RK8yp-cX9k&pullRequest=1173
listeFilme.clear();
}
}
Expand Down Expand Up @@ -212,7 +215,7 @@
listeFilme.clear();
}
} catch (MalformedURLException ex) {
ex.printStackTrace();
Log.errorLog(945123642, ex, "FilmListe: " + source);
}

notifyFertig(source, listeFilme);
Expand Down Expand Up @@ -291,7 +294,7 @@
}

private void notifyFertig(String url, ListeFilme liste) {
Log.sysLog("Liste Filme gelesen am: " + FastDateFormat.getInstance("dd.MM.yyyy, HH:mm").format(new Date()));
Log.sysLog("Liste Filme gelesen am: " + LocalDateTime.now(ZONE).format(FORMATTER));
Log.sysLog(" erstellt am: " + liste.genDate());
Log.sysLog(" Anzahl Filme: " + liste.size());
for (ListenerFilmeLaden l : listeners.getListeners(ListenerFilmeLaden.class)) {
Expand Down
Loading