Merge branch 'master' of http://git.dificen.to/Dificento/DownloadCoubs

coub.py

@@ -1,19 +1,19 @@
-from dataclasses import dataclass
 import json
 import os
 import shutil
 import subprocess
+import time
+import typing as tp
+from dataclasses import dataclass
+
 import requests
 from bs4 import BeautifulSoup
-import typing as tp
-import time
-from tqdm import tqdm
-
 from selenium import webdriver
-from selenium.webdriver.common.keys import Keys
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from tqdm import tqdm
 
 import settings
 
@@ -95,9 +95,7 @@ def get_video_info(link: str) -> CoubVideo:
 
     info = get_json_from_page(data)
     try:
-        title =  "".join(x for x in info.get('title') if (x.isalnum() or x in "._- "))
-        if len(title) < 1:
-            title = link.split("/view/")[-1]
+        title =  link.split("/view/")[-1] + "_" + "".join(x for x in info.get('title') if (x.isalnum() or x in "._- "))
         video = info['file_versions']['html5']['video']
         video = video.get('higher') or video.get('high')
         audio = info['file_versions']['html5'].get('audio')
@@ -166,4 +164,4 @@ def download_video(video: CoubVideo):
 
 def execute_ffmpeg(path: str):
     proc = subprocess.Popen(["ffmpeg.exe", "-stream_loop", "-1", "-i", f"{settings.TEMP_DIR}/{path}.mp4", "-i", f"{settings.TEMP_DIR}/{path}.mp3", "-shortest", "-map", "0:v:0", "-map", "1:a:0", "-y", f"{settings.OUT_DIR}/{path}.mp4"])
-    proc.wait()
+    proc.wait()