|
|
@@ -110,13 +110,12 @@ class Material():
|
|
|
text = row[3]
|
|
|
title = row[4]
|
|
|
number = {"audio_id": audio_id, "text": text}
|
|
|
- list.append(number)
|
|
|
+ if audio_id:
|
|
|
+ list.append(number)
|
|
|
title_list.append(title)
|
|
|
-
|
|
|
list = random.choice(list)
|
|
|
audio_id = list['audio_id']
|
|
|
srt = list['text']
|
|
|
- title_list = [item for item in title_list if item is not None]
|
|
|
return audio_id, srt, title_list
|
|
|
else:
|
|
|
if channel_type == "douyin":
|
|
|
@@ -131,7 +130,6 @@ class Material():
|
|
|
title_list.append(title)
|
|
|
audio_id = list[count]['audio_id']
|
|
|
srt = list[count]['text']
|
|
|
- title_list = [item for item in title_list if item is not None]
|
|
|
return audio_id, srt, title_list
|
|
|
else:
|
|
|
audio_type = [{"audio": "音画美文--美文类", "type": "6VXm7q"}, {"audio": "音画美文--通用类", "type": "aSNFl8"}]
|
|
|
@@ -143,12 +141,12 @@ class Material():
|
|
|
text = row[1]
|
|
|
title = row[2]
|
|
|
number = {"audio_id": audio_id, "text": text}
|
|
|
- list.append(number)
|
|
|
+ if audio_id:
|
|
|
+ list.append(number)
|
|
|
title_list.append(title)
|
|
|
list = random.choice(list)
|
|
|
audio_id = list['audio_id']
|
|
|
srt = list['text']
|
|
|
- title_list = [item for item in title_list if item is not None]
|
|
|
return audio_id, srt, title_list
|
|
|
|
|
|
|
