From: Vásáry Dániel Date: Mon, 30 Sep 2019 12:19:22 +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=7de4aa6d2b0fcfdce7986b2491ed96000dc41d66;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31551 --- diff --git a/server/-configuration/run-mediacube-server-user.launch b/server/-configuration/run-mediacube-server-user.launch index 8fb202ba..5192ce74 100644 --- a/server/-configuration/run-mediacube-server-user.launch +++ b/server/-configuration/run-mediacube-server-user.launch @@ -19,7 +19,7 @@ - + diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/IMediaFinder.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/IMediaFinder.java new file mode 100644 index 00000000..f98d480b --- /dev/null +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/IMediaFinder.java @@ -0,0 +1,9 @@ +package user.jobengine.db; + +import java.util.List; + +public interface IMediaFinder { + + SearchResult search(String criteria, List searchFilters, String orderBy, boolean orderAscending, int fromResult, int toResult); + +} diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java index 6d4ae689..809ff5cd 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java @@ -70,11 +70,18 @@ public class ItemManager extends MemoryCache implements IItemManager { String dbPassword = null; private SignalServer signalServer; + private MediaFinder finder; public ItemManager() { initializeItemManager(signalServer); connect(); - // logger.info("ItemManager hasn't SignalServer reference."); + + //TODO mediafinder lokalis valtozo helyett private field. + //System.getProperty("jobengine.mediafinder.external") == true + //System.getProperty("jobengine.mediafinder.external.url") + + finder = new MediaFinder(this); + } // public ItemManager(SignalServer signalServer) { @@ -980,7 +987,6 @@ public class ItemManager extends MemoryCache implements IItemManager { int toResult) { traceIn(); SearchResult result = null; - MediaFinder finder = new MediaFinder(this); result = finder.search(criteria, searchFilters, orderBy, orderAscending, fromResult, toResult); traceOut(); return result; diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/LuceneMediaFinder.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/LuceneMediaFinder.java new file mode 100644 index 00000000..3ff8c1b0 --- /dev/null +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/LuceneMediaFinder.java @@ -0,0 +1,14 @@ +package user.jobengine.db; + +import java.util.List; + +public class LuceneMediaFinder implements IMediaFinder { + + @Override + public SearchResult search(String criteria, List searchFilters, String orderBy, boolean orderAscending, int fromResult, + int toResult) { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFinder.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFinder.java index 4f7fb5ae..b756290b 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFinder.java +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaFinder.java @@ -12,7 +12,7 @@ import org.apache.logging.log4j.Logger; import sqlj.runtime.ref.DefaultContext; -public class MediaFinder { +public class MediaFinder implements IMediaFinder { private static final Logger logger = LogManager.getLogger(); private ItemManager manager = null; @@ -108,6 +108,7 @@ public class MediaFinder { return result; } + @Override public SearchResult search(String criteria, List searchFilters, String orderBy, boolean orderAscending, int fromResult, int toResult) { SearchResult result = new SearchResult<>(); diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul index 0f4feb46..ee183790 100644 --- a/server/user.jobengine.osgi.server/pages/searchitems.zul +++ b/server/user.jobengine.osgi.server/pages/searchitems.zul @@ -35,10 +35,11 @@ if (src != null) { player.src({type: 'video/mp4', src: src}); }else{ + //player.poster("/img/mediacube_logo_v2_50x50.png"); player.src({type: 'image/png', src: "/img/mediacube_logo_v2_50x50.png"}); } } - + setSource(null); function pushTcIn() { var current = player.currentTime(); console.log("pushTcIn", current); @@ -290,7 +291,7 @@
- +
diff --git a/server/user.jobengine.osgi.server/resources/i3-label_hu.properties b/server/user.jobengine.osgi.server/resources/i3-label_hu.properties index 28800bf7..48988ce2 100644 --- a/server/user.jobengine.osgi.server/resources/i3-label_hu.properties +++ b/server/user.jobengine.osgi.server/resources/i3-label_hu.properties @@ -1,5 +1,5 @@ -version=2.4.4 -footer=2016-2018 © Copyright User Rendszerház Kft. +version=2.4.5 +footer=2016-2019 © Copyright User Rendszerház Kft. login_info=Információ login_dialogtitle=Bejelentkezés diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java index 6af45af2..99dbdea9 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java @@ -64,7 +64,6 @@ public class SearchModel extends AsyncBaseModel { private static final String ARG = "arg"; private static final String MEDIA_ID = "showMediaID"; private static final Logger logger = LogManager.getLogger(); - private static final String PAGES_MEDIAPLAYER = "/pages/mediaplayer.jsp?mediaurl="; private static MediaCubeConfig mediaCubeConfig = SessionUtil.getMediaCubeConfig(); private List topTypeFilters; private List bottomTypeFilters; diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TypeFilter.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TypeFilter.java index 3bfd3b0d..1ee78d3e 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TypeFilter.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TypeFilter.java @@ -16,7 +16,7 @@ public class TypeFilter { private boolean checked; public TypeFilter() { - + checked = true; } TypeFilter(String name, String color, String icon) { diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java index 1e8ae056..d0ed1f04 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/SessionUtil.java @@ -50,10 +50,18 @@ public class SessionUtil { public static final String GUI_STAT_DISABLE = "gui.statistics.disable"; public static final String GUI_HELP_DISABLE = "gui.help.disable"; public static final String GUI_EDITOR_DISABLE = "gui.editor.disable"; - private static MediaCubeConfig mediaCubeConfig = new MediaCubeConfig(); + private static MediaCubeConfig mediaCubeConfig; + + static { + try { + mediaCubeConfig = JSONConfig.read("jobengine.mediacube.config", MediaCubeConfig.class); + } catch (Exception e) { + logger.error("Critical error", e); + } + } public static boolean authenticate(String account, String password) { - Properties cfg = getConfiguration(); + //Properties cfg = getConfiguration(); // MediaCubeConfig mediaCubeConfig = getMediaCubeConfig(); LocalUserHandler localUserHandler = new LocalUserHandler(account, password, mediaCubeConfig.getAuthentication()); UserPrincipal userPrincipal = localUserHandler.getUserPrincipal(); @@ -247,15 +255,7 @@ public class SessionUtil { } public static boolean isAuthenticationEnabled() { - boolean result = false; - try { - Properties cfg = getConfiguration(); - result = Boolean.parseBoolean(cfg.getProperty(AUTH_ENABLED, "false")); - if (!result) - setAttribute(USERPRINCIPAL, new UserPrincipal("anonymous", true, true, true)); - } finally { - } - return result; + return mediaCubeConfig.getAuthentication().isAuthEnabled(); } static public boolean isEditor() {