fix video deletion issue

Author: TinkerTurtle

go.mod

@@ -1,16 +1,17 @@
 module sentry-picam
 
-go 1.13
+go 1.17
 
 require (
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.4.2
-	github.com/ricochet2200/go-disk-usage/du v0.0.0-20210707232629-ac9918953285 // indirect
 	sentry-picam/broker v0.0.0-00010101000000-000000000000
 	sentry-picam/helper v0.0.0-00010101000000-000000000000
 	sentry-picam/raspivid v0.0.0-00010101000000-000000000000
 )
 
+require github.com/ricochet2200/go-disk-usage/du v0.0.0-20210707232629-ac9918953285 // indirect
+
 replace sentry-picam/broker => ./pkg/broker
 
 replace sentry-picam/helper => ./pkg/helper

go.sum

@@ -1,7 +1,5 @@
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/ricochet2200/go-disk-usage/du v0.0.0-20210707232629-ac9918953285 h1:d54EL9l+XteliUfUCGsEwwuk65dmmxX85VXF+9T6+50=

recordingList.go

@@ -62,8 +62,10 @@ func (rec *RecordingList) handleDeleteRecording(w http.ResponseWriter, r *http.R
 
 	os.MkdirAll(rec.Folder+"deleteme/", 0777)
 
-	os.Rename(rec.Folder+videoID+".mp4", rec.Folder+"deleteme/"+videoID+".mp4")
-	os.Rename(rec.Folder+videoID+".jpg", rec.Folder+"deleteme/"+videoID+".jpg")
+	s := strings.Split(videoID, "-")
+	newFolder := fmt.Sprintf("%s-%s/", s[0], s[1])
+	os.Rename(rec.Folder+newFolder+videoID+".mp4", rec.Folder+"deleteme/"+videoID+".mp4")
+	os.Rename(rec.Folder+newFolder+videoID+".jpg", rec.Folder+"deleteme/"+videoID+".jpg")
 }
 
 func (rec *RecordingList) handleDestroyRecording(w http.ResponseWriter, r *http.Request) {

sentry-picam

@@ -41,7 +41,8 @@
     }
 
     function deleteVideo(file) {
-        fetch('./api/videos/' + file, {method: 'DELETE'})
+        let videoID = file.split('/')[1];
+        fetch('./api/videos/' + videoID, {method: 'DELETE'})
             .then(function() {
                 nextVideo();
                 videoList.splice(videoList.indexOf(file), 1);