zii/JustMotion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v2.0.t6

Browse Source 
Added live camera streaming support to the web interface for testing.
This commit is contained in:
Maurice ONeal 2023-03-11 07:56:16 -05:00
parent 0f6e7603df
commit 78919effcf
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common.h
View File

@ -37,7 +37,7 @@ using namespace std;
using namespace std::filesystem; using namespace std::filesystem;
using namespace std::chrono; using namespace std::chrono;
#define APP_VER "2.0.t5" #define APP_VER "2.0.t6"
#define APP_NAME "Motion Watch" #define APP_NAME "Motion Watch"
#define REC_LOG_NAME "rec_log_lines.html" #define REC_LOG_NAME "rec_log_lines.html"
#define DET_LOG_NAME "det_log_lines.html" #define DET_LOG_NAME "det_log_lines.html"

12
src/web.cpp
View File

@ -45,9 +45,18 @@ void genHTMLul(const string &outputDir, const string &title, shared_t *share)
if (exists(outputDir + "/VIDEO_TS")) if (exists(outputDir + "/VIDEO_TS"))
{ {
htmlText += "<h4>Live</h4>\n";
htmlText += "<ul>\n";
htmlText += " <li><a href='stream.html'>" + share->camName + ":live" + "</a></li>\n";
htmlText += "</ul>\n";
htmlText += "<h4>Motion Events</h4>\n"; htmlText += "<h4>Motion Events</h4>\n";
if (!exists("stream.html"))
{
genHTMLvid("stream");
}
} }
for (auto &&regName : regNames) for (auto &&regName : regNames)
{ {
if (regName.ends_with("_log.html")) if (regName.ends_with("_log.html"))
@ -56,6 +65,7 @@ void genHTMLul(const string &outputDir, const string &title, shared_t *share)
} }
else if (regName.ends_with(".html") && else if (regName.ends_with(".html") &&
!regName.ends_with("index.html") && !regName.ends_with("index.html") &&
!regName.ends_with("stream.html") &&
!regName.ends_with("_log_lines.html")) !regName.ends_with("_log_lines.html"))
{ {
// regName.substr(0, regName.size() - 5) removes .html // regName.substr(0, regName.size() - 5) removes .html