Sequence number in dvr file names (#48)

Author: ramkrishna757575

src/dvr.cpp

@@ -1,6 +1,9 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <iostream>
+#include <filesystem>
+#include <regex>
 
 #include "spdlog/spdlog.h"
 
@@ -12,7 +15,10 @@ extern "C" {
 #include "osd.h"
 }
 
+namespace fs = std::filesystem;
+
 int dvr_enabled = 0;
+const int SEQUENCE_PADDING = 4; // Configurable padding for sequence numbers
 
 int write_callback(int64_t offset, const void *buffer, size_t size, void *token){
 	FILE *f = (FILE*)token;
@@ -23,6 +29,7 @@ int write_callback(int64_t offset, const void *buffer, size_t size, void *token)
 Dvr::Dvr(dvr_thread_params params) {
 	filename_template = params.filename_template;
 	mp4_fragmentation_mode = params.mp4_fragmentation_mode;
+	dvr_filenames_with_sequence = params.dvr_filenames_with_sequence;
 	video_framerate = params.video_framerate;
 	video_frm_width = params.video_p.video_frm_width;
 	video_frm_height = params.video_p.video_frm_height;
@@ -176,11 +183,62 @@ void Dvr::loop() {
 
 int Dvr::start() {
 	char *fname_tpl = filename_template;
-	char fname[255];
-	time_t t = time(NULL);
-	strftime(fname, sizeof(fname), fname_tpl, localtime(&t));
-	if ((dvr_file = fopen(fname,"w")) == NULL){
-		spdlog::error("unable to open DVR file {}", fname);
+	std::string rec_dir, filename_pattern;
+	fs::path pathObj(filename_template);
+	rec_dir = pathObj.parent_path().string();
+	filename_pattern = pathObj.filename().string();
+	std::string paddedNumber = "";
+
+	// Ensure the directory exists
+	if (!fs::exists(rec_dir))
+	{
+		spdlog::error("Error: Directory does not exist: {}", rec_dir);
+		return -1;
+	}
+
+	if (dvr_filenames_with_sequence) {
+		// Get the next file number
+		std::regex pattern(R"(^(\d+)_.*)"); // Matches filenames that start with digits followed by '_'
+		int maxNumber = -1;
+		int nextFileNumber = 0;
+
+		for (const auto &entry : fs::directory_iterator(rec_dir)) {
+			if (entry.is_regular_file())
+			{
+				std::string filename = entry.path().filename().string();
+				std::smatch match;
+
+				if (std::regex_match(filename, match, pattern))
+				{
+					int number = std::stoi(match[1].str());
+					maxNumber = std::max(maxNumber, number);
+				}
+			}
+		}
+		if (maxNumber == -1) {
+			nextFileNumber = 0;
+		} else {
+			nextFileNumber = maxNumber + 1;
+		}
+
+		// Zero-pad the number
+		std::ostringstream stream;
+		stream << std::setw(SEQUENCE_PADDING) << std::setfill('0') << nextFileNumber;
+		paddedNumber = stream.str() + "_";
+	}
+
+	// Generate timestamped filename
+	std::time_t now = std::time(nullptr);
+	std::tm *localTime = std::localtime(&now);
+
+	char formattedFilename[256];
+	std::strftime(formattedFilename, sizeof(formattedFilename), filename_pattern.c_str(), localTime);
+
+	// Construct final filename
+	std::string finalFilename = rec_dir + "/" + paddedNumber + formattedFilename;
+
+	if ((dvr_file = fopen(finalFilename.c_str(), "w")) == NULL) {
+		spdlog::error("unable to open DVR file {}", finalFilename);
 		return -1;
 	}
 	osd_vars.enable_recording = 1;

src/dvr.h

@@ -22,6 +22,7 @@ struct video_params {
 struct dvr_thread_params {
     char *filename_template;
     int mp4_fragmentation_mode = 0;
+    bool dvr_filenames_with_sequence = false;
     int video_framerate = -1;
     video_params video_p;
 };
@@ -74,6 +75,7 @@ class Dvr {
     std::condition_variable cv;
     char *filename_template;
     int mp4_fragmentation_mode = 0;
+    bool dvr_filenames_with_sequence = false;
     int video_framerate = -1;
     uint32_t video_frm_width;
     uint32_t video_frm_height;

src/main.cpp

@@ -512,6 +512,8 @@ void printHelp() {
     "                             Supports placeholders %%Y - year, %%m - month, %%d - day,\n"
     "                             %%H - hour, %%M - minute, %%S - second. Ex: /media/DVR/%%Y-%%m-%%d_%%H-%%M-%%S.mp4\n"
     "\n"
+	"    --dvr-sequenced-files  - Prepend a sequence number to the names of the dvr files\n"
+	"\n"
     "    --dvr-start            - Start DVR immediately\n"
     "\n"
     "    --dvr-framerate <rate> - Force the dvr framerate for smoother dvr, ex: 60\n"
@@ -539,6 +541,7 @@ int main(int argc, char **argv)
 	char* dvr_template = NULL;
 	int video_framerate = -1;
 	int mp4_fragmentation_mode = 0;
+	bool dvr_filenames_with_sequence = false;
 	uint16_t listen_port = 5600;
 	uint16_t mavlink_port = 14550;
 	uint16_t mode_width = 0;
@@ -584,6 +587,11 @@ int main(int argc, char **argv)
 		continue;
 	}
 
+	__OnArgument("--dvr-sequenced-files") {
+		dvr_filenames_with_sequence = true;
+		continue;
+	}
+
 	__OnArgument("--dvr-framerate") {
 		video_framerate = atoi(__ArgValue);
 		continue;
@@ -777,6 +785,7 @@ int main(int argc, char **argv)
 		dvr_thread_params args;
 		args.filename_template = dvr_template;
 		args.mp4_fragmentation_mode = mp4_fragmentation_mode;
+		args.dvr_filenames_with_sequence = dvr_filenames_with_sequence;
 		args.video_framerate = video_framerate;
 		args.video_p.video_frm_width = output_list->video_frm_width;
 		args.video_p.video_frm_height = output_list->video_frm_height;