Fix query adopt bug.
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
import { EventMediaQueries, MediaQueries, RecordingMediaQueries } from './media-queries';
|
||||
|
||||
export type MediaQueriesType = 'event' | 'recording';
|
||||
type MediaType = 'clips' | 'snapshots' | 'recordings';
|
||||
|
||||
export class MediaQueriesClassifier {
|
||||
public static areEventQueries(
|
||||
queries?: MediaQueries | null,
|
||||
@@ -14,6 +16,20 @@ export class MediaQueriesClassifier {
|
||||
return queries instanceof RecordingMediaQueries;
|
||||
}
|
||||
|
||||
public static areClipsQueries(queries?: MediaQueries | null): boolean {
|
||||
return (
|
||||
this.areEventQueries(queries) &&
|
||||
!!queries?.getQueries()?.every((query) => query.hasClip)
|
||||
);
|
||||
}
|
||||
|
||||
public static areSnapshotQueries(queries?: MediaQueries | null): boolean {
|
||||
return (
|
||||
this.areEventQueries(queries) &&
|
||||
!!queries?.getQueries()?.every((query) => query.hasSnapshot)
|
||||
);
|
||||
}
|
||||
|
||||
public static getQueriesType(queries?: MediaQueries | null): MediaQueriesType | null {
|
||||
return this.areEventQueries(queries)
|
||||
? 'event'
|
||||
@@ -21,4 +37,14 @@ export class MediaQueriesClassifier {
|
||||
? 'recording'
|
||||
: null;
|
||||
}
|
||||
|
||||
public static getMediaType(queries?: MediaQueries | null): MediaType | null {
|
||||
return this.areClipsQueries(queries)
|
||||
? 'clips'
|
||||
: this.areSnapshotQueries(queries)
|
||||
? 'snapshots'
|
||||
: this.areRecordingQueries(queries)
|
||||
? 'recordings'
|
||||
: null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { CameraManager } from '../camera-manager/manager';
|
||||
import { CapabilitySearchOptions } from '../camera-manager/types';
|
||||
import { FrigateCardView } from '../config/types';
|
||||
|
||||
/**
|
||||
@@ -10,6 +11,10 @@ export const getCameraIDsForViewName = (
|
||||
viewName: FrigateCardView,
|
||||
cameraID?: string,
|
||||
): Set<string> => {
|
||||
const capabilityMatchAnyMedia: CapabilitySearchOptions = {
|
||||
anyCapabilities: ['clips', 'snapshots', 'recordings'],
|
||||
};
|
||||
|
||||
switch (viewName) {
|
||||
case 'image':
|
||||
case 'diagnostics':
|
||||
@@ -35,17 +40,15 @@ export const getCameraIDsForViewName = (
|
||||
: cameraManager.getStore().getCameraIDsWithCapability(capability);
|
||||
|
||||
case 'timeline':
|
||||
return cameraManager.getStore().getCameraIDsWithCapability({
|
||||
anyCapabilities: ['clips', 'snapshots', 'recordings'],
|
||||
});
|
||||
return cameraManager
|
||||
.getStore()
|
||||
.getCameraIDsWithCapability(capabilityMatchAnyMedia);
|
||||
|
||||
case 'media':
|
||||
return cameraID
|
||||
? cameraManager.getStore().getAllDependentCameras(cameraID, {
|
||||
anyCapabilities: ['clips', 'snapshots', 'recordings'],
|
||||
})
|
||||
: cameraManager.getStore().getCameraIDsWithCapability({
|
||||
anyCapabilities: ['clips', 'snapshots', 'recordings'],
|
||||
});
|
||||
? cameraManager
|
||||
.getStore()
|
||||
.getAllDependentCameras(cameraID, capabilityMatchAnyMedia)
|
||||
: cameraManager.getStore().getCameraIDsWithCapability(capabilityMatchAnyMedia);
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user