cutter: Set video directly to DONE if upload backend doesn't need transcoding

This will be the case for probably all non-youtube backends.
pull/100/head
Mike Lang 5 years ago
parent 39f006fdab
commit 32d352e2ba

@ -353,7 +353,7 @@ class Cutter(object):
).format(format_job(job))) ).format(format_job(job)))
error = ( error = (
"An error occurred during FINALIZING, please determine if video was actually " "An error occurred during FINALIZING, please determine if video was actually "
"uploaded or not and either move to TRANSCODING and populate video_id or rollback " "uploaded or not and either move to TRANSCODING/DONE and populate video_id or rollback "
"to EDITED and clear uploader. " "to EDITED and clear uploader. "
"Error: {}" "Error: {}"
).format(ex) ).format(ex)
@ -385,14 +385,15 @@ class Cutter(object):
gevent.sleep(self.RETRYABLE_UPLOAD_ERROR_WAIT_INTERVAL) gevent.sleep(self.RETRYABLE_UPLOAD_ERROR_WAIT_INTERVAL)
return return
# Success! Set TRANSCODING and clear any previous error. # Success! Set TRANSCODING or DONE and clear any previous error.
success_state = 'TRANSCODING' if upload_backend.needs_transcode else 'DONE'
link = "https://youtu.be/{}".format(video_id) link = "https://youtu.be/{}".format(video_id)
if not set_row(state='TRANSCODING', video_id=video_id, video_link=link, error=None): if not set_row(state=success_state, video_id=video_id, video_link=link, error=None):
# This will result in it being stuck in FINALIZING, and an operator will need to go # This will result in it being stuck in FINALIZING, and an operator will need to go
# confirm it was really uploaded. # confirm it was really uploaded.
raise JobConsistencyError( raise JobConsistencyError(
"No job with id {} and uploader {} when setting to TRANSCODING" "No job with id {} and uploader {} when setting to {}"
.format(job.id, self.name) .format(job.id, self.name, success_state)
) )
self.logger.info("Successfully cut and uploaded job {} as {}".format(format_job(job), link)) self.logger.info("Successfully cut and uploaded job {} as {}".format(format_job(job), link))
@ -420,7 +421,7 @@ class Cutter(object):
WHERE state = 'FINALIZING' AND uploader = %(name)s AND error IS NULL WHERE state = 'FINALIZING' AND uploader = %(name)s AND error IS NULL
""", name=self.name, error=( """, name=self.name, error=(
"Uploader died during FINALIZING, please determine if video was actually " "Uploader died during FINALIZING, please determine if video was actually "
"uploaded or not and either move to TRANSCODING and populate video_id or rollback " "uploaded or not and either move to TRANSCODING/DONE and populate video_id or rollback "
"to EDITED and clear uploader." "to EDITED and clear uploader."
)) ))
if result.rowcount > 0: if result.rowcount > 0:

Loading…
Cancel
Save