Config changes
authorVásáry Dániel <vasary@elgekko.net>
Thu, 11 Apr 2024 11:45:45 +0000 (13:45 +0200)
committerVásáry Dániel <vasary@elgekko.net>
Thu, 11 Apr 2024 11:45:45 +0000 (13:45 +0200)
server/-product/production/HIRTV/settings/application.yaml
server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/ComponentBinder.java
server/user.mediacube.gui/.classpath
server/user.mediacube.gui/META-INF/MANIFEST.MF
server/user.mediacube.gui/build.properties
server/user.mediacube.gui/lib/userdark-1.0.0.jar
server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java

index e4630077d5abc8e70bfd164dc7511652fa3d1cd7..5cbbead0f1955bb8a07066bd4a410c9b7ed973f9 100644 (file)
@@ -21,7 +21,7 @@ services:
    ffmpeg:\r
       execurable-location: /opt/ffmpeg/ffmpeg \r
    mediacube:\r
-      proxy-root: /mediacube/data/lowres/www/video\r
+      proxy-root: /temp\r
    nexio:\r
       host: 10.10.1.55\r
       collection-name: nexioclips\r
index ce6e54f4faa5b1bcfad35c1e9ce2a75b6d53491b..fee480dfaa577a0cd5a14dd126e288e3a9958aa1 100644 (file)
@@ -24,26 +24,30 @@ public class ComponentBinder {
        private static IConfiguration systemConfig;\r
 \r
        public static IItemManager getItemManager() {\r
-               if (itemManager == null)\r
+               if (itemManager == null) {\r
                        throw new RuntimeException("IItemManager is null");\r
+               }\r
                return itemManager;\r
        }\r
 \r
        public static IJobEngine getJobengine() {\r
-               if (jobengine == null)\r
+               if (jobengine == null) {\r
                        throw new RuntimeException("IJobEngine is null");\r
+               }\r
                return jobengine;\r
        }\r
 \r
        public static INexioAPI getNexioAPI() {\r
-               if (nexioAPI == null)\r
+               if (nexioAPI == null) {\r
                        throw new RuntimeException("INexioAPI is null");\r
+               }\r
                return nexioAPI;\r
        }\r
 \r
        public static IOctopusAPI getOctopusAPI() {\r
-               if (octopusAPI == null)\r
+               if (octopusAPI == null) {\r
                        throw new RuntimeException("IOctopusAPI is null");\r
+               }\r
                return octopusAPI;\r
        }\r
 \r
@@ -52,7 +56,7 @@ public class ComponentBinder {
        }\r
 \r
        public synchronized void bindService(Object service) {\r
-               //logger.info("Ref {}", service.getClass());\r
+               // logger.info("Ref {}", service.getClass());\r
 \r
                if (service instanceof IJobEngine) {\r
                        jobengine = (IJobEngine) service;\r
@@ -96,10 +100,10 @@ public class ComponentBinder {
                }\r
 \r
                logger.info(MarkerManager.getMarker(MEDIACUBE), "A MediaCube server elindult.");\r
-               //              Marker m = MarkerManager.getMarker("MEDIACUBE_DAILY");\r
-               //              for (int i = 0; i < 10; i++) {\r
-               //                      logger.info(m, "Burst teszt " + i);\r
-               //              }\r
+               // Marker m = MarkerManager.getMarker("MEDIACUBE_DAILY");\r
+               // for (int i = 0; i < 10; i++) {\r
+               // logger.info(m, "Burst teszt " + i);\r
+               // }\r
        }\r
 \r
        public synchronized void unbindService(Object service) {\r
index 0a6e3a46adccf4350c201a9c98c3443d43e16d9e..619e72b0dd9a99227148eca8408104e7eb805635 100644 (file)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <classpath>\r
+       <classpathentry exported="true" kind="lib" path="lib/userdark-1.0.0.jar"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src"/>\r
index 9d7555f08544acc955d42d0b8b5773eff24fd918..58be0aa89e1323590b240c1a64f89b4ef58524c5 100644 (file)
@@ -11,9 +11,11 @@ Require-Bundle: user.jobengine.osgi.db;bundle-version="1.0.0",
  user.commons.zk;bundle-version="1.0.0",
  org.apache.servicemix.bundles.quartz;bundle-version="2.3.0",
  user.jobengine.osgi.server
-Export-Package: user.jobengine.gui
+Export-Package: org.zkoss.theme.userdark,
+ user.jobengine.gui
 DynamicImport-Package: *
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ lib/userdark-1.0.0.jar
 Bundle-ActivationPolicy: lazy
 Web-ContextPath: /
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
index d63ad93d0711ad551d444900485959ff6d44ca57..84487e0a7bcc2b5882ca63fc08c96a14efd37958 100644 (file)
@@ -11,5 +11,6 @@ bin.includes = .,\
                img/,\\r
                js/,\\r
                resources/,\\r
-               lib/\r
+               lib/,\\r
+               lib/userdark-1.0.0.jar\r
 src.includes = .,WEB-INF/,index.zul,pages/,css/,img/,js/,resources/\r
index 956a232acdcdb22fe77908541300abc358f54aa0..2cb1b7c6b45faa3172c07ea4fd1a0b30ff39445c 100644 (file)
Binary files a/server/user.mediacube.gui/lib/userdark-1.0.0.jar and b/server/user.mediacube.gui/lib/userdark-1.0.0.jar differ
index 3c620e7cb9417bdfcc1c3940c1d03fc5c17979a9..457ba0b24b442b2c33483e023b990fd2d9f58742 100644 (file)
@@ -25,7 +25,6 @@ import org.apache.commons.lang.time.DurationFormatUtils;
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
 import org.zkoss.bind.BindContext;\r
-import org.zkoss.bind.ValidationContext;\r
 import org.zkoss.bind.Validator;\r
 import org.zkoss.bind.annotation.AfterCompose;\r
 import org.zkoss.bind.annotation.BindingParam;\r
@@ -111,7 +110,7 @@ public class GridSearchModel extends AsyncBaseModel {
        private boolean itemSelected;\r
        private int descLength;\r
        private Map<String, Long> tags = null;\r
-       private List<Long> searchTags = new ArrayList<Long>();\r
+       private List<Long> searchTags = new ArrayList<>();\r
        protected IItemManager itemManager = null;\r
        private Map<ArchivedMedia, ListModelList<ArchivedMedia>> groupItemDetails = new HashMap<>();\r
 \r
@@ -160,7 +159,7 @@ public class GridSearchModel extends AsyncBaseModel {
        private Instant startSearch;\r
 \r
        public GridSearchModel() {\r
-               this.itemManager = ItemManager.getInstance();\r
+               itemManager = ItemManager.getInstance();\r
 \r
                typeFilters = new LinkedHashMap<>();\r
                MediaCubeConfig mediaCubeConfig = SessionUtil.getMediaCubeConfig();\r
@@ -174,34 +173,28 @@ public class GridSearchModel extends AsyncBaseModel {
                columnHeaders.put("Fájlnév", "mediafilehouseid");\r
                columnHeaders.put("Archiválva", "archived");\r
 \r
-               allFilterCheckedValidator = new Validator() {\r
-                       @Override\r
-                       public void validate(ValidationContext ctx) {\r
-                               try {\r
+               allFilterCheckedValidator = ctx -> {\r
+                       try {\r
 \r
-                                       TypeFilter typeFilter = (TypeFilter) ctx.getProperty().getBase();\r
-                                       boolean isChecked = (boolean) ctx.getProperty().getValue();\r
-                                       typeFilter.setChecked(isChecked);\r
-                                       // logger.info("{} {}", label, isChecked);\r
-                               } catch (Exception e) {\r
+                               TypeFilter typeFilter = (TypeFilter) ctx.getProperty().getBase();\r
+                               boolean isChecked = (boolean) ctx.getProperty().getValue();\r
+                               typeFilter.setChecked(isChecked);\r
+                               // logger.info("{} {}", label, isChecked);\r
+                       } catch (Exception e) {\r
 \r
-                               }\r
-                               updateAllChecked();\r
                        }\r
+                       updateAllChecked();\r
                };\r
 \r
-               itemSelectedValidator = new Validator() {\r
-                       @Override\r
-                       public void validate(ValidationContext ctx) {\r
-                               try {\r
+               itemSelectedValidator = ctx -> {\r
+                       try {\r
 \r
-                                       ArchivedMedia item = (ArchivedMedia) ctx.getValidatorArg(ARG);\r
-                                       boolean select = (boolean) ctx.getProperty().getValue();\r
-                                       MenuModel model = (MenuModel) SessionUtil.getAttribute(SessionUtil.MENUMODEL);\r
-                                       model.selectArchivedMedia(item, select);\r
-                               } catch (Exception e) {\r
+                               ArchivedMedia item = (ArchivedMedia) ctx.getValidatorArg(ARG);\r
+                               boolean select = (boolean) ctx.getProperty().getValue();\r
+                               MenuModel model = (MenuModel) SessionUtil.getAttribute(SessionUtil.MENUMODEL);\r
+                               model.selectArchivedMedia(item, select);\r
+                       } catch (Exception e) {\r
 \r
-                               }\r
                        }\r
                };\r
 \r
@@ -212,15 +205,15 @@ public class GridSearchModel extends AsyncBaseModel {
        }\r
 \r
        private void addTypeFilters(List<TypeFilter> filters) {\r
-               for (TypeFilter typeFilter : filters)\r
+               for (TypeFilter typeFilter : filters) {\r
                        typeFilters.put(typeFilter.getName(), typeFilter);\r
+               }\r
        }\r
 \r
        @AfterCompose\r
        public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {\r
                // A MediaFileServlet a services/proxy alatt szolgal ki\r
-               // Clients.evalJavaScript("setSource('http://localhost:9080/services/proxy/20209535_1-20205617.mp4',\r
-               // 'video/mp4')");\r
+               Clients.evalJavaScript("setSource('http://localhost:9080/services/proxy/64.mp4', 'video/mp4')");\r
                Selectors.wireComponents(view, this, false);\r
                Selectors.wireEventListeners(view, this);\r
 \r
@@ -240,20 +233,23 @@ public class GridSearchModel extends AsyncBaseModel {
 \r
                        if (itemsGrid != null) {\r
                                configureSearchResultGrid();\r
-                               if (SessionUtil.getUserPageSize() != 0)\r
+                               if (SessionUtil.getUserPageSize() != 0) {\r
                                        itemsGrid.setPageSize(SessionUtil.getUserPageSize());\r
+                               }\r
                                setSettingsPageSize(itemsGrid.getPageSize());\r
                        }\r
 \r
-                       if (!allChecked)\r
+                       if (!allChecked) {\r
                                showSearchTypeWarning();\r
+                       }\r
 \r
                        tags = itemManager.getAllTags();\r
                        // lekerdezesi hiba\r
-                       if (tags == null)\r
+                       if (tags == null) {\r
                                SessionUtil.showError("A cimkék inicializálása sikertelen.");\r
-                       else\r
+                       } else {\r
                                setSearchTags();\r
+                       }\r
 \r
                } catch (Exception e) {\r
                        handleSearchError(e);\r
@@ -286,20 +282,24 @@ public class GridSearchModel extends AsyncBaseModel {
 \r
                for (Component child : itemsGrid.getColumns().getChildren()) {\r
                        Column column = (Column) child;\r
-                       if (columnOrder != null)\r
-                               if (column.getLabel().equals(columnOrder.entrySet().iterator().next().getKey()))\r
+                       if (columnOrder != null) {\r
+                               if (column.getLabel().equals(columnOrder.entrySet().iterator().next().getKey())) {\r
                                        column.setSortDirection(columnOrder.entrySet().iterator().next().getValue());\r
-                       column.addEventListener("onSort", evt -> doSort(evt));\r
+                               }\r
+                       }\r
+                       column.addEventListener("onSort", this::doSort);\r
                }\r
        }\r
 \r
        @Command\r
        public void copyMediaIdToClipboard() {\r
-               String port = (Executions.getCurrent().getServerPort() == 80) ? "" : (":" + Executions.getCurrent().getServerPort());\r
+               String port = Executions.getCurrent().getServerPort() == 80 ? ""\r
+                               : ":" + Executions.getCurrent().getServerPort();\r
                String baseURL = Executions.getCurrent().getScheme() + "://" + Executions.getCurrent().getServerName() + port\r
                                + Executions.getCurrent().getContextPath();\r
                String url = String.format("%s/?%s=%d", baseURL, MEDIA_ID, selectedObject.getMedia().getId());\r
-               String email = String.format("mailto:?subject=Média címe: %s &body=A média itt tekinthető meg: %s", selectedObject.getMedia().getTitle(), url);\r
+               String email = String.format("mailto:?subject=Média címe: %s &body=A média itt tekinthető meg: %s",\r
+                               selectedObject.getMedia().getTitle(), url);\r
                Executions.getCurrent().sendRedirect(email);\r
        }\r
 \r
@@ -316,17 +316,20 @@ public class GridSearchModel extends AsyncBaseModel {
                parameters.put("successRecipient", SessionUtil.getUserPrincipal().getEmail());\r
 \r
                try {\r
-                       jobEngine.submit(CREATE_LOWRES_TEMPLATE, scheduledJob.getJobName(), parameters, SessionUtil.getUserPrincipal().getDisplayName());\r
-                       Messagebox.show("A proxy pótlása elindult, emailben értesíti a rendszer a folyamat végeztével.", "Információ", Messagebox.OK,\r
-                                       Messagebox.INFORMATION);\r
+                       jobEngine.submit(CREATE_LOWRES_TEMPLATE, scheduledJob.getJobName(), parameters,\r
+                                       SessionUtil.getUserPrincipal().getDisplayName());\r
+                       Messagebox.show("A proxy pótlása elindult, emailben értesíti a rendszer a folyamat végeztével.",\r
+                                       "Információ", Messagebox.OK, Messagebox.INFORMATION);\r
                } catch (JobEngineException e) {\r
                        logger.info("Hiba a feladat indításakor", e);\r
-                       Messagebox.show("Hiba a feladat indításakor. A rendszer üzenete: " + e.getMessage(), "Hiba", Messagebox.OK, Messagebox.ERROR);\r
+                       Messagebox.show("Hiba a feladat indításakor. A rendszer üzenete: " + e.getMessage(), "Hiba", Messagebox.OK,\r
+                                       Messagebox.ERROR);\r
                }\r
        }\r
 \r
        @Command\r
-       @NotifyChange({ "searchResult", "groupedSearchResult", "selectedObject", "hasTSMMediaFile", "hasLowresMediaFile", "lowresMediaFilePath" })\r
+       @NotifyChange({ "searchResult", "groupedSearchResult", "selectedObject", "hasTSMMediaFile", "hasLowresMediaFile",\r
+                       "lowresMediaFilePath" })\r
        public void doSearch() {\r
                startSearch = Instant.now();\r
                try {\r
@@ -355,37 +358,44 @@ public class GridSearchModel extends AsyncBaseModel {
 \r
                if (SessionUtil.getUserColumnOrder() != null) {\r
                        orderBy = columnHeaders.get(columnOrder.entrySet().iterator().next().getKey());\r
-                       orderAscending = columnOrder.entrySet().iterator().next().getValue().equals("ascending");\r
+                       orderAscending = "ascending".equals(columnOrder.entrySet().iterator().next().getValue());\r
                }\r
 \r
-               if (searchFilters == null || searchFilters.size() == 0)\r
+               if (searchFilters == null || searchFilters.size() == 0) {\r
                        throw new Exception("Anyag típus kiválasztása kötelező!");\r
+               }\r
 \r
                List<Long> selectedTypeIds = getTypeIDs(searchFilters);\r
 \r
-               SearchOptions options = SearchOptions.create().setText(searchValue).setTypes(selectedTypeIds).setTags(searchTags).setFrom(searchFrom).setTo(searchTo)\r
-                               .setMissingProxy(missingProxy).setDescLength(descLength).setOrder(orderBy, orderAscending);\r
+               SearchOptions options = SearchOptions.create().setText(searchValue).setTypes(selectedTypeIds)\r
+                               .setTags(searchTags).setFrom(searchFrom).setTo(searchTo).setMissingProxy(missingProxy)\r
+                               .setDescLength(descLength).setOrder(orderBy, orderAscending);\r
 \r
-               if (!options.isValid())\r
-                       throw new Exception("Legalább egy keresési opció használata kötelező: 3 karakter, hiányzó proxy, dátum, típus, cimke!");\r
+               if (!options.isValid()) {\r
+                       throw new Exception(\r
+                                       "Legalább egy keresési opció használata kötelező: 3 karakter, hiányzó proxy, dátum, típus, cimke!");\r
+               }\r
                searchResult = new CachedListModel(options, d -> {\r
-                       SessionUtil.consoleLog(String.format("SQL execution duration %s", DurationFormatUtils.formatDuration(d.toMillis(), "H:mm:ss.S", true)));\r
+                       SessionUtil.consoleLog(String.format("SQL execution duration %s",\r
+                                       DurationFormatUtils.formatDuration(d.toMillis(), "H:mm:ss.S", true)));\r
                });\r
                searchResult.addEventListener(e -> {\r
-                       if (e.getName().equals(Events.ON_ERROR)) {\r
+                       if (Events.ON_ERROR.equals(e.getName())) {\r
                                Exception ex = (Exception) e.getData();\r
                                handleSearchError(ex);\r
                        }\r
                });\r
 \r
-               if (!allChecked)\r
+               if (!allChecked) {\r
                        showSearchTypeWarning();\r
+               }\r
 \r
        }\r
 \r
        private void showSimpleSearchResult() throws Exception {\r
                String searchValue = search.getText();\r
-               String script = String.format("resultTable.setData('/services/rest/jobengine/search', {criteria:'%s'});", searchValue);\r
+               String script = String.format("resultTable.setData('/services/rest/jobengine/search', {criteria:'%s'});",\r
+                               searchValue);\r
                Clients.evalJavaScript(script);\r
        }\r
 \r
@@ -409,17 +419,18 @@ public class GridSearchModel extends AsyncBaseModel {
 \r
        @Command\r
        public void downloadMedia() {\r
-               if (!getHasTSMMediaFile())\r
+               if (!getHasTSMMediaFile()) {\r
                        return;\r
-               // Map<String, Object> arguments = new HashMap<String, Object>();\r
-               // arguments.put(MEDIACUBEMEDIA, this.selectedObject.getMedia());\r
-               // Window window = (Window)\r
-               // Executions.createComponents(PAGES_RETRIEVESELECTOR_ZUL, null,\r
-               // arguments);\r
-               // window.doModal();\r
+                       // Map<String, Object> arguments = new HashMap<String, Object>();\r
+                       // arguments.put(MEDIACUBEMEDIA, this.selectedObject.getMedia());\r
+                       // Window window = (Window)\r
+                       // Executions.createComponents(PAGES_RETRIEVESELECTOR_ZUL, null,\r
+                       // arguments);\r
+                       // window.doModal();\r
+               }\r
 \r
                MenuModel model = (MenuModel) SessionUtil.getAttribute(SessionUtil.MENUMODEL);\r
-               model.selectArchivedMedia(this.selectedObject, true);\r
+               model.selectArchivedMedia(selectedObject, true);\r
        }\r
 \r
        void ensureVisible(int pos) {\r
@@ -487,16 +498,17 @@ public class GridSearchModel extends AsyncBaseModel {
                        if (mediaFiles != null) {\r
                                for (MediaFile mf : mediaFiles) {\r
                                        Store store = mf.getStore();\r
-                                       if (store == null)\r
+                                       if (store == null) {\r
                                                continue;\r
-                                       // TODO a tartalek nem tud lowres lenni, de a TSM-nek nincs HTTP bejegyzese\r
-                                       // if (store.isLowres()) {\r
-                                       // StoreUri sourceStoreUri = store.getSourceStoreUri(RemoteStoreProtocol.HTTP);\r
-                                       // URL base = new URL(sourceStoreUri.toString());\r
-                                       // String relative = mf.getRelativePath().replace("\\", "/");\r
-                                       // ret = new URL(base, relative).toString();\r
-                                       // break;\r
-                                       // }\r
+                                               // TODO a tartalek nem tud lowres lenni, de a TSM-nek nincs HTTP bejegyzese\r
+                                               // if (store.isLowres()) {\r
+                                               // StoreUri sourceStoreUri = store.getSourceStoreUri(RemoteStoreProtocol.HTTP);\r
+                                               // URL base = new URL(sourceStoreUri.toString());\r
+                                               // String relative = mf.getRelativePath().replace("\\", "/");\r
+                                               // ret = new URL(base, relative).toString();\r
+                                               // break;\r
+                                               // }\r
+                                       }\r
 \r
                                        // relative cim a sajat kiszolgalo miatt\r
                                        StoreUri sourceStoreUri = store.getSourceStoreUri(RemoteStoreProtocol.HTTP);\r
@@ -504,9 +516,11 @@ public class GridSearchModel extends AsyncBaseModel {
                                        if (sourceStoreUri != null && sourceStoreUri.isStream()) {\r
                                                try {\r
                                                        String noProtocolUri = sourceStoreUri.toString(true);\r
-                                                       String base = noProtocolUri.startsWith("/") ? noProtocolUri : sourceStoreUri.toString(false);\r
-                                                       if (!base.endsWith("/"))\r
+                                                       String base = noProtocolUri.startsWith("/") ? noProtocolUri\r
+                                                                       : sourceStoreUri.toString(false);\r
+                                                       if (!base.endsWith("/")) {\r
                                                                base += "/";\r
+                                                       }\r
                                                        String relative = mf.getRelativePath().replace("\\", "/");\r
                                                        ret = base + relative;\r
 \r
@@ -546,10 +560,12 @@ public class GridSearchModel extends AsyncBaseModel {
                List<String> result = null;\r
                for (String label : typeFilters.keySet()) {\r
                        boolean isChecked = typeFilters.get(label).isChecked();\r
-                       if (!isChecked)\r
+                       if (!isChecked) {\r
                                continue;\r
-                       if (result == null)\r
+                       }\r
+                       if (result == null) {\r
                                result = new ArrayList<>();\r
+                       }\r
                        result.add(label);\r
                }\r
                return result;\r
@@ -573,8 +589,9 @@ public class GridSearchModel extends AsyncBaseModel {
                        List<MediaFile> mediaFiles = selectedObject.getMedia().getMediaFiles();\r
                        for (MediaFile mf : mediaFiles) {\r
                                Store store = mf.getStore();\r
-                               if (mf.getStore().isSystem())\r
+                               if (mf.getStore().isSystem()) {\r
                                        ret = Paths.get(store.getStoreUris().get(0).toString(false), mf.getRelativePath()).toString();\r
+                               }\r
                        }\r
                }\r
                return ret;\r
@@ -585,16 +602,19 @@ public class GridSearchModel extends AsyncBaseModel {
        }\r
 \r
        private List<Long> getTypeIDs(List<String> searchFilters) {\r
-               if (allChecked)\r
+               if (allChecked) {\r
                        return null;\r
+               }\r
                List<Long> result = null;\r
                if (searchFilters != null) {\r
                        for (String typeName : searchFilters) {\r
                                ItemType itemType = itemManager.getItemType(typeName);\r
-                               if (itemType == null)\r
+                               if (itemType == null) {\r
                                        continue;\r
-                               if (result == null)\r
+                               }\r
+                               if (result == null) {\r
                                        result = new ArrayList<>();\r
+                               }\r
                                result.add(itemType.getId());\r
                        }\r
                }\r
@@ -602,16 +622,18 @@ public class GridSearchModel extends AsyncBaseModel {
        }\r
 \r
        private void handleSearchError(Exception e) {\r
-               if (e instanceof NullPointerException)\r
+               if (e instanceof NullPointerException) {\r
                        SessionUtil.showError("Adatbázis lekérdezési hiba: NULL objektum.");\r
-               else\r
+               } else {\r
                        SessionUtil.showError("Adatbázis lekérdezési hiba: " + e.getMessage());\r
+               }\r
                logger.error(e);\r
        }\r
 \r
        private void highlight(ArchivedMedia am, boolean highlight) {\r
-               if (am == null)\r
+               if (am == null) {\r
                        return;\r
+               }\r
 \r
                List<Component> components = itemsGrid.getRows().getChildren();\r
 \r
@@ -661,7 +683,8 @@ public class GridSearchModel extends AsyncBaseModel {
        public void onAfterRenderGrid() {\r
                if (startSearch != null) {\r
                        Instant finishSearch = Instant.now();\r
-                       String duration = DurationFormatUtils.formatDuration(Duration.between(startSearch, finishSearch).toMillis(), "H:mm:ss.S", true);\r
+                       String duration = DurationFormatUtils.formatDuration(Duration.between(startSearch, finishSearch).toMillis(),\r
+                                       "H:mm:ss.S", true);\r
                        startSearch = null;\r
                        SessionUtil.consoleLog(String.format("Overall search execution duration %s", duration));\r
                }\r
@@ -713,15 +736,18 @@ public class GridSearchModel extends AsyncBaseModel {
                // index: e.detail.index\r
 \r
                JSONObject jsObject = (JSONObject) event.getData();\r
-               if (!jsObject.containsKey(TAGEVT_SOURCE))\r
+               if (!jsObject.containsKey(TAGEVT_SOURCE)) {\r
                        return;\r
+               }\r
                String source = String.valueOf(jsObject.get(TAGEVT_SOURCE));\r
 \r
-               if (TAGSRC_MEDIA.equals(source))\r
+               if (TAGSRC_MEDIA.equals(source)) {\r
                        processMediaTagChanged(jsObject);\r
+               }\r
 \r
-               if (TAGSRC_FILTER.equals(source))\r
+               if (TAGSRC_FILTER.equals(source)) {\r
                        processFilterTagChanged(jsObject);\r
+               }\r
 \r
                logger.info(event);\r
        }\r
@@ -740,7 +766,8 @@ public class GridSearchModel extends AsyncBaseModel {
                        doubleVar = (Double) jsObject.get("meta");\r
                }\r
 \r
-               if (doubleVar.floatValue() >= ((selectedObject.getTcOut() == null) ? 9999999999999999999999.9 : selectedObject.getTcOut())) {\r
+               if (doubleVar.floatValue() >= (selectedObject.getTcOut() == null ? 9999999999999999999999.9\r
+                               : selectedObject.getTcOut())) {\r
                        throw new Exception("A kilépés időpontjának későbbinek kell lennie mint a belépés időpontja!");\r
                } else {\r
                        selectedObject.setTcIn(new Float(doubleVar.floatValue()));\r
@@ -755,7 +782,7 @@ public class GridSearchModel extends AsyncBaseModel {
                        doubleVar = (Double) jsObject.get("meta");\r
                }\r
 \r
-               if (doubleVar.floatValue() <= ((selectedObject.getTcIn() == null) ? 0.0 : selectedObject.getTcIn())) {\r
+               if (doubleVar.floatValue() <= (selectedObject.getTcIn() == null ? 0.0 : selectedObject.getTcIn())) {\r
                        throw new Exception("A kilépés időpontjának későbbinek kell lennie mint a belépés időpontja!");\r
                } else {\r
                        selectedObject.setTcOut(new Float(doubleVar.floatValue()));\r
@@ -769,8 +796,9 @@ public class GridSearchModel extends AsyncBaseModel {
 \r
        @Command\r
        public void openMetaDataDialog() {\r
-               if (metaWindow != null)\r
+               if (metaWindow != null) {\r
                        return;\r
+               }\r
 \r
                // EventListener<Event> eventListener = e -> {\r
                // EventQueues.lookup("my super queue", EventQueues.APPLICATION,\r
@@ -787,21 +815,25 @@ public class GridSearchModel extends AsyncBaseModel {
                        metaWindow = null;\r
                };\r
 \r
-               metaWindow = (Window) Executions.createComponents(template, null, ListUtils.asMap("selectedObject", selectedObject, "listener", listener));\r
+               metaWindow = (Window) Executions.createComponents(template, null,\r
+                               ListUtils.asMap("selectedObject", selectedObject, "listener", listener));\r
                metaWindow.doOverlapped();\r
                metaWindow.addEventListener("onClose", listener);\r
        }\r
 \r
        private void processFilterTagChanged(JSONObject jsObject) {\r
-               if (tags == null)\r
+               if (tags == null) {\r
                        return;\r
+               }\r
 \r
-               if (!jsObject.containsKey(TAGEVT_TYPE))\r
+               if (!jsObject.containsKey(TAGEVT_TYPE)) {\r
                        return;\r
+               }\r
                String type = String.valueOf(jsObject.get(TAGEVT_TYPE));\r
 \r
-               if (!jsObject.containsKey(TAGEVT_TAGTEXT))\r
+               if (!jsObject.containsKey(TAGEVT_TAGTEXT)) {\r
                        return;\r
+               }\r
                String tagText = String.valueOf(jsObject.get(TAGEVT_TAGTEXT));\r
 \r
                long id = tags.get(tagText);\r
@@ -822,37 +854,43 @@ public class GridSearchModel extends AsyncBaseModel {
                        return;\r
                }\r
 \r
-               if (!jsObject.containsKey(TAGEVT_TYPE))\r
+               if (!jsObject.containsKey(TAGEVT_TYPE)) {\r
                        return;\r
+               }\r
                String type = String.valueOf(jsObject.get(TAGEVT_TYPE));\r
 \r
-               if (!jsObject.containsKey(TAGEVT_TAGTEXT))\r
+               if (!jsObject.containsKey(TAGEVT_TAGTEXT)) {\r
                        return;\r
+               }\r
                String tagText = String.valueOf(jsObject.get(TAGEVT_TAGTEXT));\r
 \r
                long id = 0;\r
-               if (tags.containsKey(tagText))\r
+               if (tags.containsKey(tagText)) {\r
                        id = tags.get(tagText);\r
+               }\r
 \r
                List<String> mediaTags = selectedObject.getTags();\r
                switch (type) {\r
                case TAGTYPE_ADD:\r
-                       if (mediaTags.contains(tagText.toLowerCase()))\r
+                       if (mediaTags.contains(tagText.toLowerCase())) {\r
                                return;\r
+                       }\r
                        if (id == 0) {\r
                                id = itemManager.addMediaTag(tagText, selectedObject.getMedia().getId());\r
                                // frissitjuk az osszes Tagify control whitelist-jet\r
                                tags.put(tagText, id);\r
                                setSearchTags();\r
-                       } else\r
+                       } else {\r
                                itemManager.addMediaTag(id, selectedObject.getMedia().getId());\r
+                       }\r
 \r
                        mediaTags.add(tagText);\r
                        break;\r
                case TAGTYPE_REMOVE:\r
                        mediaTags.remove(tagText.toLowerCase());\r
                        if (id == 0) {\r
-                               Messagebox.show("A cimke már nem található az adatbázisban: " + tagText, "Belső hiba!", Messagebox.OK, Messagebox.EXCLAMATION);\r
+                               Messagebox.show("A cimke már nem található az adatbázisban: " + tagText, "Belső hiba!", Messagebox.OK,\r
+                                               Messagebox.EXCLAMATION);\r
                                return;\r
                        }\r
                        itemManager.removeMediaTag(id, selectedObject.getMedia().getId());\r
@@ -874,7 +912,8 @@ public class GridSearchModel extends AsyncBaseModel {
 \r
        @Command\r
        @NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })\r
-       public void select(@BindingParam("selectedObject") ArchivedMedia selectedObject, @ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) {\r
+       public void select(@BindingParam("selectedObject") ArchivedMedia selectedObject,\r
+                       @ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) {\r
                Event event = ctx.getTriggerEvent();\r
                // Nem mindig a row a target, ha a kepre kattintunk akkor az image\r
                // selectedRowIndex = ((Row) event.getTarget()).getIndex();\r
@@ -888,12 +927,15 @@ public class GridSearchModel extends AsyncBaseModel {
        @NotifyChange({ "typeFilters", "topTypeFilters", "bottomTypeFilters" })\r
        public void setAllChecked(boolean allChecked) {\r
                this.allChecked = allChecked;\r
-               for (String key : typeFilters.keySet())\r
+               for (String key : typeFilters.keySet()) {\r
                        typeFilters.get(key).setChecked(allChecked);\r
-               for (TypeFilter topTypeFilter : topTypeFilters)\r
+               }\r
+               for (TypeFilter topTypeFilter : topTypeFilters) {\r
                        topTypeFilter.setChecked(allChecked);\r
-               for (TypeFilter bottomTypeFilter : bottomTypeFilters)\r
+               }\r
+               for (TypeFilter bottomTypeFilter : bottomTypeFilters) {\r
                        bottomTypeFilter.setChecked(allChecked);\r
+               }\r
        }\r
 \r
        public void setAllFilterCheckedValidator(Validator allFilterCheckedValidator) {\r
@@ -907,11 +949,13 @@ public class GridSearchModel extends AsyncBaseModel {
                for (Component obj : components) {\r
                        Row row = (Row) obj;\r
                        List<Component> children = row.getChildren();\r
-                       if (children.size() < 2)\r
+                       if (children.size() < 2) {\r
                                continue;\r
+                       }\r
                        Component component = children.get(1);\r
-                       if (!(component instanceof Checkbox))\r
+                       if (!(component instanceof Checkbox)) {\r
                                continue;\r
+                       }\r
                        Checkbox ck = (Checkbox) component;\r
                        ck.setChecked(allSelected);\r
                        MenuModel model = (MenuModel) SessionUtil.getAttribute(SessionUtil.MENUMODEL);\r
@@ -1003,18 +1047,21 @@ public class GridSearchModel extends AsyncBaseModel {
 \r
                List<String> mediaTags = null;\r
 \r
-               if (mediaId > 0)\r
+               if (mediaId > 0) {\r
                        mediaTags = itemManager.getMediaTags(mediaId);\r
+               }\r
 \r
                // inicializaljuk, hogy az addTag event ezeket mar ne akarja meg 1x hozzadni\r
                StringBuilder sb = new StringBuilder();\r
                if (mediaTags != null) {\r
                        for (String tag : mediaTags) {\r
                                selectedObject.getTags().add(tag.toLowerCase());\r
-                               if (tag.contains("'"))\r
+                               if (tag.contains("'")) {\r
                                        continue;\r
-                               if (sb.length() > 0)\r
+                               }\r
+                               if (sb.length() > 0) {\r
                                        sb.append(",");\r
+                               }\r
                                sb.append(String.format("'%s'", tag));\r
                        }\r
                }\r
@@ -1032,8 +1079,9 @@ public class GridSearchModel extends AsyncBaseModel {
 \r
        @Command\r
        public void setPageSize(@BindingParam(TAGEVT_SOURCE) Menuitem source) {\r
-               if (source.isChecked())\r
+               if (source.isChecked()) {\r
                        return;\r
+               }\r
                int pageSize = Integer.parseInt(source.getValue());\r
                setSettingsPageSize(pageSize);\r
                itemsGrid.setPageSize(pageSize);\r
@@ -1059,15 +1107,18 @@ public class GridSearchModel extends AsyncBaseModel {
 \r
        private void setSearchTags() {\r
                // JavaScript : addAllTags(['aaa', 'bbb', 'ccc']);\r
-               if (tags == null)\r
+               if (tags == null) {\r
                        return;\r
+               }\r
 \r
                StringBuilder sb = new StringBuilder();\r
                for (String tag : tags.keySet()) {\r
-                       if (tag.contains("'"))\r
+                       if (tag.contains("'")) {\r
                                continue;\r
-                       if (sb.length() > 0)\r
+                       }\r
+                       if (sb.length() > 0) {\r
                                sb.append(",");\r
+                       }\r
                        sb.append(String.format("'%s'", StringUtils.escape(tag)));\r
                }\r
                if (sb.length() > 0) {\r
@@ -1100,11 +1151,12 @@ public class GridSearchModel extends AsyncBaseModel {
                        setMediaTags(mediaId);\r
                        final String proxyUrl = getLowresMediaFilePath();\r
                        registerTask(() -> {\r
-                               loadProxy(proxyUrl);\r
+                               // loadProxy(proxyUrl);\r
                        });\r
                        timer.start();\r
-               } else\r
+               } else {\r
                        Clients.evalJavaScript("addMediaTags([]);");\r
+               }\r
 \r
        }\r
 \r
@@ -1113,10 +1165,11 @@ public class GridSearchModel extends AsyncBaseModel {
                        Clients.evalJavaScript("setSource(null, null)");\r
                } else {\r
                        String srcType = null;\r
-                       if (video.endsWith(".m3u8"))\r
+                       if (video.endsWith(".m3u8")) {\r
                                srcType = "application/x-mpegURL";\r
-                       else\r
+                       } else {\r
                                srcType = "video/mp4";\r
+                       }\r
 \r
                        Clients.evalJavaScript(String.format("setSource('%s', '%s')", video, srcType));\r
                }\r
@@ -1125,14 +1178,16 @@ public class GridSearchModel extends AsyncBaseModel {
        private void setSettingsPageSize(int pageSize) {\r
                List<Component> searchSettingItems = searchSettings.getChildren();\r
                for (Component c : searchSettingItems) {\r
-                       if (!(c instanceof Menuitem))\r
+                       if (!(c instanceof Menuitem)) {\r
                                continue;\r
+                       }\r
                        Menuitem menuItem = (Menuitem) c;\r
                        String value = menuItem.getValue();\r
-                       if (String.valueOf(pageSize).equals(value))\r
+                       if (String.valueOf(pageSize).equals(value)) {\r
                                menuItem.setChecked(true);\r
-                       else\r
+                       } else {\r
                                menuItem.setChecked(false);\r
+                       }\r
                }\r
        }\r
 \r
@@ -1152,15 +1207,17 @@ public class GridSearchModel extends AsyncBaseModel {
                                        typeFilters.put(filter, typeFilter);\r
                                }\r
                        }\r
-                       if (typeFilters.size() != selectedFilters.size())\r
+                       if (typeFilters.size() != selectedFilters.size()) {\r
                                allChecked = false;\r
+                       }\r
                }\r
        }\r
 \r
        private void showExternalMediaID() {\r
                String mediaId = SessionUtil.getQueryParameter(MEDIA_ID);\r
-               if (mediaId == null)\r
+               if (mediaId == null) {\r
                        return;\r
+               }\r
                try {\r
                        SearchOptions options = SearchOptions.create().setMediaId(Long.parseLong(mediaId));\r
                        searchResult = new InitializedCachedListModel(options);\r
@@ -1172,14 +1229,17 @@ public class GridSearchModel extends AsyncBaseModel {
        @Command\r
        @NotifyChange("itemsGrid")\r
        public void showInResults() {\r
-               if (selectedObject == null)\r
+               if (selectedObject == null) {\r
                        return;\r
+               }\r
                int activePageIndex = selectedRowIndex / itemsGrid.getPageSize();\r
                positionToScroll = selectedRowIndex - itemsGrid.getPageSize() * activePageIndex;\r
                // preventAfterRender = true;\r
                if (activePageIndex != itemsGrid.getActivePage()) {\r
                        itemsGrid.setActivePage(activePageIndex);\r
-                       logger.info("Selected media is shown in the results, which can be found on {} page and also it will be highlighted.", activePageIndex + 1);\r
+                       logger.info(\r
+                                       "Selected media is shown in the results, which can be found on {} page and also it will be highlighted.",\r
+                                       activePageIndex + 1);\r
                } else {\r
                        // TODO for debug purposes\r
                        // onAfterRenderGrid();\r