From c18e1dfdb92661fcb8d2eaff87517ec5232f0f46 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Fri, 23 Apr 2021 17:53:30 +0000
Subject: [PATCH] Abspielprozess wird nicht mehr auf null gesetzt

---
 src/de/uhilger/avdirektor/handler/PlayHandler.java |  107 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 82 insertions(+), 25 deletions(-)

diff --git a/src/de/uhilger/avdirektor/handler/PlayHandler.java b/src/de/uhilger/avdirektor/handler/PlayHandler.java
index 3a8db5d..3cbcd0e 100644
--- a/src/de/uhilger/avdirektor/handler/PlayHandler.java
+++ b/src/de/uhilger/avdirektor/handler/PlayHandler.java
@@ -1,47 +1,58 @@
+/*
+    AV-Direktor - Control OMXPlayer on Raspberry Pi via HTTP
+    Copyright (C) 2021  Ulrich Hilger
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 package de.uhilger.avdirektor.handler;
 
 import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
+import de.uhilger.avdirektor.App;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Map;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
  * Play
- * 
+ *
  * rpi4-az:9090/avd/play?titel=/Filme/S/sound_city.m4v&th=60&ti=60&o=local
- * 
- *  OMXPlayer.abspielenMitParameternUndRueckmeldung(
- *    String urlStr, String parameter, String meldeUrlStr, String token)
  *
- *  Parameter des Aufrufs play als query (th threshold, ti timeout)
+ * OMXPlayer.abspielenMitParameternUndRueckmeldung( String urlStr, String
+ * parameter, String meldeUrlStr, String token)
  *
- *  ?titel=/Filme/S/sound_city.m4v
- *  &ti=60
- *  &th=60
- *  &o=local|hdmi|both
- *  &r=http://uhilger.de/mc/api/usw
+ * Parameter des Aufrufs play als query (th threshold, ti timeout)
  *
- *  r muss ganz wegbleiben, wenn keine Rueckmeldung gewuescht ist
- * 
+ * ?titel=/Filme/S/sound_city.m4v &ti=60 &th=60 &o=local|hdmi|both
+ * &r=http://uhilger.de/mc/api/usw
+ *
+ * r muss ganz wegbleiben, wenn keine Rueckmeldung gewuescht ist
+ *
  * @author ulrich
  */
 public class PlayHandler extends CmdHandler {
-  
+
   private static final Logger logger = Logger.getLogger(PlayHandler.class.getName());
 
   public PlayHandler(String cmd) {
     super(cmd);
-  }
-
-  @Override
-  protected String process(HttpExchange t, String params) {
-    String antwort = abspielenMitParameternUndRueckmeldung( 
-            getParam(map, "titel"), params, getParam(map, "r"), "1");    
-    logger.log(Level.FINE, antwort);
-    return antwort;
   }
 
   protected StringBuilder buildParams(HttpExchange t) {
@@ -52,7 +63,53 @@
     params.append(getParam(map, "th"));
     params.append(" --timeout ");
     params.append(getParam(map, "ti"));
+    String log = getParam(map, "log");
+    if (log != null && log.equalsIgnoreCase("true")) {
+      params.append(" --genlog");
+    }
     return params;
   }
-  
+
+  @Override
+  protected String process(HttpExchange t, String params) {
+    if (cmd.equalsIgnoreCase(OMXPlayer.F_PLAY)) {
+      try {
+        //FileUtils.deleteDirectory(new File(System.getProperty("omx.wd"), "omx-logs"));
+        FileSystem fs = FileSystems.getDefault();
+        Path path = fs.getPath(System.getProperty("omx.wd"), "omx-logs");
+        deleteDirectory(path);
+        //Files.delete(path);
+      } catch (IOException ex) {
+        logger.log(Level.SEVERE, null, ex);
+      }
+    }
+    String antwort = App.getPlayer().abspielen(
+            getParam(map, "titel"), params, getParam(map, "r"), "1");
+    logger.log(Level.FINE, antwort);
+    return antwort;
+  }
+
+  protected void deleteDirectory(Path start) throws IOException {
+    Files.walkFileTree(start, new SimpleFileVisitor<Path>() {
+      @Override
+      public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+              throws IOException {
+        Files.delete(file);
+        return FileVisitResult.CONTINUE;
+      }
+
+      @Override
+      public FileVisitResult postVisitDirectory(Path dir, IOException e)
+              throws IOException {
+        if (e == null) {
+          Files.delete(dir);
+          return FileVisitResult.CONTINUE;
+        } else {
+          // directory iteration failed
+          throw e;
+        }
+      }
+    });
+  }
+
 }

--
Gitblit v1.9.3