From: vasary.daniel <TFS\vasary.daniel>
Date: Fri, 4 Jun 2021 15:05:27 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=4734bbdd33fce11cb7fd6496702a4bc921e94a28;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32261
---

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java
index 70cfd1ed..a550521c 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java
@@ -34,6 +34,8 @@ import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HTTP;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.MarkerManager;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -63,6 +65,7 @@ public class PBQuery {
 	}
 
 	private static final Logger logger = LogManager.getLogger();
+	private Marker subtitleMarker = MarkerManager.getMarker("MISSING-SUBTITLE");
 	private static final int CONNECTION_TIMEOUT = 5000;
 	private static final int SOCKET_TIMEOUT = 5000;
 	public static final String GETMEDIAUSAGEBYUTRANGE = "/getMediaUsageByUTRange";
@@ -111,7 +114,7 @@ public class PBQuery {
 
 		TreeMap<String, MMMedia> sortedUsages = new TreeMap<>();
 		for (MMMedia m : result.values()) {
-			//a TreeMap lehetove teszi: nincs duplikatum + a korabbi musorok elore kerulnek
+			// a TreeMap lehetove teszi: nincs duplikatum + a korabbi musorok elore kerulnek
 			sortedUsages.put(m.getUsage() + "." + m.getName(), m);
 		}
 
@@ -125,8 +128,8 @@ public class PBQuery {
 		return Paths.get(configDir, viewName);
 	}
 
-	public void init(String primaryEndPoint, String primaryUserName, String primaryPassword, String secondaryEndPoint, String secondaryUserName,
-			String secondaryPassword, int rangeForwardHours) throws Exception {
+	public void init(String primaryEndPoint, String primaryUserName, String primaryPassword, String secondaryEndPoint,
+			String secondaryUserName, String secondaryPassword, int rangeForwardHours) throws Exception {
 		this.primaryEndPoint = primaryEndPoint;
 		this.primaryUserName = primaryUserName;
 		this.primaryPassword = primaryPassword;
@@ -139,7 +142,7 @@ public class PBQuery {
 	private void putEarliest(Map<String, MMMedia> result, String mediaName, String usageTime) {
 		if (result.containsKey(mediaName)) {
 			MMMedia m = result.get(mediaName);
-			//az aktualis a korabbi idopont
+			// az aktualis a korabbi idopont
 			if (usageTime.compareTo(m.getUsage()) < 0)
 				result.put(mediaName, new MMMedia(mediaName, usageTime));
 		} else
@@ -152,28 +155,30 @@ public class PBQuery {
 		HttpConnectionParams.setConnectionTimeout(httpParameters, CONNECTION_TIMEOUT);
 		HttpConnectionParams.setSoTimeout(httpParameters, SOCKET_TIMEOUT);
 		DefaultHttpClient httpclient = new DefaultHttpClient(httpParameters);
-		//http://10.170.100.61:18083
+		// http://10.170.100.61:18083
 
 		String result = null;
 		DataInputStream is = null;
 		try {
 			URL url = new URL(endPoint);
-			httpclient.getCredentialsProvider()
-					.setCredentials(new AuthScope(url.getHost(), url.getPort(), null, "Digest"), new UsernamePasswordCredentials(user, pwd));
+			httpclient.getCredentialsProvider().setCredentials(
+					new AuthScope(url.getHost(), url.getPort(), null, "Digest"),
+					new UsernamePasswordCredentials(user, pwd));
 
 			HttpPost httppost = new HttpPost(url.toURI());
 			httppost.setHeader("soapaction", action);
-			//Content-Type	application/soap+xml; charset=utf-8; action="/getMediaUsageByUTRange"
+			// Content-Type application/soap+xml; charset=utf-8;
+			// action="/getMediaUsageByUTRange"
 			httppost.setHeader("Content-Type", "text/xml; charset=utf-8");
 			HttpEntity entity = new StringEntity(soap.toString(), HTTP.UTF_8);
 			httppost.setEntity(entity);
 			logger.info("Executing call {}", action);
 			HttpResponse response = httpclient.execute(httppost);// calling server
-			HttpEntity r_entity = response.getEntity(); //get response
-			//			Header[] headers = response.getAllHeaders();
-			//			for (Header h : headers) {
-			//				logger.info("Reponse Header", h.getName() + ": " + h.getValue());
-			//			}
+			HttpEntity r_entity = response.getEntity(); // get response
+			// Header[] headers = response.getAllHeaders();
+			// for (Header h : headers) {
+			// logger.info("Reponse Header", h.getName() + ": " + h.getValue());
+			// }
 			if (r_entity != null) {
 				byte[] bytes = new byte[(int) r_entity.getContentLength()];
 				if (r_entity.isStreaming()) {
@@ -233,10 +238,13 @@ public class PBQuery {
 			Node mediaNode = mediaNodes.item(i);
 			String mediaName = getAttribute(mediaNode, "mediaName");
 			if (StringUtils.isBlank(mediaName)) {
-				logger.info("Missing mediaName");
 				continue;
 			}
 
+			String usageType = getAttribute(mediaNode, "UsageType");
+			if (!"PrimaryVideo".equals(usageType) && !"Live".equals(usageType))
+				logger.info(subtitleMarker, "queryOtherMedias: {}, {}", usageType, mediaName);
+
 			if (poolContent.contains(mediaName))
 				continue;
 
@@ -295,14 +303,14 @@ public class PBQuery {
 			Node mediaNode = mediaNodes.item(i);
 			String mediaName = getAttribute(mediaNode, "mediaName");
 			String mediaType = getAttribute(mediaNode, "mediaType");
-			if (StringUtils.isBlank(mediaName)) {
-				logger.info("Missing mediaName");
+			if (StringUtils.isBlank(mediaName))
 				continue;
-			}
 
-			if (!StringUtils.equals("Video", mediaType)) {
+			if (!StringUtils.equals("Subtitle", mediaType))
+				logger.info(subtitleMarker, "querySortableMedias: {}", mediaName);
+
+			if (!StringUtils.equals("Video", mediaType))
 				continue;
-			}
 
 			if (poolContent.contains(mediaName))
 				continue;
diff --git a/server/user.mediacube.gui/WEB-INF/web.xml b/server/user.mediacube.gui/WEB-INF/web.xml
index 867e1ac4..7d84e06c 100644
--- a/server/user.mediacube.gui/WEB-INF/web.xml
+++ b/server/user.mediacube.gui/WEB-INF/web.xml
@@ -68,7 +68,6 @@
 
 
 <!-- Enable http to https redirect 
--->	
 	<security-constraint>
 		<web-resource-collection>
 			<web-resource-name>Everything on the app</web-resource-name>
@@ -78,4 +77,5 @@
 			<transport-guarantee>CONFIDENTIAL</transport-guarantee>
 		</user-data-constraint>
 	</security-constraint>
+-->	
 </web-app>