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

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 0767e726c2fefd0022b52c16da32196cee81bef5..fa3151744e6f50767e9c4d2a145646999127a3c8 100644 (file)
--- 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;\r
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.Media;\r
+import user.jobengine.db.MediaFile;\r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
 \r
@@ -56,24 +57,30 @@ public class CreateMissingLowresStep extends JobStep {
 \r
        private Media getFirstUntranscodedMedia(IItemManager manager, DBCollection collection) {\r
                Media[] result = new Media[] { null };\r
-               //MV\r
-               //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";\r
+               // MV\r
+               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";\r
 \r
-               //HTV\r
-               String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS";\r
+               // HTV\r
+               // String query = "SELECT mediaid FROM VW_MISSING_PROXY_IDS";\r
                manager.executeQuery(query, rs -> {\r
                        try {\r
                                long mediaId = rs.getLong(1);\r
                                Media media = manager.getMedia(mediaId);\r
-                               //a nevgeneralas miatt az eredeti MediaFilesName nem jo, a pontos nev kell nekunk\r
+                               // a nevgeneralas miatt az eredeti MediaFilesName nem jo, a pontos nev kell\r
+                               // nekunk\r
                                String name = media.getMediaFileRealName();\r
                                logger.info(getSessionMarker(), "Checking {}", name);\r
                                long existing = collection.find(new BasicDBObject("name", name)).count();\r
                                if (existing > 0) {\r
-                                       //logger.info(getSessionMarker(), "{} is on missing_lowres list", name);\r
+                                       // logger.info(getSessionMarker(), "{} is on missing_lowres list", name);\r
                                        return true;\r
                                }\r
 \r
+                               // 210617 proxy keszites tiltasa\r
+                               MediaFile mf = manager.getSystemMediaFile(media);\r
+                               if (mf.isDisableProxy())\r
+                                       return true;\r
+\r
                                result[0] = media;\r
                        } catch (Exception e) {\r
                                logger.error(e);\r

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 b1f2853c2a1a6cd331ca6cd38af639dcdca1818e..6ac71d1b1296af2db860a81fd3aabed7f59ae857 100644 (file)
--- 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;\r
        private long duration;\r
        private long existingMediaId;\r
+       private boolean disableProxy;\r
 \r
        private BasicDBList tags;\r
 \r
@@ -181,4 +182,12 @@ public class ArchiveItem implements Serializable {
                this.tags = tags;\r
        }\r
 \r
+       public boolean isDisableProxy() {\r
+               return disableProxy;\r
+       }\r
+\r
+       public void setDisableProxy(boolean disableProxy) {\r
+               this.disableProxy = disableProxy;\r
+       }\r
+\r
 }\r

diff --git a/server/user.mediacube.gui/resources/i3-label_hu.properties b/server/user.mediacube.gui/resources/i3-label_hu.properties
index 0ce1e9e4f6468a92f89048a7beebaf9a93297c0c..0cea4c1d76d2b16f74ee14fb83da672c2c0b93f3 100644 (file)
--- 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\r
+version=2.7.5\r
+#2.7.5 ArchiveItem disableProxy, MediaFile disableProxy\r
 footer=2016-2021 © Copyright User Rendszerház Kft.\r
 \r
 login_info=Információ\r