v2.9.2 proxy gyorsitas nelkul

diff --git a/server/-configuration/run-mediacube-server-hirtv.launch b/server/-configuration/run-mediacube-server-hirtv.launch
index 7da728a6e822403781c7b5af4dd177b0ac4668cf..3d90701c48f6d7a8db91c2bb508051bb76914257 100644 (file)
--- a/server/-configuration/run-mediacube-server-hirtv.launch
+++ b/server/-configuration/run-mediacube-server-hirtv.launch
@@ -12,6 +12,7 @@
     <intAttribute key="default_start_level" value="4"/>\r
     <setAttribute key="deselected_workspace_bundles"/>\r
     <booleanAttribute key="includeOptional" value="false"/>\r
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>\r
     <listAttribute key="org.eclipse.debug.ui.favoriteGroups">\r
         <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>\r
         <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>\r
@@ -38,7 +39,6 @@
         <setEntry value="com.microsoft.sqlserver.sqljdbc@default:default"/>\r
         <setEntry value="com.sun.jna@default:default"/>\r
         <setEntry value="groovy@default:default"/>\r
-        <setEntry value="hu.user.zk.theme.userdark@default:default"/>\r
         <setEntry value="javax.annotation-api@default:default"/>\r
         <setEntry value="javax.mail@default:default"/>\r
         <setEntry value="javax.servlet-api@default:default"/>\r
@@ -95,6 +95,7 @@
         <setEntry value="org.omnifaces@default:default"/>\r
         <setEntry value="slf4j.api@default:default"/>\r
         <setEntry value="slf4j.simple@default:false"/>\r
+        <setEntry value="user.theme.userdark@default:default"/>\r
     </setAttribute>\r
     <setAttribute key="selected_workspace_bundles">\r
         <setEntry value="user.commons.zk@default:default"/>\r

diff --git a/server/-dependencies/target/repository/category.xml b/server/-dependencies/target/repository/category.xml
deleted file mode 100644 (file)
index 9014ad5..0000000
--- a/server/-dependencies/target/repository/category.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ Copyright (c) 2020 Reficio (TM) - Reestablish your software! All Rights Reserved.
-  ~
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<site>
-    <category-def name="all" label="Maven osgi-bundles"/>
-    <iu>
-        <category name="all"/>
-        <query>
-            <expression type="match">providedCapabilities.exists(p | p.namespace == 'osgi.bundle')</expression>
-        </query>
-    </iu>
-</site>

diff --git a/server/-product/releases/v2.9.1.md b/server/-product/releases/v2.9.1.md
index 049efd7e032153c28b75d3a15ff6446300fb3f5b..c35375cc00cb6661050ca0ac383de942908d5278 100644 (file)
--- a/server/-product/releases/v2.9.1.md
+++ b/server/-product/releases/v2.9.1.md
@@ -1,3 +1,3 @@
 * DONE db migration v43\r
 * DONE mediacube.css bevezetese\r
-* DONE egysegesitett uzenetek, fix pozisioban\r
+* DONE egysegesitett uzenetek, fix pozicioban\r

diff --git a/server/-product/releases/v2.9.2.md b/server/-product/releases/v2.9.2.md
new file mode 100644 (file)
index 0000000..b347b95
--- /dev/null
+++ b/server/-product/releases/v2.9.2.md
@@ -0,0 +1,3 @@
+* DONE UserDark olvashatosag javitasok
+* DONE Login redirect javitasa
+* DONE HTV multi proxy gyorsitas (ForkMissingLowresStep)

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkMissingLowresStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkMissingLowresStep.java
index 4572dc87aadeeba5f5ee8e5e90764a5dbce46071..354fa91979f601913088a0acdc85a978a4fcab7d 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkMissingLowresStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ForkMissingLowresStep.java
@@ -21,18 +21,20 @@ import user.commons.nosql.NoSQLUtils;
 import user.jobengine.db.Media;\r
 import user.jobengine.db.MediaFile;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.scheduler.ScheduledJob;\r
 \r
 public class ForkMissingLowresStep extends JobStep {\r
        private static final String MISSING_LOWRES_COLLECTION = "missing_lowres_test";\r
-       private static final int MAX_ALLOWED_TRANSCODE = 4;\r
        private static final Logger logger = LogManager.getLogger();\r
-       private static final String CHILD_TEMPLATE = "cancelable.xml";\r
+       private static final String CHILD_TEMPLATE_FILTER = "sys-recreate-lowres";\r
+       private static final String[] CHILD_TEMPLATES = { "sys-recreate-lowres-71.xml", "sys-recreate-lowres-72.xml", "sys-recreate-lowres-73.xml",\r
+                       "sys-recreate-lowres-74.xml" };\r
 \r
        @StepEntry\r
        public Object[] execute(String localHiresPath) throws Exception {\r
 \r
-               int currentTranscodes = getExecutingTranscodeCount();\r
-               if (currentTranscodes == MAX_ALLOWED_TRANSCODE) {\r
+               List<IJob> currentJobs = getExecutingTranscodeJobs();\r
+               if (currentJobs.size() == CHILD_TEMPLATES.length) {\r
                        return null;\r
                }\r
 \r
@@ -55,9 +57,14 @@ public class ForkMissingLowresStep extends JobStep {
                                logger.info(getSessionMarker(), "Processing mediaID: {}", media.getId());\r
                                Map<String, Object> parameters = new HashMap<>();\r
 \r
-                               IJobRuntime child = getEngine().submit(CHILD_TEMPLATE, "Proxy pótlás", parameters);\r
-                               if (child == null)\r
-                                       throw new Exception("Submit error.");\r
+                               // TODO\r
+                               String firstAvailableTemplate = getAvailableTemplate();\r
+                               ScheduledJob scheduledJob = getEngine().getScheduledJob(firstAvailableTemplate);\r
+                               scheduledJob.doManualJob();\r
+\r
+//                             IJobRuntime child = getEngine().submit(firstAvailableTemplate, "Proxy pótlás", parameters);\r
+//                             if (child == null)\r
+//                                     throw new Exception("Submit error.");\r
 //                             child.setDescription(escortFileName);\r
 //                             child.setRelated(downloadable.getString("title") + "|" + targetStore.getName());\r
 \r
@@ -72,11 +79,16 @@ public class ForkMissingLowresStep extends JobStep {
                return null;\r
        }\r
 \r
-       private int getExecutingTranscodeCount() {\r
+       private String getAvailableTemplate() {\r
+               // TODO Auto-generated method stub\r
+               return null;\r
+       }\r
+\r
+       private List<IJob> getExecutingTranscodeJobs() {\r
                Map<Long, IJobRuntime> jobs = getEngine().getJobs();\r
-               List<IJob> transcodeJobs = jobs.values().stream().filter(j -> j.getTemplate().equals(CHILD_TEMPLATE) && !JobStatus.SUSPENDED.equals(j.getStatus()))\r
-                               .collect(Collectors.toList());\r
-               return transcodeJobs.size();\r
+               List<IJob> transcodeJobs = jobs.values().stream()\r
+                               .filter(j -> j.getTemplate().startsWith(CHILD_TEMPLATE_FILTER) && !JobStatus.SUSPENDED.equals(j.getStatus())).collect(Collectors.toList());\r
+               return transcodeJobs;\r
        }\r
 \r
        private List<Media> getUntranscodedMedias(DBCollection collection) {\r

diff --git a/server/user.mediacube.gui/resources/i3-label_hu.properties b/server/user.mediacube.gui/resources/i3-label_hu.properties
index 532ce66da1036e74c088dad844830f6a6ce36d1b..670dc75079f2c14ab8499402289b6d8c19ef6f57 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,4 @@
-version=2.9.1\r
+version=2.9.2\r
 \r
 footer=2016-2023 © Copyright User Rendszerház Kft.\r
 \r

diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/util/AuthInitiator.java b/server/user.mediacube.gui/src/user/jobengine/zk/util/AuthInitiator.java
index 6cbfa63a58e40a7309d0f965632c053058867943..4282cc541ec7081cd72dfe533305acf9dce098c7 100644 (file)
--- a/server/user.mediacube.gui/src/user/jobengine/zk/util/AuthInitiator.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/util/AuthInitiator.java
@@ -7,6 +7,7 @@ import java.util.Optional;
 import javax.servlet.http.Cookie;\r
 import javax.servlet.http.HttpServletRequest;\r
 \r
+import org.apache.commons.lang.StringUtils;\r
 import org.zkoss.zk.ui.Executions;\r
 import org.zkoss.zk.ui.Page;\r
 import org.zkoss.zk.ui.util.Initiator;\r
@@ -26,13 +27,17 @@ public class AuthInitiator implements Initiator {
                if (!SessionUtil.isAuthenticated()) {\r
 \r
                        Cookie[] cookies = request.getCookies();\r
-                       Optional<Cookie> clientTheme = Arrays.stream(cookies).filter(c -> "mediacube-theme".equals(c.getName())).findFirst();\r
-                       String theme = null;\r
-                       if (clientTheme.isPresent()) {\r
+                       Optional<Cookie> clientTheme = null;\r
+\r
+                       if (cookies != null) {\r
+                               clientTheme = Arrays.stream(cookies).filter(c -> "mediacube-theme".equals(c.getName())).findFirst();\r
+                       }\r
+\r
+                       String theme = SessionUtil.getMediaCubeConfig().getTheme() == null ? "silvertail" : SessionUtil.getMediaCubeConfig().getTheme();\r
+                       if (clientTheme != null && clientTheme.isPresent() && StringUtils.isNotBlank(clientTheme.get().getValue())) {\r
                                theme = clientTheme.get().getValue();\r
-                       } else {\r
-                               theme = SessionUtil.getMediaCubeConfig().getTheme() == null ? "silvertail" : SessionUtil.getMediaCubeConfig().getTheme();\r
                        }\r
+\r
                        SessionUtil.applyTheme(theme);\r
                        SessionUtil.redirect("/actions/login");\r
                }\r