Plus upload in progress (#5521)

* Fix frigate+ uploading bug

Fixes https://github.com/blakeblackshear/frigate/issues/5515

* wording

* Formatting

* Don't show button when event is in progress

* Don't show in download menu either
This commit is contained in:
Nicolas Mowen 2023-02-19 06:38:16 -07:00 committed by GitHub
parent c901707670
commit 2b685ac343
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions

View File

@ -184,6 +184,18 @@ def send_to_plus(id):
logger.error(message) logger.error(message)
return make_response(jsonify({"success": False, "message": message}), 404) return make_response(jsonify({"success": False, "message": message}), 404)
if event.end_time is None:
logger.error(f"Unable to load clean png for in-progress event: {event.id}")
return make_response(
jsonify(
{
"success": False,
"message": "Unable to load clean png for in-progress event",
}
),
400,
)
if event.plus_id: if event.plus_id:
message = "Already submitted to plus" message = "Already submitted to plus"
logger.error(message) logger.error(message)
@ -202,6 +214,15 @@ def send_to_plus(id):
400, 400,
) )
if image is None or image.size == 0:
logger.error(f"Unable to load clean png for event: {event.id}")
return make_response(
jsonify(
{"success": False, "message": "Unable to load clean png for event"}
),
400,
)
try: try:
plus_id = current_app.plus_api.upload_image(image, event.camera) plus_id = current_app.plus_api.upload_image(image, event.camera)
except Exception as ex: except Exception as ex:

View File

@ -366,7 +366,7 @@ export default function Events({ path, ...props }) {
download download
/> />
)} )}
{downloadEvent.has_snapshot && !downloadEvent.plus_id && ( {(downloadEvent.end_time && downloadEvent.has_snapshot && !downloadEvent.plus_id) && (
<MenuItem <MenuItem
icon={UploadPlus} icon={UploadPlus}
label={uploading.includes(downloadEvent.id) ? 'Uploading...' : 'Send to Frigate+'} label={uploading.includes(downloadEvent.id) ? 'Uploading...' : 'Send to Frigate+'}
@ -527,7 +527,7 @@ export default function Events({ path, ...props }) {
</div> </div>
</div> </div>
<div class="hidden sm:flex flex-col justify-end mr-2"> <div class="hidden sm:flex flex-col justify-end mr-2">
{event.has_snapshot && ( {(event.end_time && event.has_snapshot) && (
<Fragment> <Fragment>
{event.plus_id ? ( {event.plus_id ? (
<div className="uppercase text-xs">Sent to Frigate+</div> <div className="uppercase text-xs">Sent to Frigate+</div>