|
|
@ -656,8 +656,8 @@ class TranscodeChecker(object):
|
|
|
|
result = query(self.conn, """
|
|
|
|
result = query(self.conn, """
|
|
|
|
SELECT id, video_id
|
|
|
|
SELECT id, video_id
|
|
|
|
FROM events
|
|
|
|
FROM events
|
|
|
|
WHERE state = 'TRANSCODING'
|
|
|
|
WHERE state = 'TRANSCODING' AND upload_backend = %(location)s
|
|
|
|
""")
|
|
|
|
""", self.location)
|
|
|
|
return {id: video_id for id, video_id in result.fetchall()}
|
|
|
|
return {id: video_id for id, video_id in result.fetchall()}
|
|
|
|
|
|
|
|
|
|
|
|
def check_ids(self, ids):
|
|
|
|
def check_ids(self, ids):
|
|
|
@ -791,11 +791,11 @@ class VideoUpdater(object):
|
|
|
|
built_query = sql.SQL("""
|
|
|
|
built_query = sql.SQL("""
|
|
|
|
SELECT id, {}
|
|
|
|
SELECT id, {}
|
|
|
|
FROM events
|
|
|
|
FROM events
|
|
|
|
WHERE state = 'MODIFIED' AND error IS NULL
|
|
|
|
WHERE state = 'MODIFIED' AND error IS NULL AND upload_backend = %(location)s
|
|
|
|
""").format(
|
|
|
|
""").format(
|
|
|
|
sql.SQL(", ").join(sql.Identifier(key) for key in UPDATE_JOB_PARAMS)
|
|
|
|
sql.SQL(", ").join(sql.Identifier(key) for key in UPDATE_JOB_PARAMS)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
return list(query(self.conn, built_query))
|
|
|
|
return list(query(self.conn, built_query, location=self.location))
|
|
|
|
|
|
|
|
|
|
|
|
def mark_done(self, job, updates):
|
|
|
|
def mark_done(self, job, updates):
|
|
|
|
"""We don't want to set to DONE if the video has been modified *again* since
|
|
|
|
"""We don't want to set to DONE if the video has been modified *again* since
|
|
|
|