Merge remote-tracking branch 'origin/master' into ir-fix

Author: gferraro

api/api.go

@@ -49,7 +49,7 @@ const (
 	cptvGlob            = "*.cptv"
 	failedUploadsFolder = "failed-uploads"
 	rebootDelay         = time.Second * 5
-	apiVersion          = 7
+	apiVersion          = 8
 )
 
 type ManagementAPI struct {
@@ -132,12 +132,18 @@ func (api *ManagementAPI) GetRecording(w http.ResponseWriter, r *http.Request) {
 	cptvPath := getRecordingPath(cptvName, api.cptvDir)
 	if cptvPath == "" {
 		w.WriteHeader(http.StatusBadRequest)
-		io.WriteString(w, "cptv file not found\n")
+		io.WriteString(w, "file not found\n")
 		return
 	}
 
 	w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, cptvName))
-	w.Header().Set("Content-Type", "application/x-cptv")
+
+	ext := filepath.Ext(cptvName)
+	if ext == ".cptv" {
+		w.Header().Set("Content-Type", "application/x-cptv")
+	} else {
+		w.Header().Set("Content-Type", "application/json")
+	}
 	f, err := os.Open(cptvPath)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
@@ -152,13 +158,19 @@ func (api *ManagementAPI) GetRecording(w http.ResponseWriter, r *http.Request) {
 // DeleteRecording deletes the given cptv file
 func (api *ManagementAPI) DeleteRecording(w http.ResponseWriter, r *http.Request) {
 	cptvName := mux.Vars(r)["id"]
-	log.Printf("delete cptv '%s'", cptvName)
 	recPath := getRecordingPath(cptvName, api.cptvDir)
 	if recPath == "" {
 		w.WriteHeader(http.StatusOK)
 		io.WriteString(w, "cptv file not found\n")
 		return
 	}
+
+	metaFile := strings.TrimSuffix(recPath, filepath.Ext(recPath)) + ".txt"
+	if _, err := os.Stat(metaFile); !os.IsNotExist(err) {
+		log.Printf("deleting meta '%s'", metaFile)
+		os.Remove(metaFile)
+	}
+	log.Printf("delete cptv '%s'", recPath)
 	err := os.Remove(recPath)
 	if os.IsNotExist(err) {
 		w.WriteHeader(http.StatusOK)
@@ -189,6 +201,21 @@ func (api *ManagementAPI) TakeSnapshot(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+// TakeSnapshotRecording will request a new snapshot recording to be taken by thermal-recorder
+func (api *ManagementAPI) TakeSnapshotRecording(w http.ResponseWriter, r *http.Request) {
+	conn, err := dbus.SystemBus()
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	recorder := conn.Object("org.cacophony.thermalrecorder", "/org/cacophony/thermalrecorder")
+	err = recorder.Call("org.cacophony.thermalrecorder.TakeTestRecording", 0).Err
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+}
+
 // Reregister can change the devices name and group
 func (api *ManagementAPI) Reregister(w http.ResponseWriter, r *http.Request) {
 	group := r.FormValue("group")
@@ -374,21 +401,11 @@ func getCptvNames(dir string) []string {
 	return names
 }
 
-func getRecordingPath(cptv, dir string) string {
+func getRecordingPath(file, dir string) string {
 	// Check that given file is a cptv file on the device.
-	isCptvFile := false
-	for _, name := range getCptvNames(dir) {
-		if name == cptv {
-			isCptvFile = true
-			break
-		}
-	}
-	if !isCptvFile {
-		return ""
-	}
 	paths := []string{
-		filepath.Join(dir, cptv),
-		filepath.Join(dir, failedUploadsFolder, cptv),
+		filepath.Join(dir, file),
+		filepath.Join(dir, failedUploadsFolder, file),
 	}
 	for _, path := range paths {
 		if _, err := os.Stat(path); !os.IsNotExist(err) {

cmd/managementd/main.go

@@ -106,6 +106,7 @@ func main() {
 	apiRouter.HandleFunc("/recording/{id}", apiObj.GetRecording).Methods("GET")
 	apiRouter.HandleFunc("/recording/{id}", apiObj.DeleteRecording).Methods("DELETE")
 	apiRouter.HandleFunc("/camera/snapshot", apiObj.TakeSnapshot).Methods("PUT")
+	apiRouter.HandleFunc("/camera/snapshot-recording", apiObj.TakeSnapshotRecording).Methods("PUT")
 	apiRouter.HandleFunc("/signal-strength", apiObj.GetSignalStrength).Methods("GET")
 	apiRouter.HandleFunc("/reregister", apiObj.Reregister).Methods("POST")
 	apiRouter.HandleFunc("/reboot", apiObj.Reboot).Methods("POST")

html/camera.html

@@ -13,10 +13,14 @@
 
     <div class="container">
       <h2>Camera</h2>
-      <button id="trigger-trap" style="position: relative" type="button">
+      <button id="trigger-trap" style="position: relative;display: none" type="button">
         Trigger trap
       </button>
+      <button id="take-snapshot-recording" style="position: relative" type="button">
+        Take test recording
+      </button>
       <div id="snapshot-stopped" style="display: none">
+
         <p id="snapshot-stopped-message"></p>
         <button id="snapshot-restart" type="button">
           Continue viewing camera

static/js/camera.ts

@@ -94,6 +94,7 @@ window.onload = function () {
   }
   document.getElementById("snapshot-restart")!.onclick = restartCameraViewing;
   document.getElementById("trigger-trap")!.onclick = triggerTrap;
+  document.getElementById("take-snapshot-recording")!.onclick = takeTestRecording;
   cameraConnection = new CameraConnection(
     window.location.hostname,
     window.location.port,
@@ -102,6 +103,25 @@ window.onload = function () {
   );
 };
 
+async function takeTestRecording() {
+  document.getElementById("take-snapshot-recording")!.innerText = 'Making a test recording';
+  document.getElementById("take-snapshot-recording")!.setAttribute("disabled", "true");
+  console.log("making a test recording");
+  fetch('/api/camera/snapshot-recording', {
+    method: 'PUT',
+  headers: {
+    'Authorization': 'Basic YWRtaW46ZmVhdGhlcnM='
+  }})
+
+  .then(response => console.log(response))
+  .then(data => console.log(data))
+  .catch(error => console.error(error))
+  //TODO handle errors better and check that recording was made properly instead of just waiting..
+  await new Promise(r => setTimeout(r, 3000));
+  document.getElementById("take-snapshot-recording")!.removeAttribute("disabled");
+  document.getElementById("take-snapshot-recording")!.innerText = 'Take test recording';
+}
+
 function stopSnapshots(message: string) {
   if (cameraConnection) {
     cameraConnection.close();