Skip to content

Commit

Permalink
Mergekonflikt behoben.
Browse files Browse the repository at this point in the history
  • Loading branch information
@alex1702
alex1702 committed Feb 21, 2017
2 parents 9bd4750 + 2e7d743 commit 44d4baa
Show file tree
Hide file tree
Showing 14 changed files with 204 additions and 14 deletions.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ dist/javadoc

nbproject
.nb-gradle
test/

*.class
*.zip
Expand Down
9 changes: 7 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
sourceCompatibility = 1.8
targetCompatibility = 1.8
group = 'de.mediathekview'
version = '2.6.2'
version = '2.7.0'

def jarName = 'MServer.jar'
def mainClass = 'mServer.Main'
Expand All @@ -34,6 +34,10 @@ repositories {
}
}

test {
exclude '**/*PerformanceTest.class'
}

dependencies {
compile 'de.mediathekview:MSearch:2.2.0'
compile 'commons-net:commons-net:3.5'
Expand All @@ -44,7 +48,8 @@ dependencies {
compile 'com.sun.jersey:jersey-client:1.8'

compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.7'

compile group: 'fm.void.jetm', name: 'jetm', version: '1.2.3'
compile group: 'junit', name: 'junit', version: '4.12'
}

ext {
Expand Down
14 changes: 13 additions & 1 deletion src/main/java/mServer/crawler/AddToFilmlist.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.concurrent.atomic.AtomicInteger;

import etm.core.configuration.EtmManager;
import etm.core.monitor.EtmMonitor;
import etm.core.monitor.EtmPoint;
import mSearch.Config;
import mSearch.daten.DatenFilm;
import mSearch.daten.ListeFilme;
Expand All @@ -22,7 +26,7 @@
* @author emil
*/
public class AddToFilmlist {

private static final EtmMonitor etmMonitor = EtmManager.getEtmMonitor();
AtomicInteger threadCounter = new AtomicInteger(0);
AtomicInteger treffer = new AtomicInteger(0);
ListeFilme vonListe;
Expand All @@ -35,6 +39,7 @@ public AddToFilmlist(ListeFilme vonListe, ListeFilme listeEinsortieren) {
}

public synchronized void addLiveStream() {
EtmPoint performancePoint = etmMonitor.createPoint("AddToFilmlist:addLiveStream");
// live-streams einfügen, es werde die vorhandenen ersetzt!

if (listeEinsortieren.size() <= 0) {
Expand All @@ -50,6 +55,7 @@ public synchronized void addLiveStream() {
}
}
listeEinsortieren.forEach(vonListe::add);
performancePoint.collect();
}

public synchronized int addOldList() {
Expand All @@ -64,9 +70,11 @@ public synchronized int addOldList() {

// ==============================================
// nach "Thema-Titel" suchen
EtmPoint performancePointThemaTitel = etmMonitor.createPoint("AddToFilmlist:addOldList#themaTitel");
vonListe.stream().forEach((f) -> hash.add(f.getIndexAddOld()));
listeEinsortieren.removeIf((f) -> hash.contains(f.getIndexAddOld()));
hash.clear();
performancePointThemaTitel.collect();

Log.sysLog("===== Liste einsortieren Hash =====");
Log.sysLog("Liste einsortieren, Anzahl: " + size);
Expand All @@ -77,9 +85,11 @@ public synchronized int addOldList() {

// ==============================================
// nach "URL" suchen
EtmPoint performancePointUrlSuchen = etmMonitor.createPoint("AddToFilmlist:addOldList#UrlSuchen");
vonListe.stream().forEach((f) -> hash.add(DatenFilm.getUrl(f)));
listeEinsortieren.removeIf((f) -> hash.contains(DatenFilm.getUrl(f)));
hash.clear();
performancePointUrlSuchen.collect();

Log.sysLog("===== Liste einsortieren URL =====");
Log.sysLog("Liste einsortieren, Anzahl: " + size);
Expand Down Expand Up @@ -143,13 +153,15 @@ public AddOld(ListeFilme listeOld) {

@Override
public void run() {
EtmPoint performancePoint = etmMonitor.createPoint("AddOld:run");
while (!stopOld && (film = popOld(listeOld)) != null) {
long size = FileSize.laengeLong(film.arr[DatenFilm.FILM_URL]);
if (size > MIN_SIZE_ADD_OLD) {
addOld(film);
}
}
threadCounter.decrementAndGet();
performancePoint.collect();
}
}

Expand Down
1 change: 0 additions & 1 deletion src/main/java/mServer/crawler/CrawlerTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ public static void setGeo(DatenFilm film) {
film.arr[DatenFilm.FILM_GEO] = DatenFilm.GEO_DE;
}
break;
case Const.ZDF:
case Const.ZDF_TIVI:
case Const.DREISAT:
if (film.arr[DatenFilm.FILM_URL].startsWith("http://rodl.zdf.de/de/") ||
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/mServer/crawler/sender/MediathekZdf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.Collection;
import java.util.concurrent.*;
import mServer.crawler.sender.newsearch.DownloadDTO;
import mServer.crawler.sender.newsearch.GeoLocations;
import mServer.crawler.sender.newsearch.Qualities;
import mServer.crawler.sender.newsearch.VideoDTO;
import mServer.crawler.sender.newsearch.ZDFSearchTask;
Expand Down Expand Up @@ -109,7 +110,10 @@ protected void compute() {
if (!download.getSubTitleUrl().isEmpty())
{
CrawlerTool.addUrlSubtitle(film, download.getSubTitleUrl());
}
}
if(download.getGeoLocation() != GeoLocations.GEO_NONE) {
film.arr[DatenFilm.FILM_GEO] = download.getGeoLocation().getDescription();
}
} catch (Exception ex) {
Log.errorLog(496583211, ex, "add film failed: " + video.getWebsiteUrl());
}
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/mServer/crawler/sender/newsearch/DownloadDTO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/
public class DownloadDTO {

private GeoLocations geoLocation;
private String subTitleUrl;
private final HashMap<Qualities, String> downloadUrls;

Expand All @@ -26,6 +27,17 @@ public String getUrl(Qualities quality) {
return url;
}

public GeoLocations getGeoLocation() {
if(geoLocation == null) {
return GeoLocations.GEO_NONE;
}
return geoLocation;
}

public void setGeoLocation(GeoLocations aGeoLocation) {
geoLocation = aGeoLocation;
}

public String getSubTitleUrl() {
if(subTitleUrl == null) {
return "";
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/mServer/crawler/sender/newsearch/GeoLocations.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
*/
public enum GeoLocations
{
GEO_DE("DE"), // nur in .. zu sehen
GEO_NONE(""), // nur in .. zu sehen
GEO_DE("DE"),
GEO_AT("AT"),
GEO_CH("CH"),
GEO_EU("EU"),
GEO_WELT("WELT");
GEO_WELT("WELT"),
GEO_DE_AT_CH("DE-AT-CH"),
GEO_DE_AT_CH_EU("DE-AT-CH-EU");

private final String description;

Expand Down
32 changes: 32 additions & 0 deletions src/main/java/mServer/crawler/sender/newsearch/ZDFDownloadDTODeserializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,24 @@
*/
public class ZDFDownloadDTODeserializer implements JsonDeserializer<DownloadDTO> {

private static final String JSON_ELEMENT_ATTRIBUTES = "attributes";
private static final String JSON_ELEMENT_AUDIO = "audio";
private static final String JSON_ELEMENT_CAPTIONS ="captions";
private static final String JSON_ELEMENT_FORMITAET = "formitaeten";
private static final String JSON_ELEMENT_GEOLOCATION = "geoLocation";
private static final String JSON_ELEMENT_HD = "hd";
private static final String JSON_ELEMENT_MIMETYPE = "mimeType";
private static final String JSON_ELEMENT_PRIORITYLIST = "priorityList";
private static final String JSON_ELEMENT_QUALITIES = "qualities";
private static final String JSON_ELEMENT_QUALITY = "quality";
private static final String JSON_ELEMENT_TRACKS = "tracks";
private static final String JSON_ELEMENT_URI = "uri";

private static final String JSON_PROPERTY_VALUE = "value";

private static final String GEO_LOCATION_DACH = "dach";
private static final String GEO_LOCATION_DE = "de";
private static final String GEO_LOCATION_EBU = "ebu";

private static final String RELEVANT_MIME_TYPE = "video/mp4";
private static final String RELEVANT_SUBTITLE_TYPE = ".xml";
Expand All @@ -33,6 +41,7 @@ public DownloadDTO deserialize(final JsonElement aJsonElement, final Type aTypeO

parseVideoUrls(dto, rootNode);
parseSubtitle(dto, rootNode);
parseGeoLocation(dto, rootNode);

return dto;
} catch (Exception ex) {
Expand All @@ -42,6 +51,29 @@ public DownloadDTO deserialize(final JsonElement aJsonElement, final Type aTypeO
return null;
}

private void parseGeoLocation(DownloadDTO dto, JsonObject rootNode) {
JsonElement attributes = rootNode.get(JSON_ELEMENT_ATTRIBUTES);
if(attributes != null) {
JsonElement geoLocation = attributes.getAsJsonObject().get(JSON_ELEMENT_GEOLOCATION);
if(geoLocation != null) {
JsonElement geoValue = geoLocation.getAsJsonObject().get(JSON_PROPERTY_VALUE);
if(geoValue != null) {
switch(geoValue.getAsString()) {
case GEO_LOCATION_DACH:
dto.setGeoLocation(GeoLocations.GEO_DE_AT_CH);
break;
case GEO_LOCATION_DE:
dto.setGeoLocation(GeoLocations.GEO_DE);
break;
case GEO_LOCATION_EBU:
dto.setGeoLocation(GeoLocations.GEO_DE_AT_CH_EU);
break;
}
}
}
}
}

private void parseVideoUrls(DownloadDTO dto, JsonObject rootNode) {
// array priorityList
JsonArray priorityList = rootNode.getAsJsonArray(JSON_ELEMENT_PRIORITYLIST);
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/mServer/tool/MserverDaten.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@

import java.io.File;

import etm.core.configuration.EtmManager;
import etm.core.monitor.EtmMonitor;
import etm.core.monitor.EtmPoint;
import mSearch.Const;
import mSearch.tool.Functions;
import mServer.daten.MserverListeSuchen;
import mServer.daten.MserverListeUpload;

public class MserverDaten {

private static final EtmMonitor etmMonitor = EtmManager.getEtmMonitor();
public static String[] system = new String[MserverKonstanten.SYSTEM_MAX_ELEM];
public static MserverListeSuchen listeSuchen = new MserverListeSuchen();
public static MserverListeUpload listeUpload = new MserverListeUpload();
Expand All @@ -37,14 +40,16 @@ public class MserverDaten {
private static String basisverzeichnis = "";

public static void init() {
EtmPoint performancePoint = etmMonitor.createPoint("MserverDaten:init");

listeSuchen = new MserverListeSuchen();
listeUpload = new MserverListeUpload();
debug = false;
restart = false;
for (int i = 0; i < system.length; ++i) {
system[i] = "";
}

performancePoint.collect();
}

public static String getUserAgent() {
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/mServer/tool/MserverXmlLesen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,23 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;

import etm.core.configuration.EtmManager;
import etm.core.monitor.EtmMonitor;
import etm.core.monitor.EtmPoint;
import mSearch.Const;
import mServer.daten.MserverDatenUpload;
import mServer.daten.MserverSearchTask;

public class MserverXmlLesen {

private static final EtmMonitor etmMonitor = EtmManager.getEtmMonitor();
public static void xmlDatenLesen() {
xmlDatenLesen(MserverDaten.getKonfigDatei());
xmlDatenLesen(MserverDaten.getUploadDatei());
}

public static void xmlDatenLesen(String datei) {
EtmPoint performancePoint = etmMonitor.createPoint("MserverXmlLesen:xmlDatenLesen");
try {
if (new File(datei).exists()) {
//nur wenn die Datei schon existiert
Expand Down Expand Up @@ -70,6 +75,7 @@ public static void xmlDatenLesen(String datei) {
} catch (Exception ex) {
MserverLog.fehlerMeldung(909078531, MserverXmlLesen.class.getName(), "xmlDatenLesen", ex);
} finally {
performancePoint.collect();
}
}

Expand All @@ -78,6 +84,7 @@ private static boolean get(XMLStreamReader parser, int event, String xmlElem, St
}

private static boolean get(XMLStreamReader parser, int event, String xmlElem, String[] xmlNames, String[] strRet, boolean log) {
EtmPoint performancePoint = etmMonitor.createPoint("MserverXmlLesen:get");
boolean ret = true;
int maxElem = strRet.length;
for (int i = 0; i < maxElem; ++i) {
Expand Down Expand Up @@ -109,6 +116,7 @@ private static boolean get(XMLStreamReader parser, int event, String xmlElem, St
MserverLog.fehlerMeldung(201456980, MserverXmlLesen.class.getName(), "get", ex);
}
}
performancePoint.collect();
return ret;
}
}
10 changes: 9 additions & 1 deletion src/main/java/mServer/tool/MserverXmlSchreiben.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,22 @@
import java.io.OutputStreamWriter;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamWriter;

import etm.core.configuration.EtmManager;
import etm.core.monitor.EtmMonitor;
import etm.core.monitor.EtmPoint;
import mSearch.Const;
import mServer.daten.MserverDatenUpload;
import mServer.daten.MserverSearchTask;

public class MserverXmlSchreiben {

private static final EtmMonitor etmMonitor = EtmManager.getEtmMonitor();
private static XMLOutputFactory outFactory;
private static XMLStreamWriter writer;
private static OutputStreamWriter out = null;

public static void xmlMusterDatenSchreiben() {
EtmPoint performancePoint = etmMonitor.createPoint("MserverXmlSchreiben:xmlMusterDatenSchreiben");
try {
String datei = MserverDaten.getKonfigDatei() + "_Muster";
MserverLog.systemMeldung("Daten Schreiben");
Expand All @@ -60,9 +65,11 @@ public static void xmlMusterDatenSchreiben() {
} catch (Exception ex) {
MserverLog.fehlerMeldung(645421039, MserverXmlSchreiben.class.getName(), "xmlDatenSchreiben", ex);
}
performancePoint.collect();
}

private static void xmlSchreibenDaten(String xmlName, String[] xmlSpalten, String[] datenArray) {
EtmPoint performancePoint = etmMonitor.createPoint("MserverXmlSchreiben:xmlSchreibenDaten");
int xmlMax = datenArray.length;
try {
writer.writeStartElement(xmlName);
Expand All @@ -79,5 +86,6 @@ private static void xmlSchreibenDaten(String xmlName, String[] xmlSpalten, Strin
} catch (Exception ex) {
MserverLog.fehlerMeldung(102365897, MserverLog.class.getName(), "xmlSchreibenDaten", ex);
}
performancePoint.collect();
}
}
2 changes: 0 additions & 2 deletions src/main/resources/version.properties
View file

This file was deleted.

Loading

0 comments on commit 44d4baa

Please sign in to comment.