From: elgekko Date: Thu, 1 Jun 2023 21:16:42 +0000 (+0200) Subject: v2.9.2 proxy gyorsitas nelkul X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=4a7ed97ac1a4be390d4bd144651cc846b306c72a;p=mediacube.git 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 7da728a6..3d90701c 100644 --- a/server/-configuration/run-mediacube-server-hirtv.launch +++ b/server/-configuration/run-mediacube-server-hirtv.launch @@ -12,6 +12,7 @@ + @@ -38,7 +39,6 @@ - @@ -95,6 +95,7 @@ + diff --git a/server/-dependencies/target/repository/category.xml b/server/-dependencies/target/repository/category.xml deleted file mode 100644 index 9014ad59..00000000 --- a/server/-dependencies/target/repository/category.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - providedCapabilities.exists(p | p.namespace == 'osgi.bundle') - - - diff --git a/server/-product/releases/v2.9.1.md b/server/-product/releases/v2.9.1.md index 049efd7e..c35375cc 100644 --- a/server/-product/releases/v2.9.1.md +++ b/server/-product/releases/v2.9.1.md @@ -1,3 +1,3 @@ * DONE db migration v43 * DONE mediacube.css bevezetese -* DONE egysegesitett uzenetek, fix pozisioban +* DONE egysegesitett uzenetek, fix pozicioban diff --git a/server/-product/releases/v2.9.2.md b/server/-product/releases/v2.9.2.md new file mode 100644 index 00000000..b347b958 --- /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 4572dc87..354fa919 100644 --- 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; import user.jobengine.db.MediaFile; import user.jobengine.server.IJobRuntime; +import user.jobengine.server.scheduler.ScheduledJob; public class ForkMissingLowresStep extends JobStep { private static final String MISSING_LOWRES_COLLECTION = "missing_lowres_test"; - private static final int MAX_ALLOWED_TRANSCODE = 4; private static final Logger logger = LogManager.getLogger(); - private static final String CHILD_TEMPLATE = "cancelable.xml"; + private static final String CHILD_TEMPLATE_FILTER = "sys-recreate-lowres"; + private static final String[] CHILD_TEMPLATES = { "sys-recreate-lowres-71.xml", "sys-recreate-lowres-72.xml", "sys-recreate-lowres-73.xml", + "sys-recreate-lowres-74.xml" }; @StepEntry public Object[] execute(String localHiresPath) throws Exception { - int currentTranscodes = getExecutingTranscodeCount(); - if (currentTranscodes == MAX_ALLOWED_TRANSCODE) { + List currentJobs = getExecutingTranscodeJobs(); + if (currentJobs.size() == CHILD_TEMPLATES.length) { return null; } @@ -55,9 +57,14 @@ public class ForkMissingLowresStep extends JobStep { logger.info(getSessionMarker(), "Processing mediaID: {}", media.getId()); Map parameters = new HashMap<>(); - IJobRuntime child = getEngine().submit(CHILD_TEMPLATE, "Proxy pótlás", parameters); - if (child == null) - throw new Exception("Submit error."); + // TODO + String firstAvailableTemplate = getAvailableTemplate(); + ScheduledJob scheduledJob = getEngine().getScheduledJob(firstAvailableTemplate); + scheduledJob.doManualJob(); + +// IJobRuntime child = getEngine().submit(firstAvailableTemplate, "Proxy pótlás", parameters); +// if (child == null) +// throw new Exception("Submit error."); // child.setDescription(escortFileName); // child.setRelated(downloadable.getString("title") + "|" + targetStore.getName()); @@ -72,11 +79,16 @@ public class ForkMissingLowresStep extends JobStep { return null; } - private int getExecutingTranscodeCount() { + private String getAvailableTemplate() { + // TODO Auto-generated method stub + return null; + } + + private List getExecutingTranscodeJobs() { Map jobs = getEngine().getJobs(); - List transcodeJobs = jobs.values().stream().filter(j -> j.getTemplate().equals(CHILD_TEMPLATE) && !JobStatus.SUSPENDED.equals(j.getStatus())) - .collect(Collectors.toList()); - return transcodeJobs.size(); + List transcodeJobs = jobs.values().stream() + .filter(j -> j.getTemplate().startsWith(CHILD_TEMPLATE_FILTER) && !JobStatus.SUSPENDED.equals(j.getStatus())).collect(Collectors.toList()); + return transcodeJobs; } private List getUntranscodedMedias(DBCollection collection) { diff --git a/server/user.mediacube.gui/resources/i3-label_hu.properties b/server/user.mediacube.gui/resources/i3-label_hu.properties index 532ce66d..670dc750 100644 --- 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 +version=2.9.2 footer=2016-2023 © Copyright User Rendszerház Kft. 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 6cbfa63a..4282cc54 100644 --- 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; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.StringUtils; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Page; import org.zkoss.zk.ui.util.Initiator; @@ -26,13 +27,17 @@ public class AuthInitiator implements Initiator { if (!SessionUtil.isAuthenticated()) { Cookie[] cookies = request.getCookies(); - Optional clientTheme = Arrays.stream(cookies).filter(c -> "mediacube-theme".equals(c.getName())).findFirst(); - String theme = null; - if (clientTheme.isPresent()) { + Optional clientTheme = null; + + if (cookies != null) { + clientTheme = Arrays.stream(cookies).filter(c -> "mediacube-theme".equals(c.getName())).findFirst(); + } + + String theme = SessionUtil.getMediaCubeConfig().getTheme() == null ? "silvertail" : SessionUtil.getMediaCubeConfig().getTheme(); + if (clientTheme != null && clientTheme.isPresent() && StringUtils.isNotBlank(clientTheme.get().getValue())) { theme = clientTheme.get().getValue(); - } else { - theme = SessionUtil.getMediaCubeConfig().getTheme() == null ? "silvertail" : SessionUtil.getMediaCubeConfig().getTheme(); } + SessionUtil.applyTheme(theme); SessionUtil.redirect("/actions/login"); }