From 16d8cffe669425181d03f0f5bd962c5c37a3e3e2 Mon Sep 17 00:00:00 2001 From: JP Date: Tue, 20 Mar 2012 09:17:20 +0100 Subject: [PATCH] Convert Kijkwijzer characters to proper (Dutch) strings --- .../src/org/vanbest/xmltv/Main.java | 2 +- .../org/vanbest/xmltv/ProgrammeDetails.java | 5 +++- .../src/org/vanbest/xmltv/TvGids.java | 24 +++++++++++++-- .../src/org/vanbest/xmltv/XmlTvWriter.java | 30 ++++++++++++++++--- 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java b/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java index 6c86d09..1d7e554 100644 --- a/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java +++ b/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java @@ -180,7 +180,7 @@ public class Main { if (line.hasOption("o")) { this.outputWriter = new PrintStream( new FileOutputStream(line.getOptionValue("o"))); } - if (line.hasOption("o")) { + if (line.hasOption("l")) { config.logLevel = Integer.parseInt(line.getOptionValue("l")); } if (line.hasOption("h")) { diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java b/tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java index bbc5728..9e998dc 100644 --- a/tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java +++ b/tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java @@ -15,7 +15,10 @@ public class ProgrammeDetails implements Serializable { String acteursnamen_rolverdeling; String regisseur; String zender_id; - public boolean teletekst = false; + public boolean subtitle_teletekst = false; + public boolean stereo = false; + public boolean blacknwhite; + public boolean breedbeeld; public void fixup(Programme p, boolean quiet) { this.titel = org.apache.commons.lang.StringEscapeUtils.unescapeHtml(titel); diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java b/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java index bb53ea3..77466e6 100644 --- a/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java +++ b/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java @@ -238,12 +238,30 @@ public class TvGids { String value = m2.group(2); switch(key.toLowerCase()) { case "bijzonderheden": - if (value.toLowerCase().contains("teletekst")) { - p.details.teletekst = true; + if (value.toLowerCase().contains("subtitle_teletekst")) { + p.details.subtitle_teletekst = true; + } + if (value.toLowerCase().contains("breedbeeld")) { + p.details.breedbeeld = true; + } + if (value.toLowerCase().contains("zwart")) { + p.details.blacknwhite = true; + } + if (value.toLowerCase().contains("stereo")) { + p.details.stereo = true; } break; } - + Pattern kijkwijzerPattern = Pattern.compile("\"(.*?)\""); + Matcher m3 = kijkwijzerPattern.matcher(progInfo); + boolean first=true; + while (m3.find()) { + if (first) { + System.out.println(" (kijkwijzer): " + p.details.kijkwijzer); + first = false; + } + System.out.println(" kijkwijzer: " + m3.group(1)); + } } } diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java b/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java index 7cb9486..6363eb9 100644 --- a/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java +++ b/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java @@ -62,6 +62,11 @@ public class XmlTvWriter { * String highlight_content; * soort * artikel_id ??? + * p.details.subtitle_teletekst = true; + p.details.breedbeeld = true; + p.details.blacknwhite = true; + p.details.stereo = true; + */ public void writePrograms(Collection programs) throws XMLStreamException { DateFormat df = new SimpleDateFormat("yyyyMMddHHmmss Z"); @@ -133,16 +138,33 @@ public class XmlTvWriter { } writer.writeStartElement("category"); writer.writeAttribute("lang", "en"); - writer.writeCharacters(p.genre); // soort? FIXME translation to mythtv categories + writer.writeCharacters(p.genre); writer.writeEndElement(); writeln(); if (p.details.kijkwijzer != null && !p.details.kijkwijzer.isEmpty()) { writer.writeStartElement("rating"); writer.writeAttribute("system", "kijkwijzer"); - writer.writeStartElement("value"); - writer.writeCharacters(p.details.kijkwijzer); - writer.writeEndElement(); + for (int i=0; i