From a78c3a3fcc0f569270ca54d3355eade4e067d4dc Mon Sep 17 00:00:00 2001
From: undisclosed
Date: Mon, 09 Jan 2023 09:03:19 +0000
Subject: [PATCH] Dateien aufgeraeumt
---
src/de/uhilger/calypso/App.java | 123 +++-------------------------------------
1 files changed, 11 insertions(+), 112 deletions(-)
diff --git a/src/de/uhilger/calypso/App.java b/src/de/uhilger/calypso/App.java
index 3b17088..3c0b07d 100644
--- a/src/de/uhilger/calypso/App.java
+++ b/src/de/uhilger/calypso/App.java
@@ -18,130 +18,29 @@
package de.uhilger.calypso;
-import de.uhilger.calypso.handler.MPVPlayer;
-import de.uhilger.calypso.handler.MPlayer;
-import de.uhilger.calypso.handler.OMXPlayer;
-import de.uhilger.calypso.handler.Player;
-import de.uhilger.calypso.handler.VLCPlayer;
-import java.io.File;
-import java.io.IOException;
+import de.uhilger.calypso.http.Server;
import java.util.HashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/**
- * Hauptklasse von Calypso
- *
- * Aufruf mit<br>
- * java -jar calypso.jar port=9000 ctx="/calypso"<br>
- * java -jar calypso.jar nfs-prefix="/media/mc" port=9000<br>
- * java -Djava.util.logging.config.file=logging.properties -jar ..<br>
- *
- * Der Parameter nfs-prefix bewirkt, dass beim Abspielen relative Pfade
- * mit diesem Praefix verbunden werden und setzt voraus, dass auf der
- * Maschine ein NFS-Mount ueber /etc/fstab eingerichtet ist.<br>
- * <br>
- * Anmerkung anlaesslich der Aenderung auf VLC (2.1.2023):<br>
- * Mit Calypso wurde erstmals jdk.httpserver anstelle von Tomcat
- * einsetzt. Es war in diesem Punkt noch ein Laborversuch und sollte
- * unter Wiederverwendung der wesentlichen Teile bei Gelegenheit
- * neu gebaut werden.
- *
+ *
* @author Ulrich Hilger
- * @version 0.2 vom 2.1.2023, 0.1 vom 20.03.2021 als Nachfolger von Pirc (02.2013-03.2021)
*/
public class App {
-
- private static final Logger logger = Logger.getLogger(App.class.getName());
-
- public static final String IP_PORT = "port";
- public static final String IP_WWW_DATA = "www-data";
- public static final String IP_NFS_PREFIX = "nfs-prefix";
- public static final String IP_PLAYER = "player";
- public static final String VLC_PLAYER = "vlc";
- public static final String OMX_PLAYER = "omx";
- public static final String M_PLAYER = "mpl";
- public static final String MPV_PLAYER = "mpv";
- public static final String OMX_WD = "omx.wd";
- public static final String CTX = "ctx";
- public static final String CONF_PATH = "conf";
-
- public static final String DEFAULT_CTX = "/calypso";
-
- private static HashMap initParams;
- private static Process playerproc;
- private static Player player;
-
/**
* @param args the command line arguments
*/
public static void main(String[] args) {
- Logger.getLogger(App.class.getName()).log(Level.INFO, new File(".").getAbsolutePath());
- initParams = new HashMap();
- for(String arg: args) {
- String[] argParts = arg.split("=");
+ HashMap<String, String> initParams = new HashMap();
+ for (String arg : args) {
+ String[] argParts = arg.split(Server.EQUAL);
initParams.put(argParts[0], argParts[1]);
}
-
- String playerType = getInitParameter(IP_PLAYER);
- switch(playerType) {
- case MPV_PLAYER:
- player = new MPVPlayer();
- break;
- case M_PLAYER:
- player = new MPlayer();
- break;
- case VLC_PLAYER:
- player = new VLCPlayer();
- break;
- case OMX_PLAYER:
- player = new OMXPlayer();
- break;
- }
- Server server = new Server(Integer.parseInt(getInitParameter(IP_PORT)));
- server.setPath(getInitParameter(CONF_PATH));
- String ctx = getInitParameter(CTX);
- if(ctx != null && ctx.length() > 0) {
- server.setContextName(ctx);
- } else {
- server.setContextName(DEFAULT_CTX);
- }
- try {
- server.start(playerType);
- } catch (IOException ex) {
- Logger.getLogger(App.class.getName()).log(Level.SEVERE, null, ex);
- }
+ String conf = initParams.get(Server.CONF);
+ AppProperties einst = new AppProperties();
+ einst.readFile(conf);
+ Server server;
+ server = new Server();
+ server.start(einst);
}
-
- public static void stop() {
- System.exit(0);
- }
-
- public static String getInitParameter(String pname) {
- String param = null;
- Object o = initParams.get(pname);
- if(o != null) {
- param = o.toString();
- }
- return param;
- }
-
- public static Process getPlayerProcess() {
- return playerproc;
- }
-
- public static void setPlayerProcess(Process p) {
- playerproc = p;
- }
-
- public static Player getPlayer() {
- return player;
- }
-
- public static void setPlayer(Player pl) {
- player = pl;
- }
-
-
}
--
Gitblit v1.9.3