From e5c35a7b4d3d4787c4f0b6cb146db98eb09fe76d Mon Sep 17 00:00:00 2001 From: Moe Date: Fri, 19 Aug 2022 17:38:24 -0700 Subject: [PATCH 1/6] Video Recording Archive Controls --- languages/en_CA.json | 5 ++ libs/cron/worker.js | 4 +- libs/database/utils.js | 2 +- libs/sql.js | 15 ++++++ libs/user/utils.js | 8 +-- libs/video/utils.js | 23 ++++++++ libs/webServerPaths.js | 8 +++ web/assets/css/bs5.videosTable.css | 24 +++++++++ web/assets/js/bs5.videoPlayer.js | 3 +- web/assets/js/bs5.videos.js | 77 +++++++++++++++++++++++++++ web/assets/js/bs5.videosTable.js | 47 +++++++++++++--- web/pages/blocks/home/videosTable.ejs | 5 +- 12 files changed, 206 insertions(+), 15 deletions(-) diff --git a/languages/en_CA.json b/languages/en_CA.json index 5bed1d6b..e165d282 100644 --- a/languages/en_CA.json +++ b/languages/en_CA.json @@ -331,6 +331,7 @@ "Start": "Start", "End": "End", "Archive": "Archive", + "Unarchive": "Unarchive", "Email Details": "Email Details", "Delete Matches": "Delete Matches", "Delete selected": "Delete selected", @@ -495,15 +496,19 @@ "Delete Filter": "Delete Filter", "confirmDeleteFilter": "Do you want to delete this filter? You cannot recover it.", "Fix Video": "Fix Video", + "Archived": "Archived", + "Archive Videos": "Archive Videos", "Compress Videos": "Compress Videos", "Compress Completed Videos": "Compress Completed Videos", "compressCompletedVideosFieldText": "Automatically compress videos to WebM once recorded. Doing this requires a powerful CPU or you must allow a large amount of time to allow compression. The rate in which videos are added to the database can't be faster than the rate for compression.", "FixVideoMsg": "Do you want to fix this video? This will create a new file and overwrite the old one. You cannot undo this action.", "DeleteVideoMsg": "Do you want to delete this video? You cannot recover it.", "CompressVideoMsg": "Do you want to compress this video? The original will be moved to your FileBin. Videos that are already completed compressing will be skipped if already queued.", + "ArchiveVideoMsg": "Do you want to Archive this video? This video won't be deleted by the automated cleanup processes.", "DeleteThisMsg": "Do you want to delete this? You cannot recover it.", "DeleteTheseMsg": "Do you want to delete these? You cannot recover them.", "CompressTheseMsg": "Do you want to compress these? The originals will be moved to your FileBin. Videos that are already WebM will be skipped. Videos that are already completed compressing will be skipped if ordered to compress again.", + "ArchiveTheseMsg": "Do you want to Archive these? They won't be deleted by the automated cleanup processes.", "dropBoxSuccess": "Success! Files saved to your Dropbox.", "API Key Deleted": "API Key Deleted", "APIKeyDeletedText": "Key has been deleted. It will no longer work.", diff --git a/libs/cron/worker.js b/libs/cron/worker.js index f3f8804c..683dce70 100644 --- a/libs/cron/worker.js +++ b/libs/cron/worker.js @@ -142,7 +142,7 @@ function beginProcessing(){ const whereQuery = [ ['ke','=',v.ke], ['status','!=',"0"], - ['details','NOT LIKE','%"archived":"1"%'], + ['archive','!=',`1`], ] b.where.forEach(function(condition){ if(condition.p1 === 'ke'){condition.p3 = v.ke} @@ -314,7 +314,7 @@ function beginProcessing(){ where: [ ['ke','=',v.ke], ['status','!=','0'], - ['details','NOT LIKE','%"archived":"1"%'], + ['archive','!=',`1`], ['time','<', sqlDate('10 MINUTE')], ] },(err,evs) => { diff --git a/libs/database/utils.js b/libs/database/utils.js index bfb5ae71..ecaefb5b 100644 --- a/libs/database/utils.js +++ b/libs/database/utils.js @@ -213,7 +213,7 @@ module.exports = function(s,config){ whereQuery.push(monitorRestrictions) } if(options.archived){ - whereQuery.push(['details','LIKE',`%"archived":"1"%`]) + whereQuery.push(['archive','=',`1`]) } if(options.filename){ whereQuery.push(['filename','=',options.filename]) diff --git a/libs/sql.js b/libs/sql.js index 831a5c9d..8d8c1485 100644 --- a/libs/sql.js +++ b/libs/sql.js @@ -176,6 +176,21 @@ module.exports = function(s,config){ }catch(err){ console.log(err) } + try{ + s.databaseEngine.schema.table('Videos', table => { + table.tinyint('archive',1).defaultTo(0) + table.string('saveDir',255).defaultTo('') + }).then(() => { + console.log(`objects added to Videos table`) + }).catch((err) => { + if(err && err.code !== 'ER_DUP_FIELDNAME'){ + console.log('error') + console.log(err) + } + }) + }catch(err){ + console.log(err) + } delete(s.preQueries) } } diff --git a/libs/user/utils.js b/libs/user/utils.js index c0cf4cb4..bb84e37c 100644 --- a/libs/user/utils.js +++ b/libs/user/utils.js @@ -221,7 +221,7 @@ module.exports = (s,config,lang) => { where: [ ['ke','=',groupKey], ['status','!=','0'], - ['details','NOT LIKE',`%"archived":"1"%`], + ['archive','!=',`1`], ['details','LIKE',`%"dir":"${storage.value}"%`], ], orderBy: ['time','asc'], @@ -266,7 +266,7 @@ module.exports = (s,config,lang) => { where: [ ['ke','=',groupKey], ['status','!=','0'], - ['details','NOT LIKE',`%"archived":"1"%`], + ['archive','!=',`1`], ['details','NOT LIKE',`%"dir"%`], ], orderBy: ['time','asc'], @@ -298,7 +298,7 @@ module.exports = (s,config,lang) => { table: "Timelapse Frames", where: [ ['ke','=',groupKey], - ['details','NOT LIKE',`%"archived":"1"%`], + ['archive','!=',`1`], ], orderBy: ['time','asc'], limit: 3 @@ -408,7 +408,7 @@ module.exports = (s,config,lang) => { table: "Cloud Timelapse Frames", where: [ ['ke','=',groupKey], - ['details','NOT LIKE',`%"archived":"1"%`], + ['archive','!=',`1`], ], orderBy: ['time','asc'], limit: 3 diff --git a/libs/video/utils.js b/libs/video/utils.js index 2ccb045d..bfe96f52 100644 --- a/libs/video/utils.js +++ b/libs/video/utils.js @@ -479,6 +479,28 @@ module.exports = (s,config,lang) => { } }) } + function archiveVideo(video,unarchive){ + return new Promise((resolve) => { + s.knexQuery({ + action: "update", + table: 'Videos', + update: { + archive: unarchive ? '0' : 1 + }, + where: { + ke: video.ke, + mid: video.mid, + time: video.time, + } + },function(err){ + resolve({ + ok: !err, + err: err, + archived: !unarchive + }) + }) + }) + } return { reEncodeVideoAndReplace, stitchMp4Files, @@ -488,5 +510,6 @@ module.exports = (s,config,lang) => { getVideosBasedOnTagFoundInMatrixOfAssociatedEvent, reEncodeVideoAndBinOriginal, reEncodeVideoAndBinOriginalAddToQueue, + archiveVideo, } } diff --git a/libs/webServerPaths.js b/libs/webServerPaths.js index 55598801..73d51f12 100644 --- a/libs/webServerPaths.js +++ b/libs/webServerPaths.js @@ -31,6 +31,7 @@ module.exports = function(s,config,lang,app,io){ destroySubstreamProcess, } = require('./monitor/utils.js')(s,config,lang) const { + archiveVideo, reEncodeVideoAndReplace, reEncodeVideoAndBinOriginalAddToQueue, getVideosBasedOnTagFoundInMatrixOfAssociatedEvent, @@ -1811,6 +1812,13 @@ module.exports = function(s,config,lang,app,io){ const originalFileName = `${s.formattedTime(r.time)+'.'+r.ext}` var details = s.parseJSON(r.details) || {} switch(req.params.mode){ + case'archive': + response.ok = true + const unarchive = s.getPostData(req,'unarchive') === '1'; + const archiveResponse = await archiveVideo(r,unarchive) + response.ok = archiveResponse.ok + response.archived = archiveResponse.archived + break; case'fix': await reEncodeVideoAndReplace(r) break; diff --git a/web/assets/css/bs5.videosTable.css b/web/assets/css/bs5.videosTable.css index ec34918f..cf896a52 100644 --- a/web/assets/css/bs5.videosTable.css +++ b/web/assets/css/bs5.videosTable.css @@ -1,4 +1,28 @@ +.video-thumbnail { + position: relative; + overflow: hidden; +} .video-thumbnail img { height: 75px; border-radius: 10px; } +.video-thumbnail-buttons { + position: absolute; + height: 100%; + width:100%; + top:0; + left:0; +} +.video-thumbnail-buttons > .video-thumbnail-button-cell { + flex: 1; + display: flex; + align-items: center; + justify-content: center; + text-decoration: none; + text-shadow: 0 0 15px #333; + cursor: pointer; +} +.video-thumbnail-buttons > .video-thumbnail-button-cell:hover { + background: rgba(0,0,0,0.6); + color: #fff; +} diff --git a/web/assets/js/bs5.videoPlayer.js b/web/assets/js/bs5.videoPlayer.js index 53faef26..19aae7e6 100644 --- a/web/assets/js/bs5.videoPlayer.js +++ b/web/assets/js/bs5.videoPlayer.js @@ -34,7 +34,7 @@ $(document).ready(function(){ }) eventMatrixHtml += `` } - var baseHtml = `
+ var baseHtml = `
${tabLabel}
@@ -60,6 +60,7 @@ $(document).ready(function(){
${lang.Download} ${permissionCheck('video_delete',video.mid) ? ` ${lang.Delete}` : ''} + ${permissionCheck('video_delete',video.mid) ? ` ${video.archive === 1 ? lang.Unarchive : lang.Archive}` : ''}
diff --git a/web/assets/js/bs5.videos.js b/web/assets/js/bs5.videos.js index 32419d1c..1472f748 100644 --- a/web/assets/js/bs5.videos.js +++ b/web/assets/js/bs5.videos.js @@ -548,6 +548,56 @@ async function compressVideos(videos){ await compressVideo(video) } } +function getArchiveButtons(video){ + return $(`[data-mid="${video.mid}"][data-ke="${video.ke}"][data-time="${video.time}"] .archive-video`) +} +function archiveVideo(video,unarchive){ + return new Promise((resolve) => { + var videoEndpoint = getApiPrefix(`videos`) + '/' + video.mid + '/' + video.filename + // var currentlyArchived = video.archive === 1 + $.getJSON(videoEndpoint + '/archive' + `${unarchive ? `?unarchive=1` : ''}`,function(data){ + if(data.ok){ + var archiveButtons = getArchiveButtons(video) + var classToRemove = 'btn-default' + var classToAdd = 'btn-success status-archived' + var iconToRemove = 'fa-unlock-alt' + var iconToAdd = 'fa-lock' + var elTitle = `${lang.Unarchive}` + if(unarchive){ + console.log('Video Unarchived',unarchive) + classToRemove = 'btn-success status-archived' + classToAdd = 'btn-default' + iconToRemove = 'fa-lock' + iconToAdd = 'fa-unlock-alt' + elTitle = `${lang.Archive}` + }else{ + console.log('Video Archived',unarchive) + } + archiveButtons.removeClass(classToRemove).addClass(classToAdd).attr('title',elTitle) + archiveButtons.find('i').removeClass(iconToRemove).addClass(iconToAdd) + archiveButtons.find('span').text(elTitle) + }else{ + console.log('Video Archive status unchanged',data,videoEndpoint) + } + resolve(data) + }) + }) +} +async function archiveVideos(videos){ + for (let i = 0; i < videos.length; i++) { + var video = videos[i]; + await archiveVideo(video) + } +} +function unarchiveVideo(video){ + return archiveVideo(video,true) +} +async function unarchiveVideos(videos){ + for (let i = 0; i < videos.length; i++) { + var video = videos[i]; + await unarchiveVideo(video) + } +} onWebSocketEvent(function(d){ switch(d.f){ case'video_delete': @@ -641,6 +691,33 @@ $(document).ready(function(){ }); return false; }) + .on('click','.archive-video',function(e){ + e.preventDefault() + var el = $(this).parents('[data-mid]') + var monitorId = el.attr('data-mid') + var videoTime = el.attr('data-time') + var unarchive = $(this).hasClass('status-archived') + var video = loadedVideosInMemory[`${monitorId}${videoTime}`] + var ext = video.filename.split('.') + ext = ext[ext.length - 1] + var videoEndpoint = getApiPrefix(`videos`) + '/' + video.mid + '/' + video.filename + if(unarchive){ + unarchiveVideo(video) + }else{ + // $.confirm.create({ + // title: lang["Archive"] + ' : ' + video.filename, + // body: `${lang.ArchiveVideoMsg}

`, + // clickOptions: { + // title: ' ' + lang.Archive, + // class: 'btn-primary btn-sm' + // }, + // clickCallback: function(){ + archiveVideo(video) + // } + // }); + } + return false; + }) .on('click','.fix-video',function(e){ e.preventDefault() var el = $(this).parents('[data-mid]') diff --git a/web/assets/js/bs5.videosTable.js b/web/assets/js/bs5.videosTable.js index bfd7231a..1a6bf1e1 100644 --- a/web/assets/js/bs5.videosTable.js +++ b/web/assets/js/bs5.videosTable.js @@ -33,7 +33,7 @@ $(document).ready(function(e){ const startDate = el.attr('data-time') const endDate = el.attr('data-end') const href = await getSnapshotFromVideoTimeFrame(monitorId,startDate,endDate) - imgEl.innerHTML = href ? `` : '' + imgEl.innerHTML = href ? imgEl.innerHTML + `` : '' }) } function openVideosTableView(monitorId,startDate,endDate){ @@ -140,7 +140,7 @@ $(document).ready(function(e){ title: lang['Objects Found'] }, { - field: 'ext', + field: 'tags', title: '' }, { @@ -156,21 +156,32 @@ $(document).ready(function(e){ var href = getFullOrigin(true) + file.href var loadedMonitor = loadedMonitors[file.mid] return { - image: `
`, + image: `
+
+ + + + + + +
+
`, Monitor: loadedMonitor && loadedMonitor.name ? loadedMonitor.name : file.mid, mid: file.mid, time: formattedTime(file.time, 'DD-MM-YYYY hh:mm:ss AA'), end: formattedTime(file.end, 'DD-MM-YYYY hh:mm:ss AA'), - ext: file.ext, + tags: ` + ${file.ext} + `, objects: file.objects, size: convertKbToHumanSize(file.size), buttons: `
- ${permissionCheck('video_delete',file.mid) ? `` : ''} ${permissionCheck('video_delete',file.mid) ? `` : ''} + ${permissionCheck('video_delete',file.mid) ? `` : ''}
`, } @@ -255,6 +266,11 @@ $(document).ready(function(e){ drawPreviewVideo(href) return false; }) + .on('click','.open-snapshot',function(e){ + e.preventDefault() + var href = $(this).parents('.video-thumbnail').find('img').click() + return false; + }) .on('click','.delete-selected-videos',function(e){ e.preventDefault() var videos = getSelectedRows() @@ -287,7 +303,26 @@ $(document).ready(function(e){ }, clickCallback: function(){ compressVideos(videos).then(() => { - console.log(`Done Deleting Rows!`) + console.log(`Done Sending Compression Request!`) + }) + } + }); + return false; + }) + .on('click','.archive-selected-videos',function(e){ + e.preventDefault() + var videos = getSelectedRows() + if(videos.length === 0)return; + $.confirm.create({ + title: lang["Archive Videos"], + body: `${lang.ArchiveTheseMsg}`, + clickOptions: { + title: ' ' + lang.Archive, + class: 'btn-primary btn-sm' + }, + clickCallback: function(){ + archiveVideos(videos).then(() => { + console.log(`Done Archiving Rows!`) }) } }); diff --git a/web/pages/blocks/home/videosTable.ejs b/web/pages/blocks/home/videosTable.ejs index 69901b68..a61461fe 100644 --- a/web/pages/blocks/home/videosTable.ejs +++ b/web/pages/blocks/home/videosTable.ejs @@ -21,8 +21,11 @@
    -
  • <%- lang.Compress %>
  • <%- lang.Download %>
    • +
    • +
  • <%- lang.Archive %>
    • +
  • <%- lang.Unarchive %>
    • +
  • <%- lang.Compress %>
  • <%- lang.Delete %>
    • From 455e5706d3e238a54dcd69730afb6e65c6701e8d Mon Sep 17 00:00:00 2001 From: Moe Date: Fri, 19 Aug 2022 23:14:39 -0700 Subject: [PATCH 2/6] Archive Associated Events and First Frame with Video --- libs/sql.js | 45 ++++++++++++++++++++++++++++++++++++- libs/user/utils.js | 2 +- libs/video/utils.js | 43 ++++++++++++++++++++++++++++++----- libs/webServerPaths.js | 2 +- web/assets/js/bs5.videos.js | 10 ++++++++- 5 files changed, 93 insertions(+), 9 deletions(-) diff --git a/libs/sql.js b/libs/sql.js index 8d8c1485..34d4da5c 100644 --- a/libs/sql.js +++ b/libs/sql.js @@ -181,7 +181,50 @@ module.exports = function(s,config){ table.tinyint('archive',1).defaultTo(0) table.string('saveDir',255).defaultTo('') }).then(() => { - console.log(`objects added to Videos table`) + console.log(`archive and saveDir added to Videos table`) + }).catch((err) => { + if(err && err.code !== 'ER_DUP_FIELDNAME'){ + console.log('error') + console.log(err) + } + }) + }catch(err){ + console.log(err) + } + try{ + s.databaseEngine.schema.table('Timelapse Frames', table => { + table.tinyint('archive',1).defaultTo(0) + table.string('saveDir',255).defaultTo('') + }).then(() => { + console.log(`archive and saveDir added to Timelapse Frames table`) + }).catch((err) => { + if(err && err.code !== 'ER_DUP_FIELDNAME'){ + console.log('error') + console.log(err) + } + }) + }catch(err){ + console.log(err) + } + try{ + s.databaseEngine.schema.table('Events', table => { + table.tinyint('archive',1).defaultTo(0) + }).then(() => { + console.log(`archive added to Events table`) + }).catch((err) => { + if(err && err.code !== 'ER_DUP_FIELDNAME'){ + console.log('error') + console.log(err) + } + }) + }catch(err){ + console.log(err) + } + try{ + s.databaseEngine.schema.table('Files', table => { + table.tinyint('archive',1).defaultTo(0) + }).then(() => { + console.log(`archive added to Files table`) }).catch((err) => { if(err && err.code !== 'ER_DUP_FIELDNAME'){ console.log('error') diff --git a/libs/user/utils.js b/libs/user/utils.js index bb84e37c..926444d9 100644 --- a/libs/user/utils.js +++ b/libs/user/utils.js @@ -326,6 +326,7 @@ module.exports = (s,config,lang) => { table: "Files", where: [ ['ke','=',groupKey], + ['archive','!=',`1`], ], orderBy: ['time','asc'], limit: 1 @@ -408,7 +409,6 @@ module.exports = (s,config,lang) => { table: "Cloud Timelapse Frames", where: [ ['ke','=',groupKey], - ['archive','!=',`1`], ], orderBy: ['time','asc'], limit: 3 diff --git a/libs/video/utils.js b/libs/video/utils.js index bfe96f52..d8020a17 100644 --- a/libs/video/utils.js +++ b/libs/video/utils.js @@ -492,11 +492,44 @@ module.exports = (s,config,lang) => { mid: video.mid, time: video.time, } - },function(err){ - resolve({ - ok: !err, - err: err, - archived: !unarchive + },function(errVideos){ + s.knexQuery({ + action: "update", + table: 'Events', + update: { + archive: unarchive ? '0' : 1 + }, + where: [ + ['ke','=',video.ke], + ['mid','=',video.mid], + ['time','>=',video.time], + ['time','<=',video.end], + ] + },function(errEvents){ + s.knexQuery({ + action: "update", + table: 'Timelapse Frames', + update: { + archive: unarchive ? '0' : 1 + }, + limit: 1, + where: [ + ['ke','=',video.ke], + ['mid','=',video.mid], + ['time','>=',video.time], + ['time','<=',video.end], + ] + },function(errTimelapseFrames){ + resolve({ + ok: !errVideos && !errEvents && !errTimelapseFrames, + err: errVideos || errEvents || errTimelapseFrames ? { + errVideos, + errEvents, + errTimelapseFrames, + } : undefined, + archived: !unarchive + }) + }) }) }) }) diff --git a/libs/webServerPaths.js b/libs/webServerPaths.js index 73d51f12..0ab2e761 100644 --- a/libs/webServerPaths.js +++ b/libs/webServerPaths.js @@ -1814,7 +1814,7 @@ module.exports = function(s,config,lang,app,io){ switch(req.params.mode){ case'archive': response.ok = true - const unarchive = s.getPostData(req,'unarchive') === '1'; + const unarchive = s.getPostData(req,'unarchive') == '1'; const archiveResponse = await archiveVideo(r,unarchive) response.ok = archiveResponse.ok response.archived = archiveResponse.archived diff --git a/web/assets/js/bs5.videos.js b/web/assets/js/bs5.videos.js index 1472f748..73f90a2f 100644 --- a/web/assets/js/bs5.videos.js +++ b/web/assets/js/bs5.videos.js @@ -551,10 +551,16 @@ async function compressVideos(videos){ function getArchiveButtons(video){ return $(`[data-mid="${video.mid}"][data-ke="${video.ke}"][data-time="${video.time}"] .archive-video`) } +var currentlyArchiving = {} function archiveVideo(video,unarchive){ return new Promise((resolve) => { var videoEndpoint = getApiPrefix(`videos`) + '/' + video.mid + '/' + video.filename // var currentlyArchived = video.archive === 1 + if(currentlyArchiving[videoEndpoint]){ + resolve({ok: false}) + return; + } + currentlyArchiving[videoEndpoint] = true $.getJSON(videoEndpoint + '/archive' + `${unarchive ? `?unarchive=1` : ''}`,function(data){ if(data.ok){ var archiveButtons = getArchiveButtons(video) @@ -563,7 +569,7 @@ function archiveVideo(video,unarchive){ var iconToRemove = 'fa-unlock-alt' var iconToAdd = 'fa-lock' var elTitle = `${lang.Unarchive}` - if(unarchive){ + if(!data.archived){ console.log('Video Unarchived',unarchive) classToRemove = 'btn-success status-archived' classToAdd = 'btn-default' @@ -576,9 +582,11 @@ function archiveVideo(video,unarchive){ archiveButtons.removeClass(classToRemove).addClass(classToAdd).attr('title',elTitle) archiveButtons.find('i').removeClass(iconToRemove).addClass(iconToAdd) archiveButtons.find('span').text(elTitle) + video.archive = data.archived ? 1 : 0 }else{ console.log('Video Archive status unchanged',data,videoEndpoint) } + delete(currentlyArchiving[videoEndpoint]) resolve(data) }) }) From 16075f3d2eaeb8354262f618420ebc4f1578d77b Mon Sep 17 00:00:00 2001 From: Moe Date: Fri, 19 Aug 2022 23:17:44 -0700 Subject: [PATCH 3/6] Make cron.js ignore archived data --- libs/cron/worker.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/cron/worker.js b/libs/cron/worker.js index 683dce70..04467f58 100644 --- a/libs/cron/worker.js +++ b/libs/cron/worker.js @@ -203,6 +203,7 @@ function beginProcessing(){ const groupKey = v.ke; const whereQuery = [ ['ke','=',v.ke], + ['archive','!=',`1`], ['time','<', sqlDate(days+' DAY')], addedQueries ] @@ -261,6 +262,7 @@ function beginProcessing(){ table: "Monitors", where: [ ['ke','=',v.ke], + ['archive','!=',`1`], ] }) const monitorRows = monitorsResponse.rows @@ -384,6 +386,7 @@ function beginProcessing(){ const groupKey = v.ke; const whereQuery = [ ['ke','=',v.ke], + ['archive','!=',`1`], ['time','<', sqlDate(daysOldForDeletion+' DAY')], ] const selectResponse = await knexQueryPromise({ @@ -455,6 +458,7 @@ function beginProcessing(){ table: "Events", where: [ ['ke','=',v.ke], + ['archive','!=',`1`], ['time','<', sqlDate(daysOldForDeletion + ' DAY')], ] },(err,rrr) => { @@ -505,6 +509,7 @@ function beginProcessing(){ table: "Files", where: [ ['ke','=',v.ke], + ['archive','!=',`1`], ['time','<', sqlDate(daysOldForDeletion + ' DAY')], ] },(err,files) => { From 8eb0326e5d1d222664f39514ef7576ca4c62429f Mon Sep 17 00:00:00 2001 From: Moe Date: Fri, 19 Aug 2022 23:37:40 -0700 Subject: [PATCH 4/6] Add API Call to Delete and Archive FileBin files --- libs/fileBin.js | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/libs/fileBin.js b/libs/fileBin.js index c12d3052..21b5d8d1 100644 --- a/libs/fileBin.js +++ b/libs/fileBin.js @@ -163,11 +163,34 @@ module.exports = function(s,config,lang,app,io){ }) }) } + function archiveFileBinEntry(file,unarchive){ + return new Promise((resolve) => { + s.knexQuery({ + action: "update", + table: 'Files', + update: { + archive: unarchive ? '0' : 1 + }, + where: { + ke: file.ke, + mid: file.mid, + name: file.name, + } + },function(err){ + resolve({ + ok: !err, + err: err, + archived: !unarchive + }) + }) + }) + } s.getFileBinDirectory = getFileBinDirectory s.getFileBinEntry = getFileBinEntry s.insertFileBinEntry = insertFileBinEntry s.updateFileBinEntry = updateFileBinEntry s.deleteFileBinEntry = deleteFileBinEntry + s.archiveFileBinEntry = archiveFileBinEntry /** * API : Get fileBin file rows */ @@ -265,4 +288,67 @@ module.exports = function(s,config,lang,app,io){ }) },res,req); }); + /** + * API : Modify fileBin File + */ + app.get(config.webPaths.apiPrefix+':auth/fileBin/:ke/:id/:file/:mode', function (req,res){ + let response = { ok: false }; + res.setHeader('Content-Type', 'application/json'); + s.auth(req.params,function(user){ + const monitorId = req.params.id + const groupKey = req.params.ke + const filename = req.params.file + const { + monitorPermissions, + monitorRestrictions, + } = s.getMonitorsPermitted(user.details,monitorId) + const { + isRestricted, + isRestrictedApiKey, + apiKeyPermissions, + } = s.checkPermission(user); + if( + isRestrictedApiKey && apiKeyPermissions.delete_videos_disallowed || + isRestricted && !monitorPermissions[`${monitorId}_video_delete`] + ){ + s.closeJsonResponse(res,{ok: false, msg: lang['Not Authorized']}); + return + } + s.knexQuery({ + action: "select", + columns: "*", + table: 'Files', + where: [ + ['ke','=',groupKey], + ['mid','=',monitorId], + ['name','=',filename] + ], + limit: 1 + },async (err,r) => { + if(r && r[0]){ + const file = r[0]; + var details = s.parseJSON(r.details) || {} + switch(req.params.mode){ + case'archive': + response.ok = true + const unarchive = s.getPostData(req,'unarchive') == '1'; + const archiveResponse = await archiveFileBinEntry(file,unarchive) + response.ok = archiveResponse.ok + response.archived = archiveResponse.archived + break; + case'delete': + response.ok = true; + await s.deleteFileBinEntry(file) + break; + default: + response.msg = user.lang.modifyVideoText1; + break; + } + }else{ + response.msg = user.lang['No such file']; + } + s.closeJsonResponse(res,response); + }) + },res,req); + }) } From 7442214efe43c7d3625ce0c2693529da669eef85 Mon Sep 17 00:00:00 2001 From: Moe Date: Sat, 20 Aug 2022 10:28:55 -0700 Subject: [PATCH 5/6] Add Button for FileBin file archival --- libs/timelapse.js | 1 - web/assets/js/bs5.fileBin.js | 52 +++++++++++++++++++++++++++++++++--- web/assets/js/bs5.videos.js | 10 +++---- 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/libs/timelapse.js b/libs/timelapse.js index 7e59c672..99538238 100644 --- a/libs/timelapse.js +++ b/libs/timelapse.js @@ -350,7 +350,6 @@ module.exports = function(s,config,lang,app,io){ const timeNow = new Date() const fileStats = await fs.promises.stat(finalMp4OutputLocation) const details = { - video: true, start: frames[0].time, end: frames[frames.length - 1].time, } diff --git a/web/assets/js/bs5.fileBin.js b/web/assets/js/bs5.fileBin.js index e4c115ec..9112e88a 100644 --- a/web/assets/js/bs5.fileBin.js +++ b/web/assets/js/bs5.fileBin.js @@ -4,7 +4,7 @@ $(document).ready(function(e){ var dateSelector = theEnclosure.find('.date_selector') var fileBinDrawArea = $('#fileBin_draw_area') var fileBinPreviewArea = $('#fileBin_preview_area') - var loadedVideosInMemory = {}; + var loadedFilesInMemory = {}; function openFileBinView(monitorId,startDate,endDate){ drawFileBinViewElements(monitorId,startDate,endDate) } @@ -37,6 +37,10 @@ $(document).ready(function(e){ monitorsList.change(function(){ drawFileBinViewElements() }) + function loadFileData(video){ + delete(video.f) + loadedFilesInMemory[`${video.mid}${video.name}`] = video + } function drawFileBinViewElements(selectedMonitor,startDate,endDate){ var dateRange = getSelectedTime(false) if(!startDate)startDate = dateRange.startDate @@ -46,8 +50,11 @@ $(document).ready(function(e){ var frameIconsHtml = '' var apiURL = getApiPrefix('fileBin') + '/' + selectedMonitor; var fileBinData = [] - loadedVideosInMemory = {} + loadedFilesInMemory = {} $.getJSON(apiURL + '?' + queryString.join('&'),function(data){ + $.each(data.files,function(n,file){ + loadFileData(file) + }) fileBinDrawArea.bootstrapTable('destroy') fileBinDrawArea.bootstrapTable({ pagination: true, @@ -76,6 +83,7 @@ $(document).ready(function(e){ ], data: data.files.map((file) => { var href = getApiPrefix('fileBin') + '/' + selectedMonitor + '/' + file.name + var isVideo = file.name.includes('.mp4') || file.name.includes('.webm') return { monitorName: `${loadedMonitors[file.mid]?.name || file.mid}`, name: file.name, @@ -86,8 +94,11 @@ $(document).ready(function(e){ `, size: convertKbToHumanSize(file.size), buttons: ` - - ${file.details.video ? `` : ``} +
    + + ${isVideo ? `` : ``} + ${permissionCheck('video_delete',file.mid) ? `` : ''} +
    `, } }) @@ -97,6 +108,24 @@ $(document).ready(function(e){ function drawPreviewVideo(href){ fileBinPreviewArea.html(``) } + function archiveFile(video,unarchive){ + return archiveVideo(video,unarchive,true) + } + async function archiveFiles(videos){ + for (let i = 0; i < videos.length; i++) { + var video = videos[i]; + await archiveFile(video,false) + } + } + function unarchiveFile(video){ + return archiveFile(video,true) + } + async function unarchiveFiles(videos){ + for (let i = 0; i < videos.length; i++) { + var video = videos[i]; + await unarchiveFile(video) + } + } $('body') .on('click','.open-fileBin-video',function(e){ e.preventDefault() @@ -112,6 +141,21 @@ $(document).ready(function(e){ drawPreviewVideo(href) return false; }) + .on('click','.archive-file',function(e){ + e.preventDefault() + var el = $(this).parents('[data-mid]') + var monitorId = el.attr('data-mid') + var filename = el.attr('data-name') + var unarchive = $(this).hasClass('status-archived') + var file = loadedFilesInMemory[`${monitorId}${filename}`] + if(!file)return console.log(`No File`,monitorId,filename,unarchive,file); + if(unarchive){ + unarchiveFile(file) + }else{ + archiveFile(file) + } + return false; + }) addOnTabOpen('fileBinView', function () { drawMonitorListToSelector(monitorsList) drawFileBinViewElements() diff --git a/web/assets/js/bs5.videos.js b/web/assets/js/bs5.videos.js index 73f90a2f..3a118bff 100644 --- a/web/assets/js/bs5.videos.js +++ b/web/assets/js/bs5.videos.js @@ -548,13 +548,13 @@ async function compressVideos(videos){ await compressVideo(video) } } -function getArchiveButtons(video){ - return $(`[data-mid="${video.mid}"][data-ke="${video.ke}"][data-time="${video.time}"] .archive-video`) +function getArchiveButtons(video,isFileBin){ + return $(`[data-mid="${video.mid}"][data-ke="${video.ke}"][data-time="${video.time}"] .archive-${isFileBin ? `file` : 'video'}`) } var currentlyArchiving = {} -function archiveVideo(video,unarchive){ +function archiveVideo(video,unarchive,isFileBin){ return new Promise((resolve) => { - var videoEndpoint = getApiPrefix(`videos`) + '/' + video.mid + '/' + video.filename + var videoEndpoint = getApiPrefix(isFileBin ? `fileBin` : `videos`) + '/' + video.mid + '/' + (isFileBin ? video.name : video.filename) // var currentlyArchived = video.archive === 1 if(currentlyArchiving[videoEndpoint]){ resolve({ok: false}) @@ -563,7 +563,7 @@ function archiveVideo(video,unarchive){ currentlyArchiving[videoEndpoint] = true $.getJSON(videoEndpoint + '/archive' + `${unarchive ? `?unarchive=1` : ''}`,function(data){ if(data.ok){ - var archiveButtons = getArchiveButtons(video) + var archiveButtons = getArchiveButtons(video,isFileBin) var classToRemove = 'btn-default' var classToAdd = 'btn-success status-archived' var iconToRemove = 'fa-unlock-alt' From 1bff50199b7d11d978c29f7c8d648113674dab31 Mon Sep 17 00:00:00 2001 From: Moe Date: Sat, 20 Aug 2022 10:50:08 -0700 Subject: [PATCH 6/6] Allow viewing only Archived videos in Videos page --- definitions/base.js | 9 +++++++++ libs/fileBin.js | 1 + libs/webServerPaths.js | 1 + web/assets/js/bs5.videos.js | 4 ++++ web/assets/js/bs5.videosTable.js | 14 +++++++++++--- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/definitions/base.js b/definitions/base.js index 124a716c..3915bb48 100644 --- a/definitions/base.js +++ b/definitions/base.js @@ -7426,6 +7426,11 @@ module.exports = function(s,config,lang){ "class": "default toggle-live-grid-monitor-menu", "icon": "bars" }, + "Fullscreen": { + "label": lang['Fullscreen'], + "class": "default toggle-live-grid-monitor-fullscreen", + "icon": "arrows-alt" + }, "Monitor Settings": { "label": lang['Monitor Settings'], "class": "default open-monitor-settings", @@ -8199,6 +8204,10 @@ module.exports = function(s,config,lang){ "name": lang.Local, "value": "local" }, + { + "name": lang.Archive, + "value": "archive" + }, { "name": lang.Cloud, "value": "cloud" diff --git a/libs/fileBin.js b/libs/fileBin.js index 21b5d8d1..acac006e 100644 --- a/libs/fileBin.js +++ b/libs/fileBin.js @@ -210,6 +210,7 @@ module.exports = function(s,config,lang,app,io){ startTimeOperator: req.query.startOperator, endTimeOperator: req.query.endOperator, limit: req.query.limit, + archived: req.query.archived, endIsStartTo: true, noFormat: true, noCount: true, diff --git a/libs/webServerPaths.js b/libs/webServerPaths.js index 0ab2e761..f1ba5d8f 100644 --- a/libs/webServerPaths.js +++ b/libs/webServerPaths.js @@ -1142,6 +1142,7 @@ module.exports = function(s,config,lang,app,io){ endTimeOperator: req.query.endOperator, noLimit: req.query.noLimit, limit: req.query.limit, + archived: req.query.archived, endIsStartTo: true, parseRowDetails: true, noFormat: true, diff --git a/web/assets/js/bs5.videos.js b/web/assets/js/bs5.videos.js index 3a118bff..97840508 100644 --- a/web/assets/js/bs5.videos.js +++ b/web/assets/js/bs5.videos.js @@ -441,6 +441,7 @@ function getVideos(options,callback){ var searchQuery = options.searchQuery var requestQueries = [] var monitorId = options.monitorId + var archived = options.archived var customVideoSet = options.customVideoSet var limit = options.limit || 300 var eventStartTime @@ -458,6 +459,9 @@ function getVideos(options,callback){ if(searchQuery){ requestQueries.push(`search=${searchQuery}`) } + if(archived){ + requestQueries.push(`archived=1`) + } $.getJSON(`${getApiPrefix(customVideoSet ? customVideoSet : searchQuery ? `videosByEventTag` : `videos`)}${monitorId ? `/${monitorId}` : ''}?${requestQueries.concat([`noLimit=1`]).join('&')}`,function(data){ var videos = data.videos $.getJSON(`${getApiPrefix(`timelapse`)}${monitorId ? `/${monitorId}` : ''}?${requestQueries.concat([`noLimit=1`]).join('&')}`,function(timelapseFrames){ diff --git a/web/assets/js/bs5.videosTable.js b/web/assets/js/bs5.videosTable.js index 1a6bf1e1..f5217a4d 100644 --- a/web/assets/js/bs5.videosTable.js +++ b/web/assets/js/bs5.videosTable.js @@ -32,8 +32,9 @@ $(document).ready(function(e){ const monitorId = el.attr('data-mid') const startDate = el.attr('data-time') const endDate = el.attr('data-end') + const imgBlock = el.find('.video-thumbnail-img-block') const href = await getSnapshotFromVideoTimeFrame(monitorId,startDate,endDate) - imgEl.innerHTML = href ? imgEl.innerHTML + `` : '' + imgBlock.html(``) }) } function openVideosTableView(monitorId,startDate,endDate){ @@ -80,6 +81,7 @@ $(document).ready(function(e){ var startDate = dateRange.startDate var endDate = dateRange.endDate var monitorId = monitorsList.val() + var wantsArchivedVideo = getVideoSetSelected() === 'archive' var frameIconsHtml = '' if(!usePreloadedData){ loadedVideosTable = (await getVideos({ @@ -87,6 +89,7 @@ $(document).ready(function(e){ startDate, endDate, searchQuery, + archived: wantsArchivedVideo, customVideoSet: wantCloudVideos() ? 'cloudVideos' : null, })).videos; $.each(loadedVideosTable,function(n,v){ @@ -157,6 +160,8 @@ $(document).ready(function(e){ var loadedMonitor = loadedMonitors[file.mid] return { image: `
    +
    +
    @@ -206,8 +211,11 @@ $(document).ready(function(e){ }) return rowsSelected } + function getVideoSetSelected(){ + return cloudVideoCheckSwitch.val() + } function wantCloudVideos(){ - const isChecked = cloudVideoCheckSwitch.val() === 'cloud' + const isChecked = getVideoSetSelected() === 'cloud' return isChecked } function drawCompressedVideoProgressBar(data){ @@ -268,7 +276,7 @@ $(document).ready(function(e){ }) .on('click','.open-snapshot',function(e){ e.preventDefault() - var href = $(this).parents('.video-thumbnail').find('img').click() + var href = $(this).parents('.video-thumbnail-img-block').find('img').click() return false; }) .on('click','.delete-selected-videos',function(e){