michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-02-09 08:42:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

snapshot: add default snapshot channel option

Browse Source
This commit is contained in:
Koushik Dutta
2022-03-21 09:26:01 -07:00
parent 3196249819
commit 2dc15e13be
3 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/snapshot/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/snapshot",
"version": "0.0.15",
"version": "0.0.16",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/snapshot",
"version": "0.0.15",
"version": "0.0.16",
"dependencies": {
"@koush/axios-digest-auth": "^0.8.5",
"@types/node": "^16.6.1",

2
plugins/snapshot/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/snapshot",
"version": "0.0.15",
"version": "0.0.16",
"description": "Snapshot Plugin for Scrypted",
"scripts": {
"prepublishOnly": "NODE_ENV=production scrypted-webpack",

43
plugins/snapshot/src/main.ts
View File

@@ -23,6 +23,31 @@ class NeverWaitError extends Error {
class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera {
storageSettings = new StorageSettings(this, {
defaultSnapshotChannel: {
title: 'Default Snapshot Channel',
description: 'The default channel to use for snapshots.',
defaultValue: 'Camera Default',
hide: true,
onGet: async () => {
let psos: PictureOptions[];
try {
psos = await this.mixinDevice.getPictureOptions();
}
catch (e) {
}
if (!psos?.length)
return {};
return {
hide: false,
choices: [
'Camera Default',
...psos.map(pso => pso.name),
],
};
}
},
snapshotUrl: {
title: this.mixinDeviceInterfaces.includes(ScryptedInterface.Camera)
? 'Override Snapshot URL'
@@ -77,7 +102,7 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera {
}
async takePicture(options?: RequestPictureOptions): Promise<MediaObject> {
let takePicture: () => Promise<Buffer>;
let takePicture: (options?: PictureOptions) => Promise<Buffer>;
if (this.storageSettings.values.snapshotsFromPrebuffer) {
try {
const realDevice = systemManager.getDeviceById<VideoCamera>(this.id);
@@ -102,11 +127,23 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera {
if (!takePicture) {
if (!this.storageSettings.values.snapshotUrl) {
if (this.mixinDeviceInterfaces.includes(ScryptedInterface.Camera)) {
takePicture = async () => {
takePicture = async (options?: PictureOptions) => {
// if operating in full resolution mode, nuke any picture options containing
// the requested dimensions that are sent.
if (this.storageSettings.values.snapshotResolution === 'Full Resolution' && options)
options.picture = undefined;
if (!options?.id && this.storageSettings.values.defaultSnapshotChannel !== 'Camera Default') {
try {
const psos = await this.mixinDevice.getPictureOptions();
const pso = psos.find(pso => pso.name === this.storageSettings.values.defaultSnapshotChannel);
if (!options)
options = {};
options.id = pso.id;
}
catch (e) {
}
}
return this.mixinDevice.takePicture(options).then(mo => mediaManager.convertMediaObjectToBuffer(mo, 'image/jpeg'))
};
}
@@ -264,7 +301,7 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera {
}
async getPictureOptions() {
return undefined;
return this.mixinDevice.getPictureOptions();
}
getMixinSettings(): Promise<Setting[]> {