|
|
@ -21,7 +21,7 @@ import common
|
|
|
|
from common import dateutil
|
|
|
|
from common import dateutil
|
|
|
|
from common import database
|
|
|
|
from common import database
|
|
|
|
from common.requests import InstrumentedSession
|
|
|
|
from common.requests import InstrumentedSession
|
|
|
|
from common.segments import list_segment_files
|
|
|
|
from common.segments import list_segment_files, unpadded_b64_decode
|
|
|
|
|
|
|
|
|
|
|
|
# Wraps all requests in some metric collection
|
|
|
|
# Wraps all requests in some metric collection
|
|
|
|
requests = InstrumentedSession()
|
|
|
|
requests = InstrumentedSession()
|
|
|
@ -133,8 +133,9 @@ def get_remote_segment(base_dir, node, channel, quality, hour, missing_segment,
|
|
|
|
dir_name = os.path.dirname(path)
|
|
|
|
dir_name = os.path.dirname(path)
|
|
|
|
if quality == "chat":
|
|
|
|
if quality == "chat":
|
|
|
|
# chat segment
|
|
|
|
# chat segment
|
|
|
|
_, filename_hash = os.path.basename(path).split('-', 1)
|
|
|
|
_, filename_hash = os.path.splitext(os.path.basename(path))[0].split('-', 1)
|
|
|
|
temp_name = "{}.{}.temp".format(os.path.basename(path), uuid4())
|
|
|
|
filename_hash = unpadded_b64_decode(filename_hash)
|
|
|
|
|
|
|
|
temp_name = "{}.{}.temp".format(os.path.basename(path), uuid.uuid4())
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# video segment
|
|
|
|
# video segment
|
|
|
|
date, duration, _ = os.path.basename(path).split('-', 2)
|
|
|
|
date, duration, _ = os.path.basename(path).split('-', 2)
|
|
|
@ -486,6 +487,9 @@ class BackfillerWorker(object):
|
|
|
|
pass
|
|
|
|
pass
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# For chat archives, just download whatever is there.
|
|
|
|
|
|
|
|
# Otherwise, do some basic checks.
|
|
|
|
|
|
|
|
if quality != 'chat':
|
|
|
|
# test to see if file is a segment and get the segments start time
|
|
|
|
# test to see if file is a segment and get the segments start time
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
segment = common.parse_segment_path(path)
|
|
|
|
segment = common.parse_segment_path(path)
|
|
|
|