From: vasary.daniel <TFS\vasary.daniel>
Date: Thu, 17 Jun 2021 13:22:53 +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=eed6ebc33e67cac952fb1b75a8f0abdc493cdf5a;p=mediacube.git

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

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java
index 0767e726..fa315174 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java
@@ -13,6 +13,7 @@ import user.commons.MediaCubeUndoMarker;
 import user.commons.nosql.NoSQLUtils;
 import user.jobengine.db.IItemManager;
 import user.jobengine.db.Media;
+import user.jobengine.db.MediaFile;
 import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;
 
@@ -56,24 +57,30 @@ public class CreateMissingLowresStep extends JobStep {
 
 	private Media getFirstUntranscodedMedia(IItemManager manager, DBCollection collection) {
 		Media[] result = new Media[] { null };
-		//MV
-		//String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS WHERE HOUSEID like 'M%' or HOUSEID like 'P%' or HOUSEID like 'R%' ORDER BY modified DESC";
+		// MV
+		String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS WHERE HOUSEID like 'M%' or HOUSEID like 'P%' or HOUSEID like 'R%' ORDER BY modified DESC";
 
-		//HTV
-		String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS";
+		// HTV
+		// String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS";
 		manager.executeQuery(query, rs -> {
 			try {
 				long mediaId = rs.getLong(1);
 				Media media = manager.getMedia(mediaId);
-				//a nevgeneralas miatt az eredeti MediaFilesName nem jo, a pontos nev kell nekunk
+				// a nevgeneralas miatt az eredeti MediaFilesName nem jo, a pontos nev kell
+				// nekunk
 				String name = media.getMediaFileRealName();
 				logger.info(getSessionMarker(), "Checking {}", name);
 				long existing = collection.find(new BasicDBObject("name", name)).count();
 				if (existing > 0) {
-					//logger.info(getSessionMarker(), "{} is on missing_lowres list", name);
+					// logger.info(getSessionMarker(), "{} is on missing_lowres list", name);
 					return true;
 				}
 
+				// 210617 proxy keszites tiltasa
+				MediaFile mf = manager.getSystemMediaFile(media);
+				if (mf.isDisableProxy())
+					return true;
+
 				result[0] = media;
 			} catch (Exception e) {
 				logger.error(e);
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java
index b1f2853c..6ac71d1b 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/steps/ArchiveItem.java
@@ -72,6 +72,7 @@ public class ArchiveItem implements Serializable {
 	private String mediaType;
 	private long duration;
 	private long existingMediaId;
+	private boolean disableProxy;
 
 	private BasicDBList tags;
 
@@ -181,4 +182,12 @@ public class ArchiveItem implements Serializable {
 		this.tags = tags;
 	}
 
+	public boolean isDisableProxy() {
+		return disableProxy;
+	}
+
+	public void setDisableProxy(boolean disableProxy) {
+		this.disableProxy = disableProxy;
+	}
+
 }
diff --git a/server/user.mediacube.gui/resources/i3-label_hu.properties b/server/user.mediacube.gui/resources/i3-label_hu.properties
index 0ce1e9e4..0cea4c1d 100644
--- a/server/user.mediacube.gui/resources/i3-label_hu.properties
+++ b/server/user.mediacube.gui/resources/i3-label_hu.properties
@@ -1,4 +1,5 @@
-version=2.7.4
+version=2.7.5
+#2.7.5 ArchiveItem disableProxy, MediaFile disableProxy
 footer=2016-2021 © Copyright User Rendszerház Kft.
 
 login_info=Információ